diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 7782e249..62d2124c 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -42,7 +42,8 @@ jobs: - name: Compile LabPbr-32x uses: null511/PixelGraph.GitHubAction@main with: - profile: src/LabPbr-32x.pack.yml + project: src/project.yml + profile: Textureless-LabPbr-32x zip: ${{ env.release_filename }} - name: Release LabPbr-32x uses: actions/upload-release-asset@v1 @@ -66,29 +67,6 @@ jobs: game_versions: "9008,8857,8830,8516,8203,8152,8134,8056,8010,7892,7890,7675,7664,7469,7413,7361,7344,7318,7132,7107,7081" token: ${{ secrets.CF_API_TOKEN }} - publish_labPbr_64x: - name: Publish LabPbr-64x - runs-on: ubuntu-latest - needs: [prepare_release] - env: - release_filename: Textureless-LabPbr-64x-v${{ github.run_number }}.zip - steps: - - uses: actions/checkout@v2 - - name: Compile LabPbr-64x - uses: null511/PixelGraph.GitHubAction@main - with: - profile: src/LabPbr-64x.pack.yml - zip: ${{ env.release_filename }} - - name: Release LabPbr-64x - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ./${{ env.release_filename }} - asset_name: ${{ env.release_filename }} - asset_content_type: application/zip - publish_labPbr_16x: name: Publish LabPbr-16x runs-on: ubuntu-latest @@ -100,7 +78,8 @@ jobs: - name: Compile LabPbr-16x uses: null511/PixelGraph.GitHubAction@main with: - profile: src/LabPbr-16x.pack.yml + project: src/project.yml + profile: Textureless-LabPbr-16x zip: ${{ env.release_filename }} - name: Release LabPbr-16x uses: actions/upload-release-asset@v1 @@ -112,29 +91,6 @@ jobs: asset_name: ${{ env.release_filename }} asset_content_type: application/zip - publish_labBakedAO_32x: - name: Publish LabBakedAO-32x - runs-on: ubuntu-latest - needs: [prepare_release] - env: - release_filename: Textureless-LabBakedAO-32x-v${{ github.run_number }}.zip - steps: - - uses: actions/checkout@v2 - - name: Compile LabBakedAO-32x - uses: null511/PixelGraph.GitHubAction@main - with: - profile: src/LabBakedAO-32x.pack.yml - zip: ${{ env.release_filename }} - - name: Release LabBakedAO-32x - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.prepare_release.outputs.upload_url }} - asset_path: ./${{ env.release_filename }} - asset_name: ${{ env.release_filename }} - asset_content_type: application/zip - publish_oldPbr_32x: name: Publish OldPbr-32x runs-on: ubuntu-latest @@ -146,7 +102,8 @@ jobs: - name: Compile OldPbr-32x uses: null511/PixelGraph.GitHubAction@main with: - profile: src/OldPbr-32x.pack.yml + project: src/project.yml + profile: Textureless-OldPbr-32x zip: ${{ env.release_filename }} - name: Release OldPbr-32x uses: actions/upload-release-asset@v1 @@ -169,7 +126,8 @@ jobs: - name: Compile RTX-32x uses: null511/PixelGraph.GitHubAction@main with: - profile: src/BRtx-32x.pack.yml + project: src/project.yml + profile: Textureless-RTX-32x zip: ${{ env.release_filename }} - name: Release RTX-32x uses: actions/upload-release-asset@v1 @@ -192,7 +150,8 @@ jobs: - name: Compile Models-LabPbr-32x uses: null511/PixelGraph.GitHubAction@main with: - profile: src-models/LabPbr-32x.pack.yml + project: src-models/project.yml + profile: Textureless-Models-LabPbr-32x zip: ${{ env.release_filename }} - name: Release Models-LabPbr-32x uses: actions/upload-release-asset@v1 @@ -216,20 +175,21 @@ jobs: game_versions: "9008,8857,8830,8516,8203,8152,8134,8056,8010,7892,7890,7675,7664,7469,7413,7361,7344,7318,7132,7107,7081" token: ${{ secrets.CF_API_TOKEN }} - publish_models_labPbr_64x: - name: Publish Models-LabPbr-64x + publish_models_labPbr_16x: + name: Publish Models-LabPbr-16x runs-on: ubuntu-latest needs: [prepare_release] env: - release_filename: Textureless-Models-LabPbr-64x-v${{ github.run_number }}.zip + release_filename: Textureless-Models-LabPbr-16x-v${{ github.run_number }}.zip steps: - uses: actions/checkout@v2 - - name: Compile Models-LabPbr-64x + - name: Compile Models-LabPbr-16x uses: null511/PixelGraph.GitHubAction@main with: - profile: src-models/LabPbr-64x.pack.yml + project: src-models/project.yml + profile: Textureless-Models-LabPbr-16x zip: ${{ env.release_filename }} - - name: Release Models LabPbr 64x + - name: Release Models-LabPbr-16x uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -239,20 +199,21 @@ jobs: asset_name: ${{ env.release_filename }} asset_content_type: application/zip - publish_models_labPbr_16x: - name: Publish Models-LabPbr-16x + publish_models_oldPbr_32x: + name: Publish Models-OldPbr-32x runs-on: ubuntu-latest needs: [prepare_release] env: - release_filename: Textureless-Models-LabPbr-16x-v${{ github.run_number }}.zip + release_filename: Textureless-Models-OldPbr-32x-v${{ github.run_number }}.zip steps: - uses: actions/checkout@v2 - - name: Compile Models-LabPbr-16x + - name: Compile Models-OldPbr-32x uses: null511/PixelGraph.GitHubAction@main with: - profile: src-models/LabPbr-16x.pack.yml + project: src-models/project.yml + profile: Textureless-Models-OldPbr-32x zip: ${{ env.release_filename }} - - name: Release Models-LabPbr-16x + - name: Release Models-OldPbr-32x uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -262,20 +223,21 @@ jobs: asset_name: ${{ env.release_filename }} asset_content_type: application/zip - publish_models_labBakedAO_32x: - name: Publish Models-LabBakedAO-32x + publish_create_labPbr_32x: + name: Publish Create-LabPbr-32x runs-on: ubuntu-latest needs: [prepare_release] env: - release_filename: Textureless-Models-LabBakedAO-32x-v${{ github.run_number }}.zip + release_filename: Textureless-Create-LabPbr-32x-v${{ github.run_number }}.zip steps: - uses: actions/checkout@v2 - - name: Compile Models-LabBakedAO-32x + - name: Compile Create-LabPbr-32x uses: null511/PixelGraph.GitHubAction@main with: - profile: src-models/LabBakedAO-32x.pack.yml + project: src-create/project.yml + profile: Textureless-Create-LabPbr-32x zip: ${{ env.release_filename }} - - name: Release Models-LabBakedAO-32x + - name: Release Create-LabPbr-32x uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -284,21 +246,34 @@ jobs: asset_path: ./${{ env.release_filename }} asset_name: ${{ env.release_filename }} asset_content_type: application/zip + # - name: Publish LabPbr-Create-32x to CurseForge + # uses: itsmeow/curseforge-upload@v3 + # if: github.event.inputs.publish_curseforge == 'true' + # with: + # display_name: LabPBR-Create-32x v${{ github.run_number }} + # file_path: ${{ env.release_filename }} + # changelog: "###Release ${{ github.run_number }}\nSee base Textureless release for changelog notes." + # release_type: release + # project_id: ? + # game_endpoint: minecraft + # game_versions: "9008,8857,8830,8516,8203,8152,8134,8056,8010,7892,7890,7675,7664,7469,7413,7361,7344,7318,7132,7107,7081" + # token: ${{ secrets.CF_API_TOKEN }} - publish_models_oldPbr_32x: - name: Publish Models-OldPbr-32x + publish_create_oldPbr_32x: + name: Publish Create-OldPbr-32x runs-on: ubuntu-latest needs: [prepare_release] env: - release_filename: Textureless-Models-OldPbr-32x-v${{ github.run_number }}.zip + release_filename: Textureless-Create-OldPbr-32x-v${{ github.run_number }}.zip steps: - uses: actions/checkout@v2 - - name: Compile Models-OldPbr-32x + - name: Compile Create-OldPbr-32x uses: null511/PixelGraph.GitHubAction@main with: - profile: src-models/OldPbr-32x.pack.yml + project: src-create/project.yml + profile: Textureless-Create-OldPbr-32x zip: ${{ env.release_filename }} - - name: Release Models-OldPbr-32x + - name: Release Create-LabPbr-32x uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -315,16 +290,13 @@ jobs: needs: - prepare_release - publish_labPbr_32x - - publish_labPbr_64x - publish_labPbr_16x - - publish_labBakedAO_32x - publish_oldPbr_32x - publish_rtx_32x - publish_models_labPbr_32x - - publish_models_labPbr_64x - publish_models_labPbr_16x - - publish_models_labBakedAO_32x - publish_models_oldPbr_32x + - publish_create_labPbr_32x steps: - name: Publish Release uses: eregon/publish-release@v1.0.3 diff --git a/src-create/assets/create/models/block.ignore/crushing_wheel.json b/src-create/assets/create/models/block.ignore/crushing_wheel.json new file mode 100644 index 00000000..8594b9d0 --- /dev/null +++ b/src-create/assets/create/models/block.ignore/crushing_wheel.json @@ -0,0 +1,276 @@ +{ + "parent":"create:block/large_wheels", + "textures":{ + "6":"create:block/crushing_wheel_body", + "log_top":"create:block/smooth_dark_log_top", + "axis_top":"create:block/axis_top", + "axis":"create:block/axis", + "crushing_wheel":"create:block/crushing_wheel", + "particle":"block/polished_andesite" + }, + "elements":[ + { + "name":"Axis", + "from":[6,0,6], + "to":[10,16,10], + "faces":{ + "north":{"uv":[6,0,10,16],"texture":"#axis"}, + "east":{"uv":[6,0,10,16],"texture":"#axis"}, + "south":{"uv":[6,0,10,16],"texture":"#axis"}, + "west":{"uv":[6,0,10,16],"texture":"#axis"}, + "up":{"uv":[6,6,10,10],"texture":"#axis_top"}, + "down":{"uv":[6,6,10,10],"texture":"#axis_top"} + } + }, + { + "name":"B1", + "from":[2,1.95,-8], + "to":[9,14.05,7], + "rotation":{"angle":-22.5,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[7.5,6,11,12],"texture":"#6"}, + "east":{"uv":[0,0,7.5,6],"texture":"#6"}, + "south":{"uv":[7.5,0,11,6],"texture":"#6"}, + "west":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "up":{"uv":[0,9.5,7.5,13],"rotation":270,"texture":"#6"}, + "down":{"uv":[0,9.5,7.5,13],"rotation":90,"texture":"#6"} + } + }, + { + "name":"B2", + "from":[2,1.9,-8], + "to":[10,14.1,7], + "rotation":{"angle":0,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[3.5,0,7.5,6],"texture":"#6"}, + "east":{"uv":[0,0,7.5,6],"texture":"#6"}, + "south":{"uv":[7.5,0,11,6],"texture":"#6"}, + "west":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "up":{"uv":[0,6.5,7.5,10.5],"rotation":270,"texture":"#6"}, + "down":{"uv":[0,6,7.5,9.5],"rotation":90,"texture":"#6"} + } + }, + { + "name":"B3", + "from":[2,1.95,-8], + "to":[9,14.05,7], + "rotation":{"angle":22.5,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[11,0,14.5,6],"texture":"#6"}, + "east":{"uv":[0,0,7.5,6],"texture":"#6"}, + "south":{"uv":[7.5,0,11,6],"texture":"#6"}, + "west":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "up":{"uv":[0,6,7.5,9.5],"rotation":270,"texture":"#6"}, + "down":{"uv":[0,6,7.5,9.5],"rotation":90,"texture":"#6"} + } + }, + { + "name":"B4", + "from":[2,1.9,-8], + "to":[10,14.1,7], + "rotation":{"angle":45,"axis":"y","origin":[8,8.05,8]}, + "faces":{ + "north":{"uv":[3.5,0,7.5,6],"texture":"#6"}, + "east":{"uv":[0,0,7.5,6],"texture":"#6"}, + "south":{"uv":[7.5,0,11,6],"texture":"#6"}, + "west":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "up":{"uv":[0,6.5,7.5,10.5],"rotation":270,"texture":"#6"}, + "down":{"uv":[8.5,12.5,16,16],"rotation":90,"texture":"#6"} + } + }, + { + "name":"B5", + "from":[-8,1.95,7], + "to":[7,14.05,14], + "rotation":{"angle":-22.5,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[0,0,7.5,6],"texture":"#6"}, + "east":{"uv":[7.5,0,11,6],"texture":"#6"}, + "south":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "west":{"uv":[7.5,6,11,12],"texture":"#6"}, + "up":{"uv":[0,9.5,7.5,13],"rotation":180,"texture":"#6"}, + "down":{"uv":[0,9.5,7.5,13],"rotation":180,"texture":"#6"} + } + }, + { + "name":"B6", + "from":[-8,1.9,6], + "to":[7,14.1,14], + "rotation":{"angle":0,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[0,0,7.5,6],"texture":"#6"}, + "east":{"uv":[7.5,0,11,6],"texture":"#6"}, + "south":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "west":{"uv":[3.5,0,7.5,6],"texture":"#6"}, + "up":{"uv":[0,6.5,7.5,10.5],"rotation":180,"texture":"#6"}, + "down":{"uv":[0,6,7.5,9.5],"rotation":180,"texture":"#6"} + } + }, + { + "name":"B7", + "from":[-8,1.95,7], + "to":[7,14.05,14], + "rotation":{"angle":22.5,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[0,0,7.5,6],"texture":"#6"}, + "east":{"uv":[7.5,0,11,6],"texture":"#6"}, + "south":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "west":{"uv":[7.5,0,11,6],"texture":"#6"}, + "up":{"uv":[0,6,7.5,9.5],"rotation":180,"texture":"#6"}, + "down":{"uv":[0,6,7.5,9.5],"rotation":180,"texture":"#6"} + } + }, + { + "name":"B8", + "from":[-8,1.9,6], + "to":[7,14.1,14], + "rotation":{"angle":45,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[0,0,7.5,6],"texture":"#6"}, + "east":{"uv":[7.5,0,11,6],"texture":"#6"}, + "south":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "west":{"uv":[3.5,0,7.5,6],"texture":"#6"}, + "up":{"uv":[0,6.5,7.5,10.5],"rotation":180,"texture":"#6"}, + "down":{"uv":[8.5,12.5,16,16],"rotation":180,"texture":"#6"} + } + }, + { + "name":"B9", + "from":[7,1.95,9], + "to":[14,14.05,24], + "rotation":{"angle":-22.5,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[7.5,0,11,6],"texture":"#6"}, + "east":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "south":{"uv":[7.5,6,11,12],"texture":"#6"}, + "west":{"uv":[0,0,7.5,6],"texture":"#6"}, + "up":{"uv":[0,9.5,7.5,13],"rotation":90,"texture":"#6"}, + "down":{"uv":[0,9.5,7.5,13],"rotation":270,"texture":"#6"} + } + }, + { + "name":"B10", + "from":[6,1.9,9], + "to":[14,14.1,24], + "rotation":{"angle":0,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[7.5,0,11,6],"texture":"#6"}, + "east":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "south":{"uv":[3.5,0,7.5,6],"texture":"#6"}, + "west":{"uv":[0,0,7.5,6],"texture":"#6"}, + "up":{"uv":[0,6,7.5,10],"rotation":90,"texture":"#6"}, + "down":{"uv":[0,6,7.5,9.5],"rotation":270,"texture":"#6"} + } + }, + { + "name":"B11", + "from":[7,1.95,9], + "to":[14,14.05,24], + "rotation":{"angle":22.5,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[7.5,0,11,6],"texture":"#6"}, + "east":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "south":{"uv":[7.5,6,11,12],"texture":"#6"}, + "west":{"uv":[0,0,7.5,6],"texture":"#6"}, + "up":{"uv":[8.5,12.5,16,16],"rotation":90,"texture":"#6"}, + "down":{"uv":[8.5,12.5,16,16],"rotation":270,"texture":"#6"} + } + }, + { + "name":"B12", + "from":[6,1.9,9], + "to":[14,14.1,24], + "rotation":{"angle":45,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[7.5,0,11,6],"texture":"#6"}, + "east":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "south":{"uv":[3.5,0,7.5,6],"texture":"#6"}, + "west":{"uv":[0,0,7.5,6],"texture":"#6"}, + "up":{"uv":[0,6.5,7.5,10.5],"rotation":90,"texture":"#6"}, + "down":{"uv":[0,6,7.5,9.5],"rotation":270,"texture":"#6"} + } + }, + { + "name":"B13", + "from":[9,1.95,2], + "to":[24,14.05,9], + "rotation":{"angle":-22.5,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "east":{"uv":[7.5,6,11,12],"texture":"#6"}, + "south":{"uv":[0,0,7.5,6],"texture":"#6"}, + "west":{"uv":[7.5,0,11,6],"texture":"#6"}, + "up":{"uv":[0,9.5,7.5,13],"texture":"#6"}, + "down":{"uv":[0,9.5,7.5,13],"texture":"#6"} + } + }, + { + "name":"B14", + "from":[9,1.9,2], + "to":[24,14.1,10], + "rotation":{"angle":0,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "east":{"uv":[3.5,0,7.5,6],"texture":"#6"}, + "south":{"uv":[0,0,7.5,6],"texture":"#6"}, + "west":{"uv":[7.5,0,11,6],"texture":"#6"}, + "up":{"uv":[0,7.5,7.5,11.5],"texture":"#6"}, + "down":{"uv":[0,6,7.5,9.5],"texture":"#6"} + } + }, + { + "name":"B15", + "from":[9,1.95,2], + "to":[24,14.05,9], + "rotation":{"angle":22.5,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "east":{"uv":[11,0,14.5,6],"texture":"#6"}, + "south":{"uv":[0,0,7.5,6],"texture":"#6"}, + "west":{"uv":[7.5,0,11,6],"texture":"#6"}, + "up":{"uv":[8.5,12.5,16,16],"texture":"#6"}, + "down":{"uv":[8.5,12.5,16,16],"texture":"#6"} + } + }, + { + "name":"B16", + "from":[2,1.9,-8], + "to":[10,14.1,7], + "rotation":{"angle":-45,"axis":"y","origin":[8,7.95,8]}, + "faces":{ + "north":{"uv":[3.5,0,7.5,6],"texture":"#6"}, + "east":{"uv":[0,0,7.5,6],"texture":"#6"}, + "south":{"uv":[7.5,0,11,6],"texture":"#6"}, + "west":{"uv":[1.5,6,7.5,0],"rotation":180,"texture":"#6"}, + "up":{"uv":[0,6.5,7.5,10.5],"rotation":270,"texture":"#6"}, + "down":{"uv":[0,6,7.5,9.5],"rotation":90,"texture":"#6"} + } + }, + { + "name":"AxisCoat", + "from":[4,1,4], + "to":[12,15,12], + "shade":false, + "faces":{ + "north":{"uv":[4,1,12,15],"texture":"#log_top"}, + "east":{"uv":[4,1,12,15],"texture":"#log_top"}, + "south":{"uv":[4,1,12,15],"texture":"#log_top"}, + "west":{"uv":[4,1,12,15],"texture":"#log_top"}, + "up":{"uv":[4,4,12,12],"texture":"#log_top"}, + "down":{"uv":[4,4,12,12],"texture":"#log_top"} + } + }, + { + "name":"Cover", + "from":[-4,1.85,-4], + "to":[20,14.15,20], + "faces":{ + "up":{"uv":[2,2,14,14],"texture":"#crushing_wheel"}, + "down":{"uv":[2,2,14,14],"texture":"#crushing_wheel"} + } + } + ], + "groups":[ + {"name":"crushing_wheel","origin":[8,8,8],"children":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]} + ] +} diff --git a/src-create/assets/create/models/item/andesite_casing.json b/src-create/assets/create/models/item/andesite_casing.json new file mode 100644 index 00000000..74c3ece3 --- /dev/null +++ b/src-create/assets/create/models/item/andesite_casing.json @@ -0,0 +1,6 @@ +{ + "parent":"create:block/andesite_casing", + "textures":{ + "all":"create:block/andesite_casing_inventory" + } +} diff --git a/src-create/assets/create/models/item/basin.json b/src-create/assets/create/models/item/basin.json new file mode 100644 index 00000000..7d41a252 --- /dev/null +++ b/src-create/assets/create/models/item/basin.json @@ -0,0 +1,7 @@ +{ + "parent":"create:block/basin/block", + "textures":{ + "1":"create:block/basin_side_inventory", + "12":"create:block/basin_inventory" + } +} diff --git a/src-create/assets/create/models/item/brass_casing.json b/src-create/assets/create/models/item/brass_casing.json new file mode 100644 index 00000000..714fd159 --- /dev/null +++ b/src-create/assets/create/models/item/brass_casing.json @@ -0,0 +1,6 @@ +{ + "parent":"create:block/brass_casing", + "textures":{ + "all":"create:block/brass_casing_inventory" + } +} diff --git a/src-create/assets/create/models/item/brass_funnel.json b/src-create/assets/create/models/item/brass_funnel.json new file mode 100644 index 00000000..6294a9bc --- /dev/null +++ b/src-create/assets/create/models/item/brass_funnel.json @@ -0,0 +1,10 @@ +{ + "parent":"create:block/funnel/item", + "textures":{ + "7":"create:block/brass_funnel_plating_inventory", + "2":"create:block/brass_funnel_neutral_inventory", + "6":"create:block/brass_funnel_inventory", + "5":"create:block/brass_funnel_tall_inventory", + "3":"create:block/brass_funnel_back_inventory" + } +} diff --git a/src-create/assets/create/models/item/brass_tunnel.json b/src-create/assets/create/models/item/brass_tunnel.json new file mode 100644 index 00000000..961f46af --- /dev/null +++ b/src-create/assets/create/models/item/brass_tunnel.json @@ -0,0 +1,7 @@ +{ + "parent":"create:block/belt_tunnel/item", + "textures":{ + "1":"create:block/brass_tunnel_top_inventory", + "2":"create:block/brass_tunnel_inventory" + } +} diff --git a/src-create/assets/create/models/item/chute.json b/src-create/assets/create/models/item/chute.json new file mode 100644 index 00000000..5382b7b6 --- /dev/null +++ b/src-create/assets/create/models/item/chute.json @@ -0,0 +1,6 @@ +{ + "parent":"create:block/chute/block", + "textures":{ + "13":"create:block/chute_inventory" + } +} diff --git a/src-create/assets/create/models/item/copper_casing.json b/src-create/assets/create/models/item/copper_casing.json new file mode 100644 index 00000000..a083a958 --- /dev/null +++ b/src-create/assets/create/models/item/copper_casing.json @@ -0,0 +1,6 @@ +{ + "parent":"create:block/copper_casing", + "textures":{ + "all":"create:block/copper_casing_inventory" + } +} diff --git a/src-create/assets/create/models/item/copper_valve_handle.json b/src-create/assets/create/models/item/copper_valve_handle.json new file mode 100644 index 00000000..963a0bf5 --- /dev/null +++ b/src-create/assets/create/models/item/copper_valve_handle.json @@ -0,0 +1,6 @@ +{ + "parent":"create:block/copper_valve_handle", + "textures":{ + "3": "create:block/valve_handle/valve_handle_copper_inventory" + } +} diff --git a/src-create/assets/create/models/item/crushing_wheel.json b/src-create/assets/create/models/item/crushing_wheel.json new file mode 100644 index 00000000..9e8d805e --- /dev/null +++ b/src-create/assets/create/models/item/crushing_wheel.json @@ -0,0 +1,10 @@ +{ + "parent":"create:block/crushing_wheel", + "textures":{ + "6":"create:block/crushing_wheel_body_inventory", + "spruce_log_top":"create:block/smooth_dark_log_top_inventory", + "axis_top":"create:block/axis_top_inventory", + "axis":"create:block/axis_inventory", + "crushing_wheel":"create:block/crushing_wheel_inventory" + } +} diff --git a/src-create/assets/create/models/item/encased_chain_drive.json b/src-create/assets/create/models/item/encased_chain_drive.json new file mode 100644 index 00000000..d72e195a --- /dev/null +++ b/src-create/assets/create/models/item/encased_chain_drive.json @@ -0,0 +1,9 @@ +{ + "parent":"create:block/encased_chain_drive/item", + "textures":{ + "side":"create:block/encased_chain_drive_inventory", + "1":"create:block/gearbox_inventory", + "1_0":"create:block/axis_inventory", + "1_1":"create:block/axis_top_inventory" + } +} diff --git a/src-create/assets/create/models/item/mechanical_press.json b/src-create/assets/create/models/item/mechanical_press.json new file mode 100644 index 00000000..f68a38a2 --- /dev/null +++ b/src-create/assets/create/models/item/mechanical_press.json @@ -0,0 +1,14 @@ +{ + "parent":"create:block/mechanical_press/item", + "textures":{ + "0":"create:block/axis_inventory", + "1":"create:block/axis_top_inventory", + "8":"create:block/mechanical_press_side_inventory", + "mechanical_press_head":"create:block/mechanical_press_head_inventory", + "gearbox_top":"create:block/gearbox_top_inventory", + "mechanical_press_pole":"create:block/mechanical_press_pole_inventory", + "gearbox":"create:block/gearbox_inventory", + "mechanical_press_top":"create:block/mechanical_press_top_inventory", + "mechanical_press_bottom":"create:block/mechanical_press_bottom_inventory" + } +} diff --git a/src-create/assets/create/models/item/metal_bracket.json b/src-create/assets/create/models/item/metal_bracket.json new file mode 100644 index 00000000..f2f478c4 --- /dev/null +++ b/src-create/assets/create/models/item/metal_bracket.json @@ -0,0 +1,7 @@ +{ + "parent":"create:block/bracket/item", + "textures":{ + "bracket":"create:block/bracket_metal_inventory", + "plate":"create:block/bracket_plate_metal_inventory" + } +} diff --git a/src-create/assets/create/models/item/piston_extension_pole.json b/src-create/assets/create/models/item/piston_extension_pole.json new file mode 100644 index 00000000..a510641c --- /dev/null +++ b/src-create/assets/create/models/item/piston_extension_pole.json @@ -0,0 +1,7 @@ +{ + "parent":"create:block/piston_extension_pole", + "textures":{ + "0":"block/piston_side_inventory", + "1":"create:block/pole_end" + } +} diff --git a/src-create/assets/create/models/item/shaft.json b/src-create/assets/create/models/item/shaft.json new file mode 100644 index 00000000..247d9a5b --- /dev/null +++ b/src-create/assets/create/models/item/shaft.json @@ -0,0 +1,11 @@ +{ + "parent":"block/block", + "textures":{ + "particle":"create:block/axis_inventory", + "0":"create:block/axis_inventory", + "1":"create:block/axis_top_inventory" + }, + "elements":[ + {"name":"Axis","from":[6.0,0.0,6.0],"to":[10.0,16.0,10.0],"faces":{"north":{"texture":"#0","uv":[6.0,0.0,10.0,16.0]},"east":{"texture":"#0","uv":[6.0,0.0,10.0,16.0]},"south":{"texture":"#0","uv":[6.0,0.0,10.0,16.0]},"west":{"texture":"#0","uv":[6.0,0.0,10.0,16.0]},"up":{"texture":"#1","uv":[6.0,6.0,10.0,10.0]},"down":{"texture":"#1","uv":[6.0,6.0,10.0,10.0]}}} + ] +} diff --git a/src-create/assets/create/models/item/turntable.json b/src-create/assets/create/models/item/turntable.json new file mode 100644 index 00000000..08e5b1fa --- /dev/null +++ b/src-create/assets/create/models/item/turntable.json @@ -0,0 +1,11 @@ +{ + "parent":"create:block/turntable", + "textures":{ + "0":"create:block/axis_inventory", + "1":"block/stripped_spruce_log_inventory", + "2":"block/stripped_spruce_log_top_inventory", + "3":"create:block/axis_top_inventory", + "5":"create:block/gearbox_top_inventory", + "6":"create:block/encased_chain_drive_inventory" + } +} diff --git a/src-create/assets/create/optifine/color.properties b/src-create/assets/create/optifine/color.properties new file mode 100644 index 00000000..93e112b5 --- /dev/null +++ b/src-create/assets/create/optifine/color.properties @@ -0,0 +1,4 @@ +screen.loading=151515 +screen.loading.bar=0c0c0c +screen.loading.outline=b08020 +screen.loading.progress=6f767a diff --git a/src-create/assets/create/textures/block/andesite_casing/andesite_casing.png b/src-create/assets/create/textures/block/andesite_casing/andesite_casing.png new file mode 100644 index 00000000..e233f328 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing/andesite_casing.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing/color.png b/src-create/assets/create/textures/block/andesite_casing/color.png new file mode 100644 index 00000000..bae58a15 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing/color.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing/height.png b/src-create/assets/create/textures/block/andesite_casing/height.png new file mode 100644 index 00000000..df36780c Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing/height.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing/mat.yml b/src-create/assets/create/textures/block/andesite_casing/mat.yml new file mode 100644 index 00000000..da7505a6 --- /dev/null +++ b/src-create/assets/create/textures/block/andesite_casing/mat.yml @@ -0,0 +1,13 @@ +publish-item: true +normal: + noise: 2 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + method: sobel-low + strength: 2 +occlusion: + z-scale: 5 +f0: + value: 0.04 diff --git a/src-create/assets/create/textures/block/andesite_casing/normal.png b/src-create/assets/create/textures/block/andesite_casing/normal.png new file mode 100644 index 00000000..f1be0733 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing/normal.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing/occlusion.png b/src-create/assets/create/textures/block/andesite_casing/occlusion.png new file mode 100644 index 00000000..75245355 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing/occlusion.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing/porosity.png b/src-create/assets/create/textures/block/andesite_casing/porosity.png new file mode 100644 index 00000000..b52c4120 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing/porosity.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing/smooth.png b/src-create/assets/create/textures/block/andesite_casing/smooth.png new file mode 100644 index 00000000..938d4df3 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing/smooth.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_belt/andesite_casing_belt.png b/src-create/assets/create/textures/block/andesite_casing_belt/andesite_casing_belt.png new file mode 100644 index 00000000..2bf71965 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_belt/andesite_casing_belt.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_belt/color.png b/src-create/assets/create/textures/block/andesite_casing_belt/color.png new file mode 100644 index 00000000..c1501933 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_belt/color.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_belt/f0.png b/src-create/assets/create/textures/block/andesite_casing_belt/f0.png new file mode 100644 index 00000000..b88867e9 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_belt/f0.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_belt/height.png b/src-create/assets/create/textures/block/andesite_casing_belt/height.png new file mode 100644 index 00000000..d2c0dfd5 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_belt/height.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_belt/mat.yml b/src-create/assets/create/textures/block/andesite_casing_belt/mat.yml new file mode 100644 index 00000000..d2b3c5ef --- /dev/null +++ b/src-create/assets/create/textures/block/andesite_casing_belt/mat.yml @@ -0,0 +1,51 @@ +texture-size: 64 +normal: + noise: 2 + method: sobel-low + strength: 2 +filters: +- name: top + left: 0 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.15 +- name: horizontal + left: 0.5 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-y: 90 + normal-radius-y: 0.15 +- name: side-large + left: 0 + top: 0.5 + width: 0.5 + height: 0.34375 + normal-curve-y: 90 + normal-radius-y: 0.2 +- name: side-medium + left: 0.5 + top: 0.5 + width: 0.5 + height: 0.28125 + normal-curve-y: 90 + normal-radius-y: 0.25 +- name: side-small + left: 0.5 + top: 0.78125 + width: 0.5 + height: 0.1875 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: end + left: 0 + top: 0.84375 + width: 0.375 + height: 0.09375 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.2 diff --git a/src-create/assets/create/textures/block/andesite_casing_belt/normal.png b/src-create/assets/create/textures/block/andesite_casing_belt/normal.png new file mode 100644 index 00000000..8aae1512 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_belt/normal.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_belt/smooth.png b/src-create/assets/create/textures/block/andesite_casing_belt/smooth.png new file mode 100644 index 00000000..bddffea7 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_belt/smooth.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/andesite_casing_connected.png b/src-create/assets/create/textures/block/andesite_casing_connected/andesite_casing_connected.png new file mode 100644 index 00000000..ccc977e8 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_connected/andesite_casing_connected.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/color.png b/src-create/assets/create/textures/block/andesite_casing_connected/color.png new file mode 100644 index 00000000..9b1b483b Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_connected/color.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/height.png b/src-create/assets/create/textures/block/andesite_casing_connected/height.png new file mode 100644 index 00000000..466dde41 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_connected/height.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/mat.yml b/src-create/assets/create/textures/block/andesite_casing_connected/mat.yml new file mode 100644 index 00000000..bcdd0df6 --- /dev/null +++ b/src-create/assets/create/textures/block/andesite_casing_connected/mat.yml @@ -0,0 +1,10 @@ +texture-size: 256 +wrap-x: false +wrap-y: false +normal: + noise: 2 + method: sobel-low +occlusion: + z-scale: 3 +f0: + value: 0.04 diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/normal.png b/src-create/assets/create/textures/block/andesite_casing_connected/normal.png new file mode 100644 index 00000000..c53cccf2 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_connected/normal.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/occlusion.png b/src-create/assets/create/textures/block/andesite_casing_connected/occlusion.png new file mode 100644 index 00000000..27bb550c Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_connected/occlusion.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/opacity.png b/src-create/assets/create/textures/block/andesite_casing_connected/opacity.png new file mode 100644 index 00000000..f104565f Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_connected/opacity.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/porosity.png b/src-create/assets/create/textures/block/andesite_casing_connected/porosity.png new file mode 100644 index 00000000..5c28b37e Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_connected/porosity.png differ diff --git a/src-create/assets/create/textures/block/andesite_casing_connected/smooth.png b/src-create/assets/create/textures/block/andesite_casing_connected/smooth.png new file mode 100644 index 00000000..e87e2fc6 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_casing_connected/smooth.png differ diff --git a/src-create/assets/create/textures/block/andesite_frame/andesite_frame.png b/src-create/assets/create/textures/block/andesite_frame/andesite_frame.png new file mode 100644 index 00000000..6dd138e4 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_frame/andesite_frame.png differ diff --git a/src-create/assets/create/textures/block/andesite_frame/height.png b/src-create/assets/create/textures/block/andesite_frame/height.png new file mode 100644 index 00000000..2d00e7b8 Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_frame/height.png differ diff --git a/src-create/assets/create/textures/block/andesite_frame/mat.yml b/src-create/assets/create/textures/block/andesite_frame/mat.yml new file mode 100644 index 00000000..5f9482c1 --- /dev/null +++ b/src-create/assets/create/textures/block/andesite_frame/mat.yml @@ -0,0 +1,20 @@ +publish-item: true +blend-mode: cutout +color: + value: '#636663' +normal: + noise: 2 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + method: sobel-low + strength: 2 +occlusion: + z-scale: 5 +smooth: + value: 0.33 +f0: + value: 0.04 +porosity: + value: 0.25 diff --git a/src-create/assets/create/textures/block/andesite_frame/normal.png b/src-create/assets/create/textures/block/andesite_frame/normal.png new file mode 100644 index 00000000..50e9e6aa Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_frame/normal.png differ diff --git a/src-create/assets/create/textures/block/andesite_frame/occlusion.png b/src-create/assets/create/textures/block/andesite_frame/occlusion.png new file mode 100644 index 00000000..cf6e1e4a Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_frame/occlusion.png differ diff --git a/src-create/assets/create/textures/block/andesite_frame/opacity.png b/src-create/assets/create/textures/block/andesite_frame/opacity.png new file mode 100644 index 00000000..14206bed Binary files /dev/null and b/src-create/assets/create/textures/block/andesite_frame/opacity.png differ diff --git a/src-create/assets/create/textures/block/axis/axis.png b/src-create/assets/create/textures/block/axis/axis.png new file mode 100644 index 00000000..04b8fada Binary files /dev/null and b/src-create/assets/create/textures/block/axis/axis.png differ diff --git a/src-create/assets/create/textures/block/axis/mat.yml b/src-create/assets/create/textures/block/axis/mat.yml new file mode 100644 index 00000000..f3816183 --- /dev/null +++ b/src-create/assets/create/textures/block/axis/mat.yml @@ -0,0 +1,14 @@ +publish-item: true +texture-size: 32 +model: create:block/shaft +color: + value: '#888080' +smooth: + value: 0.6 +hcm: + value: 230 +filters: +- name: default + left: 0.375 + width: 0.25 + normal-curve-x: 90 diff --git a/src-create/assets/create/textures/block/axis/opacity.png b/src-create/assets/create/textures/block/axis/opacity.png new file mode 100644 index 00000000..563767d2 Binary files /dev/null and b/src-create/assets/create/textures/block/axis/opacity.png differ diff --git a/src-create/assets/create/textures/block/axis_top/axis_top.png b/src-create/assets/create/textures/block/axis_top/axis_top.png new file mode 100644 index 00000000..aa1b0095 Binary files /dev/null and b/src-create/assets/create/textures/block/axis_top/axis_top.png differ diff --git a/src-create/assets/create/textures/block/axis_top/height.png b/src-create/assets/create/textures/block/axis_top/height.png new file mode 100644 index 00000000..753f79a2 Binary files /dev/null and b/src-create/assets/create/textures/block/axis_top/height.png differ diff --git a/src-create/assets/create/textures/block/axis_top/mat.yml b/src-create/assets/create/textures/block/axis_top/mat.yml new file mode 100644 index 00000000..93096909 --- /dev/null +++ b/src-create/assets/create/textures/block/axis_top/mat.yml @@ -0,0 +1,19 @@ +publish-item: true +texture-size: 32 +model: create:block/shaft +color: + value: '#888080' +normal: + method: sobel-high +smooth: + value: 0.6 +hcm: + value: 230 +filters: +- name: default + left: 0.40625 + top: 0.40625 + width: 0.1875 + height: 0.1875 + normal-curve-x: -40 + normal-curve-y: -40 diff --git a/src-create/assets/create/textures/block/axis_top/opacity.png b/src-create/assets/create/textures/block/axis_top/opacity.png new file mode 100644 index 00000000..64d809dd Binary files /dev/null and b/src-create/assets/create/textures/block/axis_top/opacity.png differ diff --git a/src-create/assets/create/textures/block/basin/basin.png b/src-create/assets/create/textures/block/basin/basin.png new file mode 100644 index 00000000..2ddf631b Binary files /dev/null and b/src-create/assets/create/textures/block/basin/basin.png differ diff --git a/src-create/assets/create/textures/block/basin/mat.yml b/src-create/assets/create/textures/block/basin/mat.yml new file mode 100644 index 00000000..87ae801b --- /dev/null +++ b/src-create/assets/create/textures/block/basin/mat.yml @@ -0,0 +1,14 @@ +publish-item: true +model: create:block/basin/block +color: + value: '#B7A8A8' +normal: + noise: 0.5 + curve-x: 90 + curve-y: 90 + radius-x: 0.2 + radius-y: 0.2 +smooth: + value: 0.5 +hcm: + value: 230 diff --git a/src-create/assets/create/textures/block/basin_canal/basin_canal.png b/src-create/assets/create/textures/block/basin_canal/basin_canal.png new file mode 100644 index 00000000..b2255893 Binary files /dev/null and b/src-create/assets/create/textures/block/basin_canal/basin_canal.png differ diff --git a/src-create/assets/create/textures/block/basin_canal/color.png b/src-create/assets/create/textures/block/basin_canal/color.png new file mode 100644 index 00000000..afb28061 Binary files /dev/null and b/src-create/assets/create/textures/block/basin_canal/color.png differ diff --git a/src-create/assets/create/textures/block/basin_canal/mat.yml b/src-create/assets/create/textures/block/basin_canal/mat.yml new file mode 100644 index 00000000..e90a2828 --- /dev/null +++ b/src-create/assets/create/textures/block/basin_canal/mat.yml @@ -0,0 +1,27 @@ +publish-item: true +model: create:block/basin/block_directional +normal: + noise: 0.5 +smooth: + value: 0.5 +hcm: + value: 230 +filters: +- name: side + left: 0 + top: 0 + width: 0.5 + height: 0.5625 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.5 + normal-radius-y: 0.2 +- name: end + left: 0.5 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.5 + normal-radius-y: 0.5 diff --git a/src-create/assets/create/textures/block/basin_side/basin_side.png b/src-create/assets/create/textures/block/basin_side/basin_side.png new file mode 100644 index 00000000..37d21342 Binary files /dev/null and b/src-create/assets/create/textures/block/basin_side/basin_side.png differ diff --git a/src-create/assets/create/textures/block/basin_side/bump.png b/src-create/assets/create/textures/block/basin_side/bump.png new file mode 100644 index 00000000..60a6bf4c Binary files /dev/null and b/src-create/assets/create/textures/block/basin_side/bump.png differ diff --git a/src-create/assets/create/textures/block/basin_side/color.png b/src-create/assets/create/textures/block/basin_side/color.png new file mode 100644 index 00000000..8de27703 Binary files /dev/null and b/src-create/assets/create/textures/block/basin_side/color.png differ diff --git a/src-create/assets/create/textures/block/basin_side/mat.yml b/src-create/assets/create/textures/block/basin_side/mat.yml new file mode 100644 index 00000000..59fc2f22 --- /dev/null +++ b/src-create/assets/create/textures/block/basin_side/mat.yml @@ -0,0 +1,28 @@ +publish-item: true +model: create:block/basin/block +normal: + noise: 0.5 + method: sobel-low + strength: 1.2372 +smooth: + value: 0.5 +hcm: + value: 230 +filters: +- name: basin + left: 0 + top: 0 + width: 1 + height: 0.875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.15 +- name: base + left: 0.125 + top: 0.875 + width: 0.75 + height: 0.125 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.2 diff --git a/src-create/assets/create/textures/block/basin_side/normal.png b/src-create/assets/create/textures/block/basin_side/normal.png new file mode 100644 index 00000000..e36d6624 Binary files /dev/null and b/src-create/assets/create/textures/block/basin_side/normal.png differ diff --git a/src-create/assets/create/textures/block/basin_side/occlusion.png b/src-create/assets/create/textures/block/basin_side/occlusion.png new file mode 100644 index 00000000..f36c9f53 Binary files /dev/null and b/src-create/assets/create/textures/block/basin_side/occlusion.png differ diff --git a/src-create/assets/create/textures/block/basin_side/opacity.png b/src-create/assets/create/textures/block/basin_side/opacity.png new file mode 100644 index 00000000..33dfe0b5 Binary files /dev/null and b/src-create/assets/create/textures/block/basin_side/opacity.png differ diff --git a/src-create/assets/create/textures/block/belt/belt.png b/src-create/assets/create/textures/block/belt/belt.png new file mode 100644 index 00000000..8f76ead9 Binary files /dev/null and b/src-create/assets/create/textures/block/belt/belt.png differ diff --git a/src-create/assets/create/textures/block/belt/color.png b/src-create/assets/create/textures/block/belt/color.png new file mode 100644 index 00000000..2967934d Binary files /dev/null and b/src-create/assets/create/textures/block/belt/color.png differ diff --git a/src-create/assets/create/textures/block/belt/mat.yml b/src-create/assets/create/textures/block/belt/mat.yml new file mode 100644 index 00000000..225d325a --- /dev/null +++ b/src-create/assets/create/textures/block/belt/mat.yml @@ -0,0 +1,16 @@ +texture-size: 16 +wrap-x: false +model: create:block/belt/middle +normal: + noise: 2 + curve-x: 90 + curve-y: 90 + radius-x: 0.3 + radius-y: 0.1 + method: sobel3 +occlusion: + z-scale: 2 +smooth: + scale: 1.4 +f0: + value: 0.043 diff --git a/src-create/assets/create/textures/block/belt/smooth.png b/src-create/assets/create/textures/block/belt/smooth.png new file mode 100644 index 00000000..0670f20f Binary files /dev/null and b/src-create/assets/create/textures/block/belt/smooth.png differ diff --git a/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll.mat.yml b/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll.mat.yml new file mode 100644 index 00000000..fc85f1fd --- /dev/null +++ b/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll.mat.yml @@ -0,0 +1,19 @@ +texture-width: 32 +texture-height: 64 +model: item/belt_middle +normal: + noise: 2 + method: sobel-low + strength: 0.6898 +occlusion: + z-scale: 1 +f0: + value: 0.043 +filters: +- name: tread + left: 0.1875 + top: 0 + width: 0.625 + height: 1 + normal-curve-x: 90 + normal-radius-x: 0.25 diff --git a/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll.png b/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll.png new file mode 100644 index 00000000..ba3ac462 Binary files /dev/null and b/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll.png differ diff --git a/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll_color.png b/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll_color.png new file mode 100644 index 00000000..1e921988 Binary files /dev/null and b/src-create/assets/create/textures/block/belt_colors.ignore/black_scroll_color.png differ diff --git a/src-create/assets/create/textures/block/belt_colors.ignore/bump.png b/src-create/assets/create/textures/block/belt_colors.ignore/bump.png new file mode 100644 index 00000000..9c354dc0 Binary files /dev/null and b/src-create/assets/create/textures/block/belt_colors.ignore/bump.png differ diff --git a/src-create/assets/create/textures/block/belt_colors.ignore/normal.png b/src-create/assets/create/textures/block/belt_colors.ignore/normal.png new file mode 100644 index 00000000..2ad0b356 Binary files /dev/null and b/src-create/assets/create/textures/block/belt_colors.ignore/normal.png differ diff --git a/src-create/assets/create/textures/block/belt_colors.ignore/occlusion.png b/src-create/assets/create/textures/block/belt_colors.ignore/occlusion.png new file mode 100644 index 00000000..f01f7460 Binary files /dev/null and b/src-create/assets/create/textures/block/belt_colors.ignore/occlusion.png differ diff --git a/src-create/assets/create/textures/block/belt_colors.ignore/smooth.png b/src-create/assets/create/textures/block/belt_colors.ignore/smooth.png new file mode 100644 index 00000000..9c354dc0 Binary files /dev/null and b/src-create/assets/create/textures/block/belt_colors.ignore/smooth.png differ diff --git a/src-create/assets/create/textures/block/belt_diagonal_scroll/belt_diagonal_scroll.png b/src-create/assets/create/textures/block/belt_diagonal_scroll/belt_diagonal_scroll.png new file mode 100644 index 00000000..9515b0fe Binary files /dev/null and b/src-create/assets/create/textures/block/belt_diagonal_scroll/belt_diagonal_scroll.png differ diff --git a/src-create/assets/create/textures/block/belt_diagonal_scroll/color.png b/src-create/assets/create/textures/block/belt_diagonal_scroll/color.png new file mode 100644 index 00000000..0db043b7 Binary files /dev/null and b/src-create/assets/create/textures/block/belt_diagonal_scroll/color.png differ diff --git a/src-create/assets/create/textures/block/belt_diagonal_scroll/mat.yml b/src-create/assets/create/textures/block/belt_diagonal_scroll/mat.yml new file mode 100644 index 00000000..7de2638b --- /dev/null +++ b/src-create/assets/create/textures/block/belt_diagonal_scroll/mat.yml @@ -0,0 +1,50 @@ +texture-width: 16 +texture-height: 32 +wrap-x: false +model: create:block/belt/diagonal_middle +normal: + noise: 2 + method: sobel3 +occlusion: + z-scale: 2 +smooth: + scale: 1.4 +f0: + value: 0.043 +filters: +- name: top + left: 0 + top: 0.0625 + width: 1 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.1 +- name: bottom + left: 0 + top: 0.4375 + width: 1 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.1 +- name: top2 + left: 0 + top: 0 + width: 1 + height: 0.0625 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.3 + normal-radius-y: 0.6 +- name: bottom2 + left: 0 + top: 0.8125 + width: 1 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.3 + normal-radius-y: 0.2 diff --git a/src-create/assets/create/textures/block/belt_diagonal_scroll/smooth.png b/src-create/assets/create/textures/block/belt_diagonal_scroll/smooth.png new file mode 100644 index 00000000..f32c154b Binary files /dev/null and b/src-create/assets/create/textures/block/belt_diagonal_scroll/smooth.png differ diff --git a/src-create/assets/create/textures/block/belt_scroll/belt_scroll.png b/src-create/assets/create/textures/block/belt_scroll/belt_scroll.png new file mode 100644 index 00000000..cba759df Binary files /dev/null and b/src-create/assets/create/textures/block/belt_scroll/belt_scroll.png differ diff --git a/src-create/assets/create/textures/block/belt_scroll/color.png b/src-create/assets/create/textures/block/belt_scroll/color.png new file mode 100644 index 00000000..b29cacc8 Binary files /dev/null and b/src-create/assets/create/textures/block/belt_scroll/color.png differ diff --git a/src-create/assets/create/textures/block/belt_scroll/mat.yml b/src-create/assets/create/textures/block/belt_scroll/mat.yml new file mode 100644 index 00000000..ebb31302 --- /dev/null +++ b/src-create/assets/create/textures/block/belt_scroll/mat.yml @@ -0,0 +1,32 @@ +texture-width: 16 +texture-height: 32 +wrap-x: false +model: create:block/belt/middle +normal: + noise: 2 + method: sobel3 +occlusion: + z-scale: 2 +smooth: + scale: 1.4 +f0: + value: 0.043 +filters: +- name: top + left: 0 + top: 0 + width: 1 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.1 +- name: bottom + left: 0 + top: 0.5 + width: 1 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.1 diff --git a/src-create/assets/create/textures/block/belt_scroll/smooth.png b/src-create/assets/create/textures/block/belt_scroll/smooth.png new file mode 100644 index 00000000..db12bb9a Binary files /dev/null and b/src-create/assets/create/textures/block/belt_scroll/smooth.png differ diff --git a/src-create/assets/create/textures/block/bracket_metal/bracket_metal.png b/src-create/assets/create/textures/block/bracket_metal/bracket_metal.png new file mode 100644 index 00000000..81f76e70 Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_metal/bracket_metal.png differ diff --git a/src-create/assets/create/textures/block/bracket_metal/color.png b/src-create/assets/create/textures/block/bracket_metal/color.png new file mode 100644 index 00000000..63afb47c Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_metal/color.png differ diff --git a/src-create/assets/create/textures/block/bracket_metal/height.png b/src-create/assets/create/textures/block/bracket_metal/height.png new file mode 100644 index 00000000..ffa31b54 Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_metal/height.png differ diff --git a/src-create/assets/create/textures/block/bracket_metal/mat.yml b/src-create/assets/create/textures/block/bracket_metal/mat.yml new file mode 100644 index 00000000..dc032103 --- /dev/null +++ b/src-create/assets/create/textures/block/bracket_metal/mat.yml @@ -0,0 +1,69 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/bracket/shaft/ground_metal +blend-mode: cutout +normal: + noise: 2 +smooth: + shift: -0.16 +hcm: + value: 230 +filters: +- name: plate-side-1 + left: 0 + top: 0.625 + width: 0.875 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.6 +- name: plate-side-2 + left: 0 + top: 0.8125 + width: 0.875 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.6 +- name: top-center + left: 0.5 + top: 0.375 + width: 0.5 + height: 0.25 + normal-curve-y: 90 + normal-radius-y: 0.5 +- name: top-end + left: 0.625 + top: 0.0625 + width: 0.25 + height: 0.125 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.5 +- name: front + left: 0 + top: 0 + width: 0.5 + height: 0.625 + normal-curve-y: 90 + normal-radius-y: 0.18 +- name: front-end + left: 0.5 + top: 0.1875 + width: 0.125 + height: 0.1875 + normal-curve-left: 45 + normal-curve-y: 90 + normal-radius-y: 0.6 +- name: end-side + left: 0.625 + top: 0.1875 + width: 0.25 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.5 + normal-radius-y: 0.6 diff --git a/src-create/assets/create/textures/block/bracket_metal/opacity.png b/src-create/assets/create/textures/block/bracket_metal/opacity.png new file mode 100644 index 00000000..32115995 Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_metal/opacity.png differ diff --git a/src-create/assets/create/textures/block/bracket_metal/smooth.png b/src-create/assets/create/textures/block/bracket_metal/smooth.png new file mode 100644 index 00000000..ef8f4727 Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_metal/smooth.png differ diff --git a/src-create/assets/create/textures/block/bracket_plate_metal/bracket_plate_metal.png b/src-create/assets/create/textures/block/bracket_plate_metal/bracket_plate_metal.png new file mode 100644 index 00000000..e9314473 Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_plate_metal/bracket_plate_metal.png differ diff --git a/src-create/assets/create/textures/block/bracket_plate_metal/color.png b/src-create/assets/create/textures/block/bracket_plate_metal/color.png new file mode 100644 index 00000000..9915e63a Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_plate_metal/color.png differ diff --git a/src-create/assets/create/textures/block/bracket_plate_metal/height.png b/src-create/assets/create/textures/block/bracket_plate_metal/height.png new file mode 100644 index 00000000..62d4417d Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_plate_metal/height.png differ diff --git a/src-create/assets/create/textures/block/bracket_plate_metal/mat.yml b/src-create/assets/create/textures/block/bracket_plate_metal/mat.yml new file mode 100644 index 00000000..477db1ed --- /dev/null +++ b/src-create/assets/create/textures/block/bracket_plate_metal/mat.yml @@ -0,0 +1,35 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/bracket/shaft/ground_metal +blend-mode: cutout +normal: + noise: 1 + method: sobel-low + strength: 2 +smooth: + shift: -0.16 +hcm: + value: 230 +filters: +- name: up + left: 0 + top: 0.125 + width: 0.875 + height: 0.875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.15 +- name: bolt-1 + left: 0.875 + top: 0.5 + width: 0.0625 + height: 0.5 + normal-curve-x: 90 +- name: bolt-2 + left: 0.9375 + top: 0.5 + width: 0.0625 + height: 0.5 + normal-curve-x: 90 diff --git a/src-create/assets/create/textures/block/bracket_plate_metal/smooth.png b/src-create/assets/create/textures/block/bracket_plate_metal/smooth.png new file mode 100644 index 00000000..e2314689 Binary files /dev/null and b/src-create/assets/create/textures/block/bracket_plate_metal/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_block/brass_block.png b/src-create/assets/create/textures/block/brass_block/brass_block.png new file mode 100644 index 00000000..a27ee0ed Binary files /dev/null and b/src-create/assets/create/textures/block/brass_block/brass_block.png differ diff --git a/src-create/assets/create/textures/block/brass_block/mat.yml b/src-create/assets/create/textures/block/brass_block/mat.yml new file mode 100644 index 00000000..5d485162 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_block/mat.yml @@ -0,0 +1,13 @@ +publish-item: true +color: + value: '#D4BF8B' +normal: + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + noise: 1 +smooth: + value: 0.5 +hcm: + value: 234 diff --git a/src-create/assets/create/textures/block/brass_casing/brass_casing.png b/src-create/assets/create/textures/block/brass_casing/brass_casing.png new file mode 100644 index 00000000..592f91ec Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing/brass_casing.png differ diff --git a/src-create/assets/create/textures/block/brass_casing/color.png b/src-create/assets/create/textures/block/brass_casing/color.png new file mode 100644 index 00000000..20757d20 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing/color.png differ diff --git a/src-create/assets/create/textures/block/brass_casing/hcm.png b/src-create/assets/create/textures/block/brass_casing/hcm.png new file mode 100644 index 00000000..769d3616 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_casing/height.png b/src-create/assets/create/textures/block/brass_casing/height.png new file mode 100644 index 00000000..c6096a61 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing/height.png differ diff --git a/src-create/assets/create/textures/block/brass_casing/mat.yml b/src-create/assets/create/textures/block/brass_casing/mat.yml new file mode 100644 index 00000000..a9a57d8e --- /dev/null +++ b/src-create/assets/create/textures/block/brass_casing/mat.yml @@ -0,0 +1,7 @@ +publish-item: true +normal: + noise: 1 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 diff --git a/src-create/assets/create/textures/block/brass_casing/smooth.png b/src-create/assets/create/textures/block/brass_casing/smooth.png new file mode 100644 index 00000000..d9de2562 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_belt/brass_casing_belt.png b/src-create/assets/create/textures/block/brass_casing_belt/brass_casing_belt.png new file mode 100644 index 00000000..25824073 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_belt/brass_casing_belt.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_belt/color.png b/src-create/assets/create/textures/block/brass_casing_belt/color.png new file mode 100644 index 00000000..197ddbbc Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_belt/color.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_belt/f0.png b/src-create/assets/create/textures/block/brass_casing_belt/f0.png new file mode 100644 index 00000000..ec31d0a9 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_belt/f0.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_belt/hcm.png b/src-create/assets/create/textures/block/brass_casing_belt/hcm.png new file mode 100644 index 00000000..e4ad3228 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_belt/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_belt/height.png b/src-create/assets/create/textures/block/brass_casing_belt/height.png new file mode 100644 index 00000000..d2c0dfd5 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_belt/height.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_belt/mat.yml b/src-create/assets/create/textures/block/brass_casing_belt/mat.yml new file mode 100644 index 00000000..1320a800 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_casing_belt/mat.yml @@ -0,0 +1,54 @@ +texture-size: 64 +wrap-x: false +wrap-y: false +model: create:block/belt_casing/horizontal_middle +normal: + noise: 2 + method: sobel-low + strength: 2 +filters: +- name: top + left: 0 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.15 +- name: horizontal + left: 0.5 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-y: 90 + normal-radius-y: 0.15 +- name: side-large + left: 0 + top: 0.5 + width: 0.5 + height: 0.34375 + normal-curve-y: 90 + normal-radius-y: 0.2 +- name: side-medium + left: 0.5 + top: 0.5 + width: 0.5 + height: 0.28125 + normal-curve-y: 90 + normal-radius-y: 0.25 +- name: side-small + left: 0.5 + top: 0.78125 + width: 0.5 + height: 0.1875 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: end + left: 0 + top: 0.84375 + width: 0.375 + height: 0.09375 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.2 diff --git a/src-create/assets/create/textures/block/brass_casing_belt/normal.png b/src-create/assets/create/textures/block/brass_casing_belt/normal.png new file mode 100644 index 00000000..8aae1512 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_belt/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_belt/smooth.png b/src-create/assets/create/textures/block/brass_casing_belt/smooth.png new file mode 100644 index 00000000..06622dde Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_belt/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_side/brass_casing_side.png b/src-create/assets/create/textures/block/brass_casing_side/brass_casing_side.png new file mode 100644 index 00000000..245cecb9 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_side/brass_casing_side.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_side/color.png b/src-create/assets/create/textures/block/brass_casing_side/color.png new file mode 100644 index 00000000..3a6edba0 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_side/color.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_side/hcm.png b/src-create/assets/create/textures/block/brass_casing_side/hcm.png new file mode 100644 index 00000000..53c47a55 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_side/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_side/height.png b/src-create/assets/create/textures/block/brass_casing_side/height.png new file mode 100644 index 00000000..c7ff9356 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_side/height.png differ diff --git a/src-create/assets/create/textures/block/brass_casing_side/mat.yml b/src-create/assets/create/textures/block/brass_casing_side/mat.yml new file mode 100644 index 00000000..ef029fc3 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_casing_side/mat.yml @@ -0,0 +1,5 @@ +publish-item: true +normal: + noise: 1 + curve-y: 90 + radius-y: 0.15 diff --git a/src-create/assets/create/textures/block/brass_casing_side/smooth.png b/src-create/assets/create/textures/block/brass_casing_side/smooth.png new file mode 100644 index 00000000..4e4f2339 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_casing_side/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel/brass_funnel.png b/src-create/assets/create/textures/block/brass_funnel/brass_funnel.png new file mode 100644 index 00000000..9b23f3c5 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel/brass_funnel.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel/color.png b/src-create/assets/create/textures/block/brass_funnel/color.png new file mode 100644 index 00000000..481943f4 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel/f0.png b/src-create/assets/create/textures/block/brass_funnel/f0.png new file mode 100644 index 00000000..77c999ad Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel/f0.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel/hcm.png b/src-create/assets/create/textures/block/brass_funnel/hcm.png new file mode 100644 index 00000000..f6d126d5 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel/height.png b/src-create/assets/create/textures/block/brass_funnel/height.png new file mode 100644 index 00000000..e1620a4d Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel/mat.yml b/src-create/assets/create/textures/block/brass_funnel/mat.yml new file mode 100644 index 00000000..4148de54 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel/mat.yml @@ -0,0 +1,18 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/brass_funnel_vertical_push +blend-mode: cutout +normal: + method: sobel-low + strength: 2 +filters: +- name: top + left: 0 + top: 0 + width: 0.75 + height: 0.25 + normal-curve-x: 45 + normal-curve-bottom: 45 + normal-radius-x: 0.2 + normal-radius-y: 0.6 diff --git a/src-create/assets/create/textures/block/brass_funnel/normal.png b/src-create/assets/create/textures/block/brass_funnel/normal.png new file mode 100644 index 00000000..510ccc73 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel/opacity.png b/src-create/assets/create/textures/block/brass_funnel/opacity.png new file mode 100644 index 00000000..daa42587 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel/smooth.png b/src-create/assets/create/textures/block/brass_funnel/smooth.png new file mode 100644 index 00000000..1e210c34 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_back/brass_funnel_back.png b/src-create/assets/create/textures/block/brass_funnel_back/brass_funnel_back.png new file mode 100644 index 00000000..7d86dd8d Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_back/brass_funnel_back.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_back/color.png b/src-create/assets/create/textures/block/brass_funnel_back/color.png new file mode 100644 index 00000000..f016224e Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_back/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_back/f0.png b/src-create/assets/create/textures/block/brass_funnel_back/f0.png new file mode 100644 index 00000000..24f65321 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_back/f0.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_back/hcm.png b/src-create/assets/create/textures/block/brass_funnel_back/hcm.png new file mode 100644 index 00000000..32c451c3 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_back/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_back/height.png b/src-create/assets/create/textures/block/brass_funnel_back/height.png new file mode 100644 index 00000000..03f9be37 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_back/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_back/mat.yml b/src-create/assets/create/textures/block/brass_funnel_back/mat.yml new file mode 100644 index 00000000..f7460d71 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_back/mat.yml @@ -0,0 +1,44 @@ +publish-item: true +texture-size: 64 +wrap-x: false +wrap-y: false +model: create:block/brass_funnel_vertical_push +blend-mode: cutout +normal: + noise: 0.5 + method: sobel-high +filters: +- name: flap + left: 0.78125 + top: 0.53125 + width: 0.09375 + height: 0.40625 + normal-curve-x: 90 + normal-radius-x: 0.75 +- name: door-panel + left: 0.375 + top: 0.5 + width: 0.375 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.2 +- name: center-up + left: 0.40625 + top: 0 + width: 0.09375 + height: 0.375 + normal-curve-right: 45 + normal-curve-y: 90 + normal-radius-x: 0.7 + normal-radius-y: 0.2 +- name: center-south + left: 0.5 + top: 0 + width: 0.21875 + height: 0.375 + normal-curve-left: 45 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.2 diff --git a/src-create/assets/create/textures/block/brass_funnel_back/opacity.png b/src-create/assets/create/textures/block/brass_funnel_back/opacity.png new file mode 100644 index 00000000..bc323eb6 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_back/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_back/smooth.png b/src-create/assets/create/textures/block/brass_funnel_back/smooth.png new file mode 100644 index 00000000..2800a321 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_back/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_neutral/brass_funnel_neutral.png b/src-create/assets/create/textures/block/brass_funnel_neutral/brass_funnel_neutral.png new file mode 100644 index 00000000..f7159190 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_neutral/brass_funnel_neutral.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_neutral/bump.png b/src-create/assets/create/textures/block/brass_funnel_neutral/bump.png new file mode 100644 index 00000000..f75c7a69 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_neutral/bump.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_neutral/height.png b/src-create/assets/create/textures/block/brass_funnel_neutral/height.png new file mode 100644 index 00000000..d98d8be3 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_neutral/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_neutral/mat.yml b/src-create/assets/create/textures/block/brass_funnel_neutral/mat.yml new file mode 100644 index 00000000..46804146 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_neutral/mat.yml @@ -0,0 +1,34 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/belt_funnel/block_retracted +blend-mode: cutout +color: + value: '#D4BF8B' +normal: + noise: 0.5 + method: sobel-low + strength: 1.5 +smooth: + value: 0.5 +hcm: + value: 234 +filters: +- name: top + left: 0 + top: 0 + width: 1 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.4 +- name: side + left: 0 + top: 0.375 + width: 1 + height: 0.375 + normal-curve-left: 45 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.4 diff --git a/src-create/assets/create/textures/block/brass_funnel_neutral/normal.png b/src-create/assets/create/textures/block/brass_funnel_neutral/normal.png new file mode 100644 index 00000000..e993fedf Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_neutral/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_neutral/occlusion.png b/src-create/assets/create/textures/block/brass_funnel_neutral/occlusion.png new file mode 100644 index 00000000..ab2fb26b Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_neutral/occlusion.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_neutral/opacity.png b/src-create/assets/create/textures/block/brass_funnel_neutral/opacity.png new file mode 100644 index 00000000..43293c09 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_neutral/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_plating/brass_funnel_plating.png b/src-create/assets/create/textures/block/brass_funnel_plating/brass_funnel_plating.png new file mode 100644 index 00000000..6c10efaa Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_plating/brass_funnel_plating.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_plating/color.png b/src-create/assets/create/textures/block/brass_funnel_plating/color.png new file mode 100644 index 00000000..683de6a5 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_plating/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_plating/hcm.png b/src-create/assets/create/textures/block/brass_funnel_plating/hcm.png new file mode 100644 index 00000000..44c8bb2d Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_plating/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_plating/height.png b/src-create/assets/create/textures/block/brass_funnel_plating/height.png new file mode 100644 index 00000000..0b58b0f9 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_plating/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_plating/mat.yml b/src-create/assets/create/textures/block/brass_funnel_plating/mat.yml new file mode 100644 index 00000000..30be6668 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_plating/mat.yml @@ -0,0 +1,54 @@ +publish-item: true +texture-size: 64 +model: create:block/brass_funnel_vertical_push +blend-mode: cutout +normal: + noise: 0.5 + method: sobel-high + strength: 2.4744 +filters: +- name: front + left: 0 + top: 0 + width: 0.5 + height: 0.65625 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.15 + normal-radius-y: 0.15 +- name: back-outer + left: 0.5 + top: 0 + width: 0.5 + height: 0.59375 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.15 + normal-radius-y: 0.15 +- name: back-inner + left: 0.5625 + top: 0.0625 + width: 0.375 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.1 + normal-radius-y: 0.1 +- name: bottom + left: 0.5 + top: 0.8125 + width: 0.5 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.4 +- name: top + left: 0.5 + top: 0.6875 + width: 0.5 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.4 diff --git a/src-create/assets/create/textures/block/brass_funnel_plating/occlusion.png b/src-create/assets/create/textures/block/brass_funnel_plating/occlusion.png new file mode 100644 index 00000000..3338c80a Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_plating/occlusion.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_plating/opacity.png b/src-create/assets/create/textures/block/brass_funnel_plating/opacity.png new file mode 100644 index 00000000..543ed030 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_plating/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_plating/smooth.png b/src-create/assets/create/textures/block/brass_funnel_plating/smooth.png new file mode 100644 index 00000000..5aec38f4 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_plating/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/brass_funnel_powered.png b/src-create/assets/create/textures/block/brass_funnel_powered/brass_funnel_powered.png new file mode 100644 index 00000000..236654fd Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/brass_funnel_powered.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/color.png b/src-create/assets/create/textures/block/brass_funnel_powered/color.png new file mode 100644 index 00000000..8355aa76 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/emissive.png b/src-create/assets/create/textures/block/brass_funnel_powered/emissive.png new file mode 100644 index 00000000..d09881b1 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/emissive.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/f0.png b/src-create/assets/create/textures/block/brass_funnel_powered/f0.png new file mode 100644 index 00000000..77c999ad Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/f0.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/hcm.png b/src-create/assets/create/textures/block/brass_funnel_powered/hcm.png new file mode 100644 index 00000000..f6d126d5 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/height.png b/src-create/assets/create/textures/block/brass_funnel_powered/height.png new file mode 100644 index 00000000..e1620a4d Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/mat.yml b/src-create/assets/create/textures/block/brass_funnel_powered/mat.yml new file mode 100644 index 00000000..467f0689 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_powered/mat.yml @@ -0,0 +1,18 @@ +publish-item: true +model: create:block/brass_belt_funnel_pulling_powered +blend-mode: cutout +normal: + method: sobel-low + strength: 2 +emissive: + scale: 0.6 +filters: +- name: top + left: 0 + top: 0 + width: 0.75 + height: 0.25 + normal-curve-x: 45 + normal-curve-bottom: 45 + normal-radius-x: 0.2 + normal-radius-y: 0.6 diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/normal.png b/src-create/assets/create/textures/block/brass_funnel_powered/normal.png new file mode 100644 index 00000000..510ccc73 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/opacity.png b/src-create/assets/create/textures/block/brass_funnel_powered/opacity.png new file mode 100644 index 00000000..daa42587 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_powered/smooth.png b/src-create/assets/create/textures/block/brass_funnel_powered/smooth.png new file mode 100644 index 00000000..1e210c34 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_powered/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_pull/brass_funnel_pull.png b/src-create/assets/create/textures/block/brass_funnel_pull/brass_funnel_pull.png new file mode 100644 index 00000000..37a056a8 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_pull/brass_funnel_pull.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_pull/color.png b/src-create/assets/create/textures/block/brass_funnel_pull/color.png new file mode 100644 index 00000000..10b74949 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_pull/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_pull/height.png b/src-create/assets/create/textures/block/brass_funnel_pull/height.png new file mode 100644 index 00000000..3fe47f78 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_pull/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_pull/mat.yml b/src-create/assets/create/textures/block/brass_funnel_pull/mat.yml new file mode 100644 index 00000000..15d47fff --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_pull/mat.yml @@ -0,0 +1,30 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/brass_funnel_vertical_pull +blend-mode: cutout +normal: + noise: 0.5 + method: sobel-high + strength: 1.5 +hcm: + value: 234 +filters: +- name: top + left: 0 + top: 0 + width: 1 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.4 +- name: side + left: 0 + top: 0.375 + width: 1 + height: 0.375 + normal-curve-left: 45 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.4 diff --git a/src-create/assets/create/textures/block/brass_funnel_pull/normal.png b/src-create/assets/create/textures/block/brass_funnel_pull/normal.png new file mode 100644 index 00000000..d3ab0bdd Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_pull/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_pull/occlusion.png b/src-create/assets/create/textures/block/brass_funnel_pull/occlusion.png new file mode 100644 index 00000000..4d936c72 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_pull/occlusion.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_pull/opacity.png b/src-create/assets/create/textures/block/brass_funnel_pull/opacity.png new file mode 100644 index 00000000..43293c09 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_pull/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_pull/smooth.png b/src-create/assets/create/textures/block/brass_funnel_pull/smooth.png new file mode 100644 index 00000000..85bdc375 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_pull/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_push/brass_funnel_push.png b/src-create/assets/create/textures/block/brass_funnel_push/brass_funnel_push.png new file mode 100644 index 00000000..6312a4dc Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_push/brass_funnel_push.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_push/color.png b/src-create/assets/create/textures/block/brass_funnel_push/color.png new file mode 100644 index 00000000..4b3fb1c4 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_push/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_push/height.png b/src-create/assets/create/textures/block/brass_funnel_push/height.png new file mode 100644 index 00000000..32acec12 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_push/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_push/mat.yml b/src-create/assets/create/textures/block/brass_funnel_push/mat.yml new file mode 100644 index 00000000..9da74a34 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_push/mat.yml @@ -0,0 +1,32 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/brass_funnel_vertical_push +blend-mode: cutout +normal: + noise: 0.5 + method: sobel-high + strength: 1.5 +smooth: + value: 0.5 +hcm: + value: 234 +filters: +- name: top + left: 0 + top: 0 + width: 1 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.4 +- name: side + left: 0 + top: 0.375 + width: 1 + height: 0.375 + normal-curve-left: 45 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.4 diff --git a/src-create/assets/create/textures/block/brass_funnel_push/opacity.png b/src-create/assets/create/textures/block/brass_funnel_push/opacity.png new file mode 100644 index 00000000..43293c09 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_push/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_push/smooth.png b/src-create/assets/create/textures/block/brass_funnel_push/smooth.png new file mode 100644 index 00000000..463db9ce Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_push/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_slope/brass_funnel_slope.png b/src-create/assets/create/textures/block/brass_funnel_slope/brass_funnel_slope.png new file mode 100644 index 00000000..b1d822d5 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_slope/brass_funnel_slope.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_slope/color.png b/src-create/assets/create/textures/block/brass_funnel_slope/color.png new file mode 100644 index 00000000..2fc0e292 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_slope/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_slope/hcm.png b/src-create/assets/create/textures/block/brass_funnel_slope/hcm.png new file mode 100644 index 00000000..90d613fd Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_slope/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_slope/mat.yml b/src-create/assets/create/textures/block/brass_funnel_slope/mat.yml new file mode 100644 index 00000000..8e2764b6 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_slope/mat.yml @@ -0,0 +1,22 @@ +publish-item: true +wrap-y: false +model: create:block/brass_funnel_vertical_push +blend-mode: cutout +filters: +- name: slope + left: 0 + top: 0.125 + width: 1 + height: 0.375 + normal-noise: 2 + normal-curve-top: 35 + normal-radius-y: 0.4 +- name: bottom + left: 0.125 + top: 0.75 + width: 0.75 + height: 0.25 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.2 + normal-radius-y: 0.6 diff --git a/src-create/assets/create/textures/block/brass_funnel_slope/opacity.png b/src-create/assets/create/textures/block/brass_funnel_slope/opacity.png new file mode 100644 index 00000000..0c929046 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_slope/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_slope/smooth.png b/src-create/assets/create/textures/block/brass_funnel_slope/smooth.png new file mode 100644 index 00000000..9a25b077 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_slope/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/brass_funnel_tall.png b/src-create/assets/create/textures/block/brass_funnel_tall/brass_funnel_tall.png new file mode 100644 index 00000000..9c26a85a Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall/brass_funnel_tall.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/color.png b/src-create/assets/create/textures/block/brass_funnel_tall/color.png new file mode 100644 index 00000000..62710b35 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/f0.png b/src-create/assets/create/textures/block/brass_funnel_tall/f0.png new file mode 100644 index 00000000..c09a1b9d Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall/f0.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/hcm.png b/src-create/assets/create/textures/block/brass_funnel_tall/hcm.png new file mode 100644 index 00000000..599c5e9f Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/height.png b/src-create/assets/create/textures/block/brass_funnel_tall/height.png new file mode 100644 index 00000000..f7b0c489 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/mat.yml b/src-create/assets/create/textures/block/brass_funnel_tall/mat.yml new file mode 100644 index 00000000..0a5d8323 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_tall/mat.yml @@ -0,0 +1,15 @@ +publish-item: true +model: create:block/brass_belt_funnel_extended_powered +normal: + method: sobel-low + strength: 2 +filters: +- name: side + left: 0 + top: 0 + width: 1 + height: 0.25 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.15 + normal-radius-y: 0.6 diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/normal.png b/src-create/assets/create/textures/block/brass_funnel_tall/normal.png new file mode 100644 index 00000000..7365a689 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/opacity.png b/src-create/assets/create/textures/block/brass_funnel_tall/opacity.png new file mode 100644 index 00000000..c9be7cf3 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall/smooth.png b/src-create/assets/create/textures/block/brass_funnel_tall/smooth.png new file mode 100644 index 00000000..eedc2889 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/brass_funnel_tall_powered.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/brass_funnel_tall_powered.png new file mode 100644 index 00000000..1497a080 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/brass_funnel_tall_powered.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/color.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/color.png new file mode 100644 index 00000000..bfeb19e5 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/color.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/emissive.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/emissive.png new file mode 100644 index 00000000..2f65f26a Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/emissive.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/f0.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/f0.png new file mode 100644 index 00000000..c09a1b9d Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/f0.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/hcm.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/hcm.png new file mode 100644 index 00000000..599c5e9f Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/height.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/height.png new file mode 100644 index 00000000..f7b0c489 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/height.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/mat.yml b/src-create/assets/create/textures/block/brass_funnel_tall_powered/mat.yml new file mode 100644 index 00000000..4b3faf3e --- /dev/null +++ b/src-create/assets/create/textures/block/brass_funnel_tall_powered/mat.yml @@ -0,0 +1,17 @@ +publish-item: true +model: create:block/brass_belt_funnel_extended_powered +normal: + method: sobel-low + strength: 2 +emissive: + scale: 0.6 +filters: +- name: side + left: 0 + top: 0 + width: 1 + height: 0.25 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.15 + normal-radius-y: 0.6 diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/normal.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/normal.png new file mode 100644 index 00000000..7365a689 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/opacity.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/opacity.png new file mode 100644 index 00000000..c9be7cf3 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_funnel_tall_powered/smooth.png b/src-create/assets/create/textures/block/brass_funnel_tall_powered/smooth.png new file mode 100644 index 00000000..eedc2889 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_funnel_tall_powered/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_gearbox/brass_gearbox.png b/src-create/assets/create/textures/block/brass_gearbox/brass_gearbox.png new file mode 100644 index 00000000..4f23fb0a Binary files /dev/null and b/src-create/assets/create/textures/block/brass_gearbox/brass_gearbox.png differ diff --git a/src-create/assets/create/textures/block/brass_gearbox/color.png b/src-create/assets/create/textures/block/brass_gearbox/color.png new file mode 100644 index 00000000..37973f63 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_gearbox/color.png differ diff --git a/src-create/assets/create/textures/block/brass_gearbox/hcm.png b/src-create/assets/create/textures/block/brass_gearbox/hcm.png new file mode 100644 index 00000000..ebf392a8 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_gearbox/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_gearbox/height.png b/src-create/assets/create/textures/block/brass_gearbox/height.png new file mode 100644 index 00000000..890d6ab7 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_gearbox/height.png differ diff --git a/src-create/assets/create/textures/block/brass_gearbox/mat.yml b/src-create/assets/create/textures/block/brass_gearbox/mat.yml new file mode 100644 index 00000000..d2749fab --- /dev/null +++ b/src-create/assets/create/textures/block/brass_gearbox/mat.yml @@ -0,0 +1,9 @@ +publish-item: true +normal: + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + noise: 1 + method: sobel-low + strength: 2 diff --git a/src-create/assets/create/textures/block/brass_gearbox/normal.png b/src-create/assets/create/textures/block/brass_gearbox/normal.png new file mode 100644 index 00000000..43bdd2d3 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_gearbox/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_gearbox/occlusion.png b/src-create/assets/create/textures/block/brass_gearbox/occlusion.png new file mode 100644 index 00000000..806bdf45 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_gearbox/occlusion.png differ diff --git a/src-create/assets/create/textures/block/brass_gearbox/smooth.png b/src-create/assets/create/textures/block/brass_gearbox/smooth.png new file mode 100644 index 00000000..a3767336 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_gearbox/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel/brass_tunnel.png b/src-create/assets/create/textures/block/brass_tunnel/brass_tunnel.png new file mode 100644 index 00000000..8d47fec0 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel/brass_tunnel.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel/color.png b/src-create/assets/create/textures/block/brass_tunnel/color.png new file mode 100644 index 00000000..c5c29e21 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel/color.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel/hcm.png b/src-create/assets/create/textures/block/brass_tunnel/hcm.png new file mode 100644 index 00000000..e4fc0b3f Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel/height.png b/src-create/assets/create/textures/block/brass_tunnel/height.png new file mode 100644 index 00000000..4a00fefa Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel/height.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel/mat.yml b/src-create/assets/create/textures/block/brass_tunnel/mat.yml new file mode 100644 index 00000000..99cafc57 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_tunnel/mat.yml @@ -0,0 +1,60 @@ +publish-item: true +texture-size: 64 +model: create:block/brass_tunnel/window +blend-mode: cutout +normal: + noise: 0.5 + method: sobel-low + strength: 2 +filters: +- name: side + left: 0 + top: 0 + width: 0.5 + height: 0.59375 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.15 + normal-radius-top: 0.1 + normal-radius-bottom: 0.05 +- name: side-window + left: 0.5 + top: 0 + width: 0.5 + height: 0.59375 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.15 + normal-radius-top: 0.1 + normal-radius-bottom: 0.05 +- name: side-bottom + left: 0 + top: 0.71875 + width: 0.5 + height: 0.0625 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.15 +- name: front + left: 0.625 + top: 0.59375 + width: 0.375 + height: 0.1875 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: front-left + left: 0 + top: 0.59375 + width: 0.59375 + height: 0.0625 + normal-curve-left: 45 + normal-curve-bottom: 45 + normal-radius-left: 0.1 +- name: front-right + left: 0 + top: 0.65625 + width: 0.59375 + height: 0.0625 + normal-curve-left: 45 + normal-curve-top: 45 + normal-radius-left: 0.1 diff --git a/src-create/assets/create/textures/block/brass_tunnel/normal.png b/src-create/assets/create/textures/block/brass_tunnel/normal.png new file mode 100644 index 00000000..2b46253a Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel/occlusion.png b/src-create/assets/create/textures/block/brass_tunnel/occlusion.png new file mode 100644 index 00000000..6aaae5cf Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel/occlusion.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel/opacity.png b/src-create/assets/create/textures/block/brass_tunnel/opacity.png new file mode 100644 index 00000000..f69407e8 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel/smooth.png b/src-create/assets/create/textures/block/brass_tunnel/smooth.png new file mode 100644 index 00000000..ae9b37d6 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel/smooth.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top/brass_tunnel_top.png b/src-create/assets/create/textures/block/brass_tunnel_top/brass_tunnel_top.png new file mode 100644 index 00000000..1d6dfb0a Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top/brass_tunnel_top.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top/height.png b/src-create/assets/create/textures/block/brass_tunnel_top/height.png new file mode 100644 index 00000000..063df29c Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top/height.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top/mat.yml b/src-create/assets/create/textures/block/brass_tunnel_top/mat.yml new file mode 100644 index 00000000..43f33cd1 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_tunnel_top/mat.yml @@ -0,0 +1,17 @@ +publish-item: true +model: create:block/brass_tunnel/straight +blend-mode: cutout +color: + value: '#D4BF8B' +normal: + curve-x: 90 + curve-y: 90 + radius-x: 0.1 + radius-y: 0.2 + noise: 0.5 + method: sobel-low + strength: 2 +smooth: + value: 0.5 +hcm: + value: 234 diff --git a/src-create/assets/create/textures/block/brass_tunnel_top/normal.png b/src-create/assets/create/textures/block/brass_tunnel_top/normal.png new file mode 100644 index 00000000..fdc54fb2 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top/occlusion.png b/src-create/assets/create/textures/block/brass_tunnel_top/occlusion.png new file mode 100644 index 00000000..de9d4dbb Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top/occlusion.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_connected/brass_tunnel_top_connected.png b/src-create/assets/create/textures/block/brass_tunnel_top_connected/brass_tunnel_top_connected.png new file mode 100644 index 00000000..e4c79e8c Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_connected/brass_tunnel_top_connected.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_connected/height.png b/src-create/assets/create/textures/block/brass_tunnel_top_connected/height.png new file mode 100644 index 00000000..918c3e53 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_connected/height.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_connected/mat.yml b/src-create/assets/create/textures/block/brass_tunnel_top_connected/mat.yml new file mode 100644 index 00000000..48c20ee2 --- /dev/null +++ b/src-create/assets/create/textures/block/brass_tunnel_top_connected/mat.yml @@ -0,0 +1,12 @@ +texture-size: 64 +model: create:block/brass_tunnel/straight +blend-mode: cutout +color: + value: '#D4BF8B' +normal: + method: sobel-low + strength: 2 +smooth: + value: 0.5 +hcm: + value: 234 diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_connected/normal.png b/src-create/assets/create/textures/block/brass_tunnel_top_connected/normal.png new file mode 100644 index 00000000..e350c3b9 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_connected/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_connected/occlusion.png b/src-create/assets/create/textures/block/brass_tunnel_top_connected/occlusion.png new file mode 100644 index 00000000..ec999f8a Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_connected/occlusion.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/brass_tunnel_top_window.png b/src-create/assets/create/textures/block/brass_tunnel_top_window/brass_tunnel_top_window.png new file mode 100644 index 00000000..3d4ba6dd Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_window/brass_tunnel_top_window.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/color.png b/src-create/assets/create/textures/block/brass_tunnel_top_window/color.png new file mode 100644 index 00000000..506bb7d3 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_window/color.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/hcm.png b/src-create/assets/create/textures/block/brass_tunnel_top_window/hcm.png new file mode 100644 index 00000000..027b05bd Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_window/hcm.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/height.png b/src-create/assets/create/textures/block/brass_tunnel_top_window/height.png new file mode 100644 index 00000000..2eae0dd4 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_window/height.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/mat.yml b/src-create/assets/create/textures/block/brass_tunnel_top_window/mat.yml new file mode 100644 index 00000000..7b91779c --- /dev/null +++ b/src-create/assets/create/textures/block/brass_tunnel_top_window/mat.yml @@ -0,0 +1,11 @@ +publish-item: true +model: create:block/brass_tunnel/window +blend-mode: cutout +normal: + curve-x: 90 + curve-y: 90 + radius-x: 0.1 + radius-y: 0.2 + noise: 0.5 + method: sobel-low + strength: 2 diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/normal.png b/src-create/assets/create/textures/block/brass_tunnel_top_window/normal.png new file mode 100644 index 00000000..b5881cf4 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_window/normal.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/occlusion.png b/src-create/assets/create/textures/block/brass_tunnel_top_window/occlusion.png new file mode 100644 index 00000000..bd11e1e5 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_window/occlusion.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/opacity.png b/src-create/assets/create/textures/block/brass_tunnel_top_window/opacity.png new file mode 100644 index 00000000..cb037460 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_window/opacity.png differ diff --git a/src-create/assets/create/textures/block/brass_tunnel_top_window/smooth.png b/src-create/assets/create/textures/block/brass_tunnel_top_window/smooth.png new file mode 100644 index 00000000..44eb0939 Binary files /dev/null and b/src-create/assets/create/textures/block/brass_tunnel_top_window/smooth.png differ diff --git a/src-create/assets/create/textures/block/chute/chute.png b/src-create/assets/create/textures/block/chute/chute.png new file mode 100644 index 00000000..15fb86cb Binary files /dev/null and b/src-create/assets/create/textures/block/chute/chute.png differ diff --git a/src-create/assets/create/textures/block/chute/color.png b/src-create/assets/create/textures/block/chute/color.png new file mode 100644 index 00000000..b63df122 Binary files /dev/null and b/src-create/assets/create/textures/block/chute/color.png differ diff --git a/src-create/assets/create/textures/block/chute/f0.png b/src-create/assets/create/textures/block/chute/f0.png new file mode 100644 index 00000000..db700c2a Binary files /dev/null and b/src-create/assets/create/textures/block/chute/f0.png differ diff --git a/src-create/assets/create/textures/block/chute/hcm.png b/src-create/assets/create/textures/block/chute/hcm.png new file mode 100644 index 00000000..2cc27032 Binary files /dev/null and b/src-create/assets/create/textures/block/chute/hcm.png differ diff --git a/src-create/assets/create/textures/block/chute/height.png b/src-create/assets/create/textures/block/chute/height.png new file mode 100644 index 00000000..47705cfa Binary files /dev/null and b/src-create/assets/create/textures/block/chute/height.png differ diff --git a/src-create/assets/create/textures/block/chute/mat.yml b/src-create/assets/create/textures/block/chute/mat.yml new file mode 100644 index 00000000..77139ccf --- /dev/null +++ b/src-create/assets/create/textures/block/chute/mat.yml @@ -0,0 +1,61 @@ +publish-item: true +texture-size: 64 +model: create:block/chute/block_windowed +blend-mode: cutout +normal: + noise: 0.5 + method: sobel3 + strength: 0.5 +filters: +- name: side-windowed + left: 0 + top: 0.4375 + width: 0.375 + height: 0.40625 + normal-curve-x: 90 + normal-radius-x: 0.4 +- name: side-top + left: 0.53125 + top: 0 + width: 0.4375 + height: 0.25 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.2 +- name: side-bottom + left: 0.5625 + top: 0.25 + width: 0.375 + height: 0.25 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.3 + normal-radius-y: 0.2 +- name: top-open + left: 0.5 + top: 0.5 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.1 + normal-radius-y: 0.1 +- name: top + left: 0 + top: 0 + width: 0.4375 + height: 0.4375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.2 +- name: rim + left: 0 + top: 0.84375 + width: 0.4375 + height: 0.15625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.4 diff --git a/src-create/assets/create/textures/block/chute/normal.png b/src-create/assets/create/textures/block/chute/normal.png new file mode 100644 index 00000000..f0c73927 Binary files /dev/null and b/src-create/assets/create/textures/block/chute/normal.png differ diff --git a/src-create/assets/create/textures/block/chute/occlusion.png b/src-create/assets/create/textures/block/chute/occlusion.png new file mode 100644 index 00000000..b1c3293d Binary files /dev/null and b/src-create/assets/create/textures/block/chute/occlusion.png differ diff --git a/src-create/assets/create/textures/block/chute/opacity.png b/src-create/assets/create/textures/block/chute/opacity.png new file mode 100644 index 00000000..54552b90 Binary files /dev/null and b/src-create/assets/create/textures/block/chute/opacity.png differ diff --git a/src-create/assets/create/textures/block/chute/smooth.png b/src-create/assets/create/textures/block/chute/smooth.png new file mode 100644 index 00000000..e17dce6e Binary files /dev/null and b/src-create/assets/create/textures/block/chute/smooth.png differ diff --git a/src-create/assets/create/textures/block/cogwheel_axis/cogwheel_axis.png b/src-create/assets/create/textures/block/cogwheel_axis/cogwheel_axis.png new file mode 100644 index 00000000..c5c30987 Binary files /dev/null and b/src-create/assets/create/textures/block/cogwheel_axis/cogwheel_axis.png differ diff --git a/src-create/assets/create/textures/block/cogwheel_axis/mat.yml b/src-create/assets/create/textures/block/cogwheel_axis/mat.yml new file mode 100644 index 00000000..a282b73e --- /dev/null +++ b/src-create/assets/create/textures/block/cogwheel_axis/mat.yml @@ -0,0 +1,14 @@ +publish-item: true +texture-size: 32 +model: create:block/cogwheel_shaft +color: + value: '#888080' +smooth: + value: 0.72 +hcm: + value: 230 +filters: +- name: default + left: 0.375 + width: 0.25 + normal-curve-x: 90 diff --git a/src-create/assets/create/textures/block/cogwheel_axis/opacity.png b/src-create/assets/create/textures/block/cogwheel_axis/opacity.png new file mode 100644 index 00000000..563767d2 Binary files /dev/null and b/src-create/assets/create/textures/block/cogwheel_axis/opacity.png differ diff --git a/src-create/assets/create/textures/block/copper_casing/bump.png b/src-create/assets/create/textures/block/copper_casing/bump.png new file mode 100644 index 00000000..d6272fdf Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing/bump.png differ diff --git a/src-create/assets/create/textures/block/copper_casing/color.png b/src-create/assets/create/textures/block/copper_casing/color.png new file mode 100644 index 00000000..0901f951 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing/color.png differ diff --git a/src-create/assets/create/textures/block/copper_casing/hcm.png b/src-create/assets/create/textures/block/copper_casing/hcm.png new file mode 100644 index 00000000..2b86101d Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing/hcm.png differ diff --git a/src-create/assets/create/textures/block/copper_casing/height.png b/src-create/assets/create/textures/block/copper_casing/height.png new file mode 100644 index 00000000..080fe1c6 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing/height.png differ diff --git a/src-create/assets/create/textures/block/copper_casing/mat.yml b/src-create/assets/create/textures/block/copper_casing/mat.yml new file mode 100644 index 00000000..30472257 --- /dev/null +++ b/src-create/assets/create/textures/block/copper_casing/mat.yml @@ -0,0 +1,15 @@ +publish-item: true +normal: + noise: 1 + curve-x: 90 + curve-y: 90 + radius-x: 0.2 + radius-y: 0.2 + method: sobel-low + strength: 1.6 +occlusion: + z-bias: 0.2 + z-scale: 2 +f0: + value: 0.04 +filters: [] diff --git a/src-create/assets/create/textures/block/copper_casing/normal.png b/src-create/assets/create/textures/block/copper_casing/normal.png new file mode 100644 index 00000000..ea5ef9c9 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing/normal.png differ diff --git a/src-create/assets/create/textures/block/copper_casing/occlusion.png b/src-create/assets/create/textures/block/copper_casing/occlusion.png new file mode 100644 index 00000000..71518981 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing/occlusion.png differ diff --git a/src-create/assets/create/textures/block/copper_casing/porosity.png b/src-create/assets/create/textures/block/copper_casing/porosity.png new file mode 100644 index 00000000..5f897a4c Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing/porosity.png differ diff --git a/src-create/assets/create/textures/block/copper_casing/smooth.png b/src-create/assets/create/textures/block/copper_casing/smooth.png new file mode 100644 index 00000000..e1e8c17f Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing/smooth.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/bump.png b/src-create/assets/create/textures/block/copper_casing_connected/bump.png new file mode 100644 index 00000000..d5c25861 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/bump.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/color.png b/src-create/assets/create/textures/block/copper_casing_connected/color.png new file mode 100644 index 00000000..a7fd0789 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/color.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/color.xcf b/src-create/assets/create/textures/block/copper_casing_connected/color.xcf new file mode 100644 index 00000000..1f2ed256 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/color.xcf differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/copper_casing_connected.png b/src-create/assets/create/textures/block/copper_casing_connected/copper_casing_connected.png new file mode 100644 index 00000000..ada86cb6 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/copper_casing_connected.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/hcm.png b/src-create/assets/create/textures/block/copper_casing_connected/hcm.png new file mode 100644 index 00000000..29810c72 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/hcm.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/height.png b/src-create/assets/create/textures/block/copper_casing_connected/height.png new file mode 100644 index 00000000..672f13ab Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/height.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/mat.yml b/src-create/assets/create/textures/block/copper_casing_connected/mat.yml new file mode 100644 index 00000000..ee1cdbe9 --- /dev/null +++ b/src-create/assets/create/textures/block/copper_casing_connected/mat.yml @@ -0,0 +1,22 @@ +texture-size: 256 +wrap-x: false +wrap-y: false +normal: + noise: 1 + method: sobel-low + strength: 1.6 +occlusion: + z-bias: 0.2 + z-scale: 2 +f0: + value: 0.04 +filters: +- name: single + left: 0 + top: 0 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.2 diff --git a/src-create/assets/create/textures/block/copper_casing_connected/normal.png b/src-create/assets/create/textures/block/copper_casing_connected/normal.png new file mode 100644 index 00000000..f9f2df2e Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/normal.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/occlusion.png b/src-create/assets/create/textures/block/copper_casing_connected/occlusion.png new file mode 100644 index 00000000..49f24add Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/occlusion.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/porosity.png b/src-create/assets/create/textures/block/copper_casing_connected/porosity.png new file mode 100644 index 00000000..233752f2 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/porosity.png differ diff --git a/src-create/assets/create/textures/block/copper_casing_connected/smooth.png b/src-create/assets/create/textures/block/copper_casing_connected/smooth.png new file mode 100644 index 00000000..70286bc9 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_casing_connected/smooth.png differ diff --git a/src-create/assets/create/textures/block/copper_gearbox/bump.png b/src-create/assets/create/textures/block/copper_gearbox/bump.png new file mode 100644 index 00000000..2557b258 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_gearbox/bump.png differ diff --git a/src-create/assets/create/textures/block/copper_gearbox/color.png b/src-create/assets/create/textures/block/copper_gearbox/color.png new file mode 100644 index 00000000..0be58f09 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_gearbox/color.png differ diff --git a/src-create/assets/create/textures/block/copper_gearbox/copper_gearbox.png b/src-create/assets/create/textures/block/copper_gearbox/copper_gearbox.png new file mode 100644 index 00000000..77befec8 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_gearbox/copper_gearbox.png differ diff --git a/src-create/assets/create/textures/block/copper_gearbox/hcm.png b/src-create/assets/create/textures/block/copper_gearbox/hcm.png new file mode 100644 index 00000000..b304b150 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_gearbox/hcm.png differ diff --git a/src-create/assets/create/textures/block/copper_gearbox/height.png b/src-create/assets/create/textures/block/copper_gearbox/height.png new file mode 100644 index 00000000..a82d9ab9 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_gearbox/height.png differ diff --git a/src-create/assets/create/textures/block/copper_gearbox/mat.yml b/src-create/assets/create/textures/block/copper_gearbox/mat.yml new file mode 100644 index 00000000..252d937f --- /dev/null +++ b/src-create/assets/create/textures/block/copper_gearbox/mat.yml @@ -0,0 +1,11 @@ +normal: + noise: 0.5 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + method: sobel-low + strength: 1.6 +occlusion: + z-bias: 0.2 + z-scale: 4 diff --git a/src-create/assets/create/textures/block/copper_gearbox/normal.png b/src-create/assets/create/textures/block/copper_gearbox/normal.png new file mode 100644 index 00000000..c8a04a28 Binary files /dev/null and b/src-create/assets/create/textures/block/copper_gearbox/normal.png differ diff --git a/src-create/assets/create/textures/block/copper_gearbox/occlusion.png b/src-create/assets/create/textures/block/copper_gearbox/occlusion.png new file mode 100644 index 00000000..e24fe6ab Binary files /dev/null and b/src-create/assets/create/textures/block/copper_gearbox/occlusion.png differ diff --git a/src-create/assets/create/textures/block/copper_gearbox/smooth.png b/src-create/assets/create/textures/block/copper_gearbox/smooth.png new file mode 100644 index 00000000..06bd84eb Binary files /dev/null and b/src-create/assets/create/textures/block/copper_gearbox/smooth.png differ diff --git a/src-create/assets/create/textures/block/crafter_top/brass_casing.png b/src-create/assets/create/textures/block/crafter_top/brass_casing.png new file mode 100644 index 00000000..592f91ec Binary files /dev/null and b/src-create/assets/create/textures/block/crafter_top/brass_casing.png differ diff --git a/src-create/assets/create/textures/block/crafter_top/color.png b/src-create/assets/create/textures/block/crafter_top/color.png new file mode 100644 index 00000000..1dbd25b8 Binary files /dev/null and b/src-create/assets/create/textures/block/crafter_top/color.png differ diff --git a/src-create/assets/create/textures/block/crafter_top/hcm.png b/src-create/assets/create/textures/block/crafter_top/hcm.png new file mode 100644 index 00000000..3261a693 Binary files /dev/null and b/src-create/assets/create/textures/block/crafter_top/hcm.png differ diff --git a/src-create/assets/create/textures/block/crafter_top/height.png b/src-create/assets/create/textures/block/crafter_top/height.png new file mode 100644 index 00000000..c6096a61 Binary files /dev/null and b/src-create/assets/create/textures/block/crafter_top/height.png differ diff --git a/src-create/assets/create/textures/block/crafter_top/mat.yml b/src-create/assets/create/textures/block/crafter_top/mat.yml new file mode 100644 index 00000000..8b0d19a2 --- /dev/null +++ b/src-create/assets/create/textures/block/crafter_top/mat.yml @@ -0,0 +1,6 @@ +normal: + noise: 1 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 diff --git a/src-create/assets/create/textures/block/crafter_top/smooth.png b/src-create/assets/create/textures/block/crafter_top/smooth.png new file mode 100644 index 00000000..d9de2562 Binary files /dev/null and b/src-create/assets/create/textures/block/crafter_top/smooth.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel/color.png b/src-create/assets/create/textures/block/crushing_wheel/color.png new file mode 100644 index 00000000..3bd8f267 Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel/color.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel/crushing_wheel.png b/src-create/assets/create/textures/block/crushing_wheel/crushing_wheel.png new file mode 100644 index 00000000..137ec3fa Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel/crushing_wheel.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel/f0.png b/src-create/assets/create/textures/block/crushing_wheel/f0.png new file mode 100644 index 00000000..bf278eb6 Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel/f0.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel/height.png b/src-create/assets/create/textures/block/crushing_wheel/height.png new file mode 100644 index 00000000..37baee1e Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel/height.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel/mat.yml b/src-create/assets/create/textures/block/crushing_wheel/mat.yml new file mode 100644 index 00000000..3193d3f8 --- /dev/null +++ b/src-create/assets/create/textures/block/crushing_wheel/mat.yml @@ -0,0 +1,13 @@ +publish-item: true +texture-size: 64 +wrap-x: false +wrap-y: false +model: create:block/crushing_wheel +blend-mode: cutout +height: + edge-fade-x: 0.1 + edge-fade-y: 0.1 +normal: + noise: 3 + method: sobel-low + strength: 2 diff --git a/src-create/assets/create/textures/block/crushing_wheel/occlusion.png b/src-create/assets/create/textures/block/crushing_wheel/occlusion.png new file mode 100644 index 00000000..87ae126f Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel/occlusion.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel/opacity.png b/src-create/assets/create/textures/block/crushing_wheel/opacity.png new file mode 100644 index 00000000..ba356226 Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel/opacity.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel/porosity.png b/src-create/assets/create/textures/block/crushing_wheel/porosity.png new file mode 100644 index 00000000..b792cc4d Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel/porosity.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel/smooth.png b/src-create/assets/create/textures/block/crushing_wheel/smooth.png new file mode 100644 index 00000000..8a6acb90 Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel/smooth.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel_body/crushing_wheel_body.png b/src-create/assets/create/textures/block/crushing_wheel_body/crushing_wheel_body.png new file mode 100644 index 00000000..316a1c2c Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel_body/crushing_wheel_body.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel_body/height.png b/src-create/assets/create/textures/block/crushing_wheel_body/height.png new file mode 100644 index 00000000..0abc5d0d Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel_body/height.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel_body/mat.yml b/src-create/assets/create/textures/block/crushing_wheel_body/mat.yml new file mode 100644 index 00000000..a1d68921 --- /dev/null +++ b/src-create/assets/create/textures/block/crushing_wheel_body/mat.yml @@ -0,0 +1,135 @@ +publish-item: true +texture-size: 64 +model: create:block/crushing_wheel +blend-mode: cutout +color: + value: '#888B8B' +normal: + noise: 8 + method: sobel3 +smooth: + value: 0.3 +f0: + value: 0.05 +porosity: + value: 0.4 +filters: +- name: B1-up + left: 0.59375 + top: 0 + width: 0.21875 + height: 0.46875 +- name: B1-down + left: 0.59375 + top: 0 + width: 0.21875 + height: 0.46875 +- name: B1-north + left: 0.46875 + top: 0.375 + width: 0.21875 + height: 0.375 +- name: B1-south + left: 0.46875 + top: 0 + width: 0.21875 + height: 0.375 +- name: B1-west + left: 0.09375 + top: 0 + width: 0.375 + height: 0.375 +- name: B1-east + left: 0 + top: 0 + width: 0.46875 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.2 +- name: B2-up + left: 0.40625 + top: 0 + width: 0.25 + height: 0.46875 +- name: B2-down + left: 0.375 + top: 0 + width: 0.21875 + height: 0.46875 +- name: B2-north + left: 0.21875 + top: 0 + width: 0.25 + height: 0.375 +- name: B3-up + left: 0.375 + top: 0 + width: 0.21875 + height: 0.46875 +- name: B3-north + left: 0.6875 + top: 0 + width: 0.21875 + height: 0.375 +- name: B4-down + left: 0.78125 + top: 0.53125 + width: 0.21875 + height: 0.46875 +- name: B5-up + left: 0 + top: 0.59375 + width: 0.46875 + height: 0.21875 +- name: B6-up + left: 0 + top: 0.40625 + width: 0.46875 + height: 0.25 +- name: B6-down + left: 0 + top: 0.375 + width: 0.46875 + height: 0.21875 +- name: B8-down + left: 0.53125 + top: 0.78125 + width: 0.46875 + height: 0.21875 +- name: B10-up + left: 0.375 + top: 0 + width: 0.25 + height: 0.46875 +- name: B11-down + left: 0.78125 + top: 0.53125 + width: 0.21875 + height: 0.46875 +- name: B12-up + left: 0.40625 + top: 0 + width: 0.25 + height: 0.46875 +- name: B13-up + left: 0 + top: 0.59375 + width: 0.46875 + height: 0.21875 +- name: B14-up + left: 0 + top: 0.46875 + width: 0.46875 + height: 0.25 +- name: B14-down + left: 0 + top: 0.375 + width: 0.46875 + height: 0.21875 +- name: B15-up + left: 0.53125 + top: 0.78125 + width: 0.46875 + height: 0.21875 diff --git a/src-create/assets/create/textures/block/crushing_wheel_body/occlusion.png b/src-create/assets/create/textures/block/crushing_wheel_body/occlusion.png new file mode 100644 index 00000000..02d54891 Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel_body/occlusion.png differ diff --git a/src-create/assets/create/textures/block/crushing_wheel_body/opacity.png b/src-create/assets/create/textures/block/crushing_wheel_body/opacity.png new file mode 100644 index 00000000..27ce0a9d Binary files /dev/null and b/src-create/assets/create/textures/block/crushing_wheel_body/opacity.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive/color.png b/src-create/assets/create/textures/block/encased_chain_drive/color.png new file mode 100644 index 00000000..fdd7bf99 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive/color.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive/encased_chain_drive.png b/src-create/assets/create/textures/block/encased_chain_drive/encased_chain_drive.png new file mode 100644 index 00000000..9cf877d4 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive/encased_chain_drive.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive/height.png b/src-create/assets/create/textures/block/encased_chain_drive/height.png new file mode 100644 index 00000000..f96021a3 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive/height.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive/mat.yml b/src-create/assets/create/textures/block/encased_chain_drive/mat.yml new file mode 100644 index 00000000..f2c7f7ef --- /dev/null +++ b/src-create/assets/create/textures/block/encased_chain_drive/mat.yml @@ -0,0 +1,12 @@ +publish-item: true +model: create:block/encased_chain_drive/single +normal: + noise: 3 + curve-y: 90 + radius-y: 0.15 + method: sobel-low + strength: 4 +occlusion: + z-scale: 8 +f0: + value: 0.04 diff --git a/src-create/assets/create/textures/block/encased_chain_drive/normal.png b/src-create/assets/create/textures/block/encased_chain_drive/normal.png new file mode 100644 index 00000000..4be28e94 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive/normal.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive/occlusion.png b/src-create/assets/create/textures/block/encased_chain_drive/occlusion.png new file mode 100644 index 00000000..297f2a3a Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive/occlusion.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive/smooth.png b/src-create/assets/create/textures/block/encased_chain_drive/smooth.png new file mode 100644 index 00000000..ee53c31a Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive/smooth.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/color.png b/src-create/assets/create/textures/block/encased_chain_drive_end/color.png new file mode 100644 index 00000000..431fa21b Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_end/color.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/encased_chain_drive_end.png b/src-create/assets/create/textures/block/encased_chain_drive_end/encased_chain_drive_end.png new file mode 100644 index 00000000..68a28457 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_end/encased_chain_drive_end.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/f0.png b/src-create/assets/create/textures/block/encased_chain_drive_end/f0.png new file mode 100644 index 00000000..b078ebbb Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_end/f0.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/hcm.png b/src-create/assets/create/textures/block/encased_chain_drive_end/hcm.png new file mode 100644 index 00000000..ee0914bd Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_end/hcm.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/height.png b/src-create/assets/create/textures/block/encased_chain_drive_end/height.png new file mode 100644 index 00000000..5f4dff6f Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_end/height.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/mat.yml b/src-create/assets/create/textures/block/encased_chain_drive_end/mat.yml new file mode 100644 index 00000000..60a5f9b4 --- /dev/null +++ b/src-create/assets/create/textures/block/encased_chain_drive_end/mat.yml @@ -0,0 +1,7 @@ +model: create:block/encased_chain_drive/end_horizontal +normal: + curve-y: 90 + radius-y: 0.15 + noise: 3 + method: sobel-low + strength: 2 diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/normal.png b/src-create/assets/create/textures/block/encased_chain_drive_end/normal.png new file mode 100644 index 00000000..221bc379 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_end/normal.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/occlusion.png b/src-create/assets/create/textures/block/encased_chain_drive_end/occlusion.png new file mode 100644 index 00000000..3ab852c5 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_end/occlusion.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_end/smooth.png b/src-create/assets/create/textures/block/encased_chain_drive_end/smooth.png new file mode 100644 index 00000000..7fc33b5b Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_end/smooth.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/color.png b/src-create/assets/create/textures/block/encased_chain_drive_middle/color.png new file mode 100644 index 00000000..e563f16f Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_middle/color.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/encased_chain_drive_middle.png b/src-create/assets/create/textures/block/encased_chain_drive_middle/encased_chain_drive_middle.png new file mode 100644 index 00000000..8d9dde30 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_middle/encased_chain_drive_middle.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/f0.png b/src-create/assets/create/textures/block/encased_chain_drive_middle/f0.png new file mode 100644 index 00000000..0ed26e26 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_middle/f0.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/hcm.png b/src-create/assets/create/textures/block/encased_chain_drive_middle/hcm.png new file mode 100644 index 00000000..af4ffc0b Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_middle/hcm.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/height.png b/src-create/assets/create/textures/block/encased_chain_drive_middle/height.png new file mode 100644 index 00000000..b3aa545d Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_middle/height.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/mat.yml b/src-create/assets/create/textures/block/encased_chain_drive_middle/mat.yml new file mode 100644 index 00000000..f9084a74 --- /dev/null +++ b/src-create/assets/create/textures/block/encased_chain_drive_middle/mat.yml @@ -0,0 +1,7 @@ +model: create:block/encased_chain_drive/middle_horizontal +normal: + curve-y: 90 + radius-y: 0.15 + noise: 3 + method: sobel-low + strength: 2 diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/normal.png b/src-create/assets/create/textures/block/encased_chain_drive_middle/normal.png new file mode 100644 index 00000000..e8f88598 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_middle/normal.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/occlusion.png b/src-create/assets/create/textures/block/encased_chain_drive_middle/occlusion.png new file mode 100644 index 00000000..79be8d44 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_middle/occlusion.png differ diff --git a/src-create/assets/create/textures/block/encased_chain_drive_middle/smooth.png b/src-create/assets/create/textures/block/encased_chain_drive_middle/smooth.png new file mode 100644 index 00000000..3651f275 Binary files /dev/null and b/src-create/assets/create/textures/block/encased_chain_drive_middle/smooth.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/bump.png b/src-create/assets/create/textures/block/fluid_pipe/bump.png new file mode 100644 index 00000000..febe6658 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/bump.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/color.png b/src-create/assets/create/textures/block/fluid_pipe/color.png new file mode 100644 index 00000000..20278fa2 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/color.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/emissive.png b/src-create/assets/create/textures/block/fluid_pipe/emissive.png new file mode 100644 index 00000000..ffb6b271 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/emissive.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/fluid_pipe.png b/src-create/assets/create/textures/block/fluid_pipe/fluid_pipe.png new file mode 100644 index 00000000..717454fc Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/fluid_pipe.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/hcm.png b/src-create/assets/create/textures/block/fluid_pipe/hcm.png new file mode 100644 index 00000000..d61de933 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/hcm.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/height.png b/src-create/assets/create/textures/block/fluid_pipe/height.png new file mode 100644 index 00000000..270e4942 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/height.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/mat.yml b/src-create/assets/create/textures/block/fluid_pipe/mat.yml new file mode 100644 index 00000000..c60e12a2 --- /dev/null +++ b/src-create/assets/create/textures/block/fluid_pipe/mat.yml @@ -0,0 +1,95 @@ +publish-item: true +texture-size: 64 +wrap-x: false +wrap-y: false +model: create:block/fluid_pipe/item +normal: + noise: 0.5 + method: sobel-low +occlusion: + z-bias: 0.2 +filters: +- name: pipe-straight-vertical + left: 0 + top: 0.5 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-radius-x: 0.7 +- name: pipe-straight-horizontal + left: 0.25 + top: 0.75 + width: 0.25 + height: 0.25 + normal-curve-y: 90 + normal-radius-y: 0.7 +- name: top? + left: 0 + top: 0 + width: 0.375 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: pipe-end + left: 0 + top: 0.375 + width: 0.25 + height: 0.125 + normal-curve-x: 90 + normal-radius-x: 0.7 +- name: pipe-corner-up-right + left: 0 + top: 0.75 + width: 0.25 + height: 0.25 + normal-curve-left: 45 + normal-curve-bottom: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.7 +- name: pipe-corner-up-left + left: 0.5 + top: 0.75 + width: 0.25 + height: 0.25 + normal-curve-right: 45 + normal-curve-bottom: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.7 +- name: pipe-corner-down-right + left: 0.5 + top: 0.5 + width: 0.25 + height: 0.25 + normal-curve-left: 45 + normal-curve-top: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.7 +- name: pipe-corner-down-left + left: 0.75 + top: 0.5 + width: 0.25 + height: 0.25 + normal-curve-right: 45 + normal-curve-top: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.7 +- name: rim-top + left: 0.375 + top: 0 + width: 0.3125 + height: 0.3125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.2 +- name: rim-side + left: 0.375 + top: 0.3125 + width: 0.3125 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.6 diff --git a/src-create/assets/create/textures/block/fluid_pipe/normal.png b/src-create/assets/create/textures/block/fluid_pipe/normal.png new file mode 100644 index 00000000..89055a2a Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/normal.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/occlusion.png b/src-create/assets/create/textures/block/fluid_pipe/occlusion.png new file mode 100644 index 00000000..0ead19d6 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/occlusion.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/opacity.png b/src-create/assets/create/textures/block/fluid_pipe/opacity.png new file mode 100644 index 00000000..933e07f0 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/opacity.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/color.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/color.png new file mode 100644 index 00000000..efe5dd58 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/color.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/emissive.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/emissive.png new file mode 100644 index 00000000..79829e6a Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/emissive.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/f0.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/f0.png new file mode 100644 index 00000000..9024c377 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/f0.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/fluid_pipe.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/fluid_pipe.png new file mode 100644 index 00000000..717454fc Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/fluid_pipe.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/hcm.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/hcm.png new file mode 100644 index 00000000..9ad23bb4 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/hcm.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/height.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/height.png new file mode 100644 index 00000000..03edb84c Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/height.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/mat.yml b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/mat.yml new file mode 100644 index 00000000..2af1c417 --- /dev/null +++ b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/mat.yml @@ -0,0 +1,37 @@ +texture-size: 32 +normal: + method: sobel-low +occlusion: + z-bias: 0.5 + z-scale: 4 +filters: +- name: straight-vertical + left: 0 + top: 0.5 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-radius-x: 0.7 +- name: straight-horizontal + left: 0.25 + top: 0.75 + width: 0.25 + height: 0.25 + normal-curve-y: 90 + normal-radius-y: 0.7 +- name: top? + left: 0 + top: 0 + width: 0.375 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: end + left: 0 + top: 0.375 + width: 0.25 + height: 0.125 + normal-curve-x: 90 + normal-radius-x: 0.7 diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/occlusion.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/occlusion.png new file mode 100644 index 00000000..ad4bba68 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/occlusion.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/opacity.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/opacity.png new file mode 100644 index 00000000..933e07f0 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/opacity.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/small.ignore/smooth.png b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/smooth.png new file mode 100644 index 00000000..4d17003a Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/small.ignore/smooth.png differ diff --git a/src-create/assets/create/textures/block/fluid_pipe/smooth.png b/src-create/assets/create/textures/block/fluid_pipe/smooth.png new file mode 100644 index 00000000..98b42e44 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_pipe/smooth.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank/bump.png b/src-create/assets/create/textures/block/fluid_tank/bump.png new file mode 100644 index 00000000..552da751 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank/bump.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank/fluid_tank.png b/src-create/assets/create/textures/block/fluid_tank/fluid_tank.png new file mode 100644 index 00000000..2df8b7dc Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank/fluid_tank.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank/mat.yml b/src-create/assets/create/textures/block/fluid_tank/mat.yml new file mode 100644 index 00000000..9645517d --- /dev/null +++ b/src-create/assets/create/textures/block/fluid_tank/mat.yml @@ -0,0 +1,17 @@ +publish-item: true +model: create:block/fluid_tank/block_single +blend-mode: cutout +color: + value: '#A76940' +normal: + noise: 0.5 + curve-x: 90 + radius-x: 0.7 + method: sobel-low +occlusion: + z-bias: 0.2 + z-scale: 2 +smooth: + value: 0.5 +hcm: + value: 234 diff --git a/src-create/assets/create/textures/block/fluid_tank/normal.png b/src-create/assets/create/textures/block/fluid_tank/normal.png new file mode 100644 index 00000000..1aa1cf33 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank/normal.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank/occlusion.png b/src-create/assets/create/textures/block/fluid_tank/occlusion.png new file mode 100644 index 00000000..5697227a Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank/occlusion.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_connected/bump.png b/src-create/assets/create/textures/block/fluid_tank_connected/bump.png new file mode 100644 index 00000000..2de34acd Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_connected/bump.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_connected/fluid_tank_connected.png b/src-create/assets/create/textures/block/fluid_tank_connected/fluid_tank_connected.png new file mode 100644 index 00000000..afdba681 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_connected/fluid_tank_connected.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_connected/mat.yml b/src-create/assets/create/textures/block/fluid_tank_connected/mat.yml new file mode 100644 index 00000000..e365d111 --- /dev/null +++ b/src-create/assets/create/textures/block/fluid_tank_connected/mat.yml @@ -0,0 +1,113 @@ +texture-size: 128 +model: create:block/fluid_tank/block_single +color: + value: '#A76940' +normal: + noise: 0.5 + method: sobel-low +occlusion: + z-bias: 0.2 + z-scale: 2 +smooth: + value: 0.5 +hcm: + value: 234 +filters: +- name: single + left: 0 + top: 0 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.7 + normal-radius-y: 0.2 +- name: single-bottom + left: 0.25 + top: 0 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.2 +- name: single-top + left: 0.5 + top: 0 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.2 +- name: single-middle + left: 0.75 + top: 0 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-radius-x: 0.7 +- name: right + left: 0 + top: 0.25 + width: 0.25 + height: 0.25 + normal-curve-right: 45 + normal-radius-x: 0.7 +- name: right-bottom + left: 0.25 + top: 0.25 + width: 0.25 + height: 0.25 + normal-curve-right: 45 + normal-curve-bottom: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.2 +- name: right-top + left: 0.5 + top: 0.25 + width: 0.25 + height: 0.25 + normal-curve-right: 45 + normal-curve-top: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.2 +- name: right-middle + left: 0.75 + top: 0.25 + width: 0.25 + height: 0.25 + normal-curve-right: 45 + normal-radius-x: 0.7 +- name: left + left: 0 + top: 0.5 + width: 0.25 + height: 0.25 + normal-curve-left: 45 + normal-radius-x: 0.7 +- name: left-bottom + left: 0.25 + top: 0.5 + width: 0.25 + height: 0.25 + normal-curve-left: 45 + normal-curve-bottom: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.2 +- name: left-top + left: 0.5 + top: 0.5 + width: 0.25 + height: 0.25 + normal-curve-left: 45 + normal-curve-top: 45 + normal-radius-x: 0.7 + normal-radius-y: 0.2 +- name: left-middle + left: 0.75 + top: 0.5 + width: 0.25 + height: 0.25 + normal-curve-left: 45 + normal-radius-x: 0.7 diff --git a/src-create/assets/create/textures/block/fluid_tank_connected/normal.png b/src-create/assets/create/textures/block/fluid_tank_connected/normal.png new file mode 100644 index 00000000..211a906c Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_connected/normal.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_connected/occlusion.png b/src-create/assets/create/textures/block/fluid_tank_connected/occlusion.png new file mode 100644 index 00000000..edea2a2e Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_connected/occlusion.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_window/bump.png b/src-create/assets/create/textures/block/fluid_tank_window/bump.png new file mode 100644 index 00000000..2b5f212d Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_window/bump.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_window/color.png b/src-create/assets/create/textures/block/fluid_tank_window/color.png new file mode 100644 index 00000000..173d923d Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_window/color.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_window/fluid_tank_window.png b/src-create/assets/create/textures/block/fluid_tank_window/fluid_tank_window.png new file mode 100644 index 00000000..d19a6f2d Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_window/fluid_tank_window.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_window/hcm.png b/src-create/assets/create/textures/block/fluid_tank_window/hcm.png new file mode 100644 index 00000000..183dd8e1 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_window/hcm.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_window/height.png b/src-create/assets/create/textures/block/fluid_tank_window/height.png new file mode 100644 index 00000000..a3223f55 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_window/height.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_window/mat.yml b/src-create/assets/create/textures/block/fluid_tank_window/mat.yml new file mode 100644 index 00000000..56443ca6 --- /dev/null +++ b/src-create/assets/create/textures/block/fluid_tank_window/mat.yml @@ -0,0 +1,12 @@ +model: create:block/fluid_tank/block_single_window +blend-mode: cutout +normal: + noise: 0.5 + method: sobel-low + strength: 1.2 +occlusion: + z-bias: 0.2 + z-scale: 2 +smooth: + value: 0.5 +filters: [] diff --git a/src-create/assets/create/textures/block/fluid_tank_window/normal.png b/src-create/assets/create/textures/block/fluid_tank_window/normal.png new file mode 100644 index 00000000..5c09300e Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_window/normal.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_window/occlusion.png b/src-create/assets/create/textures/block/fluid_tank_window/occlusion.png new file mode 100644 index 00000000..823eda8d Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_window/occlusion.png differ diff --git a/src-create/assets/create/textures/block/fluid_tank_window/opacity.png b/src-create/assets/create/textures/block/fluid_tank_window/opacity.png new file mode 100644 index 00000000..37702592 Binary files /dev/null and b/src-create/assets/create/textures/block/fluid_tank_window/opacity.png differ diff --git a/src-create/assets/create/textures/block/funnel_closed/funnel_closed.png b/src-create/assets/create/textures/block/funnel_closed/funnel_closed.png new file mode 100644 index 00000000..8d874f0e Binary files /dev/null and b/src-create/assets/create/textures/block/funnel_closed/funnel_closed.png differ diff --git a/src-create/assets/create/textures/block/funnel_closed/height.png b/src-create/assets/create/textures/block/funnel_closed/height.png new file mode 100644 index 00000000..048f28b5 Binary files /dev/null and b/src-create/assets/create/textures/block/funnel_closed/height.png differ diff --git a/src-create/assets/create/textures/block/funnel_closed/mat.yml b/src-create/assets/create/textures/block/funnel_closed/mat.yml new file mode 100644 index 00000000..4422458a --- /dev/null +++ b/src-create/assets/create/textures/block/funnel_closed/mat.yml @@ -0,0 +1,12 @@ +publish-item: true +model: create:block/brass_funnel_vertical_pull_powered +color: + value: '#CDC2C2' +normal: + noise: 0.3 + method: sobel-low + strength: 0.5 +smooth: + value: 0.55 +hcm: + value: 230 diff --git a/src-create/assets/create/textures/block/funnel_closed/occlusion.png b/src-create/assets/create/textures/block/funnel_closed/occlusion.png new file mode 100644 index 00000000..22395d60 Binary files /dev/null and b/src-create/assets/create/textures/block/funnel_closed/occlusion.png differ diff --git a/src-create/assets/create/textures/block/funnel_closed/opacity.png b/src-create/assets/create/textures/block/funnel_closed/opacity.png new file mode 100644 index 00000000..fc37dcc1 Binary files /dev/null and b/src-create/assets/create/textures/block/funnel_closed/opacity.png differ diff --git a/src-create/assets/create/textures/block/funnel_open/funnel_open.png b/src-create/assets/create/textures/block/funnel_open/funnel_open.png new file mode 100644 index 00000000..46b09cc9 Binary files /dev/null and b/src-create/assets/create/textures/block/funnel_open/funnel_open.png differ diff --git a/src-create/assets/create/textures/block/funnel_open/height.png b/src-create/assets/create/textures/block/funnel_open/height.png new file mode 100644 index 00000000..1bf38c10 Binary files /dev/null and b/src-create/assets/create/textures/block/funnel_open/height.png differ diff --git a/src-create/assets/create/textures/block/funnel_open/mat.yml b/src-create/assets/create/textures/block/funnel_open/mat.yml new file mode 100644 index 00000000..98479e4f --- /dev/null +++ b/src-create/assets/create/textures/block/funnel_open/mat.yml @@ -0,0 +1,11 @@ +publish-item: true +model: create:block/brass_funnel_vertical_push +color: + value: '#CDC2C2' +normal: + method: sobel-low + strength: 0.4 +smooth: + value: 0.5 +hcm: + value: 230 diff --git a/src-create/assets/create/textures/block/funnel_open/occlusion.png b/src-create/assets/create/textures/block/funnel_open/occlusion.png new file mode 100644 index 00000000..9cac3785 Binary files /dev/null and b/src-create/assets/create/textures/block/funnel_open/occlusion.png differ diff --git a/src-create/assets/create/textures/block/funnel_open/opacity.png b/src-create/assets/create/textures/block/funnel_open/opacity.png new file mode 100644 index 00000000..fc37dcc1 Binary files /dev/null and b/src-create/assets/create/textures/block/funnel_open/opacity.png differ diff --git a/src-create/assets/create/textures/block/gearbox/color.png b/src-create/assets/create/textures/block/gearbox/color.png new file mode 100644 index 00000000..a88ffa43 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/color.png differ diff --git a/src-create/assets/create/textures/block/gearbox/f0.png b/src-create/assets/create/textures/block/gearbox/f0.png new file mode 100644 index 00000000..d002468e Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/f0.png differ diff --git a/src-create/assets/create/textures/block/gearbox/gearbox.png b/src-create/assets/create/textures/block/gearbox/gearbox.png new file mode 100644 index 00000000..2a4fc1c3 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/gearbox.png differ diff --git a/src-create/assets/create/textures/block/gearbox/hcm.png b/src-create/assets/create/textures/block/gearbox/hcm.png new file mode 100644 index 00000000..c61e5abf Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/hcm.png differ diff --git a/src-create/assets/create/textures/block/gearbox/height.png b/src-create/assets/create/textures/block/gearbox/height.png new file mode 100644 index 00000000..890d6ab7 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/height.png differ diff --git a/src-create/assets/create/textures/block/gearbox/mat.yml b/src-create/assets/create/textures/block/gearbox/mat.yml new file mode 100644 index 00000000..c3e87269 --- /dev/null +++ b/src-create/assets/create/textures/block/gearbox/mat.yml @@ -0,0 +1,11 @@ +publish-item: true +normal: + noise: 2 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + method: sobel-low + strength: 2 +f0: + value: 0.04 diff --git a/src-create/assets/create/textures/block/gearbox/normal.png b/src-create/assets/create/textures/block/gearbox/normal.png new file mode 100644 index 00000000..43bdd2d3 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/normal.png differ diff --git a/src-create/assets/create/textures/block/gearbox/occlusion.png b/src-create/assets/create/textures/block/gearbox/occlusion.png new file mode 100644 index 00000000..806bdf45 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/occlusion.png differ diff --git a/src-create/assets/create/textures/block/gearbox/porosity.png b/src-create/assets/create/textures/block/gearbox/porosity.png new file mode 100644 index 00000000..0b1cf0eb Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/porosity.png differ diff --git a/src-create/assets/create/textures/block/gearbox/smooth.png b/src-create/assets/create/textures/block/gearbox/smooth.png new file mode 100644 index 00000000..a3767336 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox/smooth.png differ diff --git a/src-create/assets/create/textures/block/gearbox_top/color.png b/src-create/assets/create/textures/block/gearbox_top/color.png new file mode 100644 index 00000000..a5f2840a Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox_top/color.png differ diff --git a/src-create/assets/create/textures/block/gearbox_top/f0.png b/src-create/assets/create/textures/block/gearbox_top/f0.png new file mode 100644 index 00000000..943b8605 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox_top/f0.png differ diff --git a/src-create/assets/create/textures/block/gearbox_top/gearbox_top.png b/src-create/assets/create/textures/block/gearbox_top/gearbox_top.png new file mode 100644 index 00000000..073c5638 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox_top/gearbox_top.png differ diff --git a/src-create/assets/create/textures/block/gearbox_top/height.png b/src-create/assets/create/textures/block/gearbox_top/height.png new file mode 100644 index 00000000..c6096a61 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox_top/height.png differ diff --git a/src-create/assets/create/textures/block/gearbox_top/mat.yml b/src-create/assets/create/textures/block/gearbox_top/mat.yml new file mode 100644 index 00000000..c3e87269 --- /dev/null +++ b/src-create/assets/create/textures/block/gearbox_top/mat.yml @@ -0,0 +1,11 @@ +publish-item: true +normal: + noise: 2 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + method: sobel-low + strength: 2 +f0: + value: 0.04 diff --git a/src-create/assets/create/textures/block/gearbox_top/normal.png b/src-create/assets/create/textures/block/gearbox_top/normal.png new file mode 100644 index 00000000..200d633c Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox_top/normal.png differ diff --git a/src-create/assets/create/textures/block/gearbox_top/occlusion.png b/src-create/assets/create/textures/block/gearbox_top/occlusion.png new file mode 100644 index 00000000..69474106 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox_top/occlusion.png differ diff --git a/src-create/assets/create/textures/block/gearbox_top/porosity.png b/src-create/assets/create/textures/block/gearbox_top/porosity.png new file mode 100644 index 00000000..b52c4120 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox_top/porosity.png differ diff --git a/src-create/assets/create/textures/block/gearbox_top/smooth.png b/src-create/assets/create/textures/block/gearbox_top/smooth.png new file mode 100644 index 00000000..d9de2562 Binary files /dev/null and b/src-create/assets/create/textures/block/gearbox_top/smooth.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/bump.png b/src-create/assets/create/textures/block/glass_fluid_pipe/bump.png new file mode 100644 index 00000000..26147d75 Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/bump.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/color.png b/src-create/assets/create/textures/block/glass_fluid_pipe/color.png new file mode 100644 index 00000000..808e47c5 Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/color.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/f0.png b/src-create/assets/create/textures/block/glass_fluid_pipe/f0.png new file mode 100644 index 00000000..36fe92df Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/f0.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/glass_fluid_pipe.png b/src-create/assets/create/textures/block/glass_fluid_pipe/glass_fluid_pipe.png new file mode 100644 index 00000000..9510e1e1 Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/glass_fluid_pipe.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/hcm.png b/src-create/assets/create/textures/block/glass_fluid_pipe/hcm.png new file mode 100644 index 00000000..43331607 Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/hcm.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/height.png b/src-create/assets/create/textures/block/glass_fluid_pipe/height.png new file mode 100644 index 00000000..8532cc73 Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/height.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/mat.yml b/src-create/assets/create/textures/block/glass_fluid_pipe/mat.yml new file mode 100644 index 00000000..39a4a55a --- /dev/null +++ b/src-create/assets/create/textures/block/glass_fluid_pipe/mat.yml @@ -0,0 +1,27 @@ +wrap-x: true +wrap-y: false +model: create:block/fluid_pipe/window +blend-mode: transparent +normal: + noise: 0.5 +occlusion: + z-bias: 0.2 + z-scale: 2 +filters: +- name: left + left: 0 + top: 0 + width: 1 + height: 0.25 +- name: right + left: 0 + top: 0.25 + width: 1 + height: 0.25 +- name: full + left: 0 + top: 0.5 + width: 1 + height: 0.5 + normal-curve-y: 90 + normal-radius-y: 0.7 diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/normal.png b/src-create/assets/create/textures/block/glass_fluid_pipe/normal.png new file mode 100644 index 00000000..bde35a39 Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/normal.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/occlusion.png b/src-create/assets/create/textures/block/glass_fluid_pipe/occlusion.png new file mode 100644 index 00000000..1952aadf Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/occlusion.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/opacity.png b/src-create/assets/create/textures/block/glass_fluid_pipe/opacity.png new file mode 100644 index 00000000..4550a2c6 Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/opacity.png differ diff --git a/src-create/assets/create/textures/block/glass_fluid_pipe/smooth.png b/src-create/assets/create/textures/block/glass_fluid_pipe/smooth.png new file mode 100644 index 00000000..9dba75a6 Binary files /dev/null and b/src-create/assets/create/textures/block/glass_fluid_pipe/smooth.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_head/mat.yml b/src-create/assets/create/textures/block/mechanical_press_head/mat.yml new file mode 100644 index 00000000..7d347a7f --- /dev/null +++ b/src-create/assets/create/textures/block/mechanical_press_head/mat.yml @@ -0,0 +1,31 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/mechanical_press/head +color: + value: '#C9BEBE' +normal: + noise: 1 +smooth: + value: 0.5 +hcm: + value: 230 +filters: +- name: side + left: 0.0625 + top: 0 + width: 0.625 + height: 0.25 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.6 +- name: down + left: 0.0625 + top: 0.3125 + width: 0.625 + height: 0.625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 diff --git a/src-create/assets/create/textures/block/mechanical_press_head/mechanical_press_head.png b/src-create/assets/create/textures/block/mechanical_press_head/mechanical_press_head.png new file mode 100644 index 00000000..ad8ab49d Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_head/mechanical_press_head.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_pole/color.png b/src-create/assets/create/textures/block/mechanical_press_pole/color.png new file mode 100644 index 00000000..24c58fcd Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_pole/color.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_pole/f0.png b/src-create/assets/create/textures/block/mechanical_press_pole/f0.png new file mode 100644 index 00000000..ab5cf7a6 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_pole/f0.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_pole/hcm.png b/src-create/assets/create/textures/block/mechanical_press_pole/hcm.png new file mode 100644 index 00000000..05a0fd36 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_pole/hcm.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_pole/mat.yml b/src-create/assets/create/textures/block/mechanical_press_pole/mat.yml new file mode 100644 index 00000000..966ef781 --- /dev/null +++ b/src-create/assets/create/textures/block/mechanical_press_pole/mat.yml @@ -0,0 +1,51 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/mechanical_press/head +normal: + noise: 1 +filters: +- name: side-outer + left: 0 + top: 0 + width: 0.375 + height: 1 + normal-curve-x: 90 + normal-radius-x: 0.13 +- name: side-inner + left: 0.375 + top: 0 + width: 0.25 + height: 1 + normal-curve-x: -90 + normal-radius-x: 0.5 +- name: end-middle + left: 0.6875 + top: 0.0625 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: strap-1 + left: 0 + top: 0 + width: 0.625 + height: 0.125 + normal-curve-y: 90 + normal-radius-y: 0.6 +- name: strap-2 + left: 0 + top: 0.4375 + width: 0.625 + height: 0.125 + normal-curve-y: 90 + normal-radius-y: 0.6 +- name: strap-3 + left: 0 + top: 0.875 + width: 0.625 + height: 0.125 + normal-curve-y: 90 + normal-radius-y: 0.6 diff --git a/src-create/assets/create/textures/block/mechanical_press_pole/mechanical_press_pole.png b/src-create/assets/create/textures/block/mechanical_press_pole/mechanical_press_pole.png new file mode 100644 index 00000000..4694bb52 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_pole/mechanical_press_pole.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_pole/occlusion.png b/src-create/assets/create/textures/block/mechanical_press_pole/occlusion.png new file mode 100644 index 00000000..562f62b0 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_pole/occlusion.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_pole/smooth.png b/src-create/assets/create/textures/block/mechanical_press_pole/smooth.png new file mode 100644 index 00000000..a9afe3ff Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_pole/smooth.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_side/color.png b/src-create/assets/create/textures/block/mechanical_press_side/color.png new file mode 100644 index 00000000..9d938080 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_side/color.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_side/f0.png b/src-create/assets/create/textures/block/mechanical_press_side/f0.png new file mode 100644 index 00000000..7b17e5f5 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_side/f0.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_side/height.png b/src-create/assets/create/textures/block/mechanical_press_side/height.png new file mode 100644 index 00000000..346f0983 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_side/height.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_side/mat.yml b/src-create/assets/create/textures/block/mechanical_press_side/mat.yml new file mode 100644 index 00000000..5caeebd0 --- /dev/null +++ b/src-create/assets/create/textures/block/mechanical_press_side/mat.yml @@ -0,0 +1,16 @@ +publish-item: true +model: create:block/mechanical_press/block +normal: + noise: 2 + method: sobel-low + strength: 2 +filters: +- name: base + left: 0 + top: 0 + width: 1 + height: 0.875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.15 + normal-radius-y: 0.18 diff --git a/src-create/assets/create/textures/block/mechanical_press_side/mechanical_press_side.png b/src-create/assets/create/textures/block/mechanical_press_side/mechanical_press_side.png new file mode 100644 index 00000000..148e8a3d Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_side/mechanical_press_side.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_side/normal.png b/src-create/assets/create/textures/block/mechanical_press_side/normal.png new file mode 100644 index 00000000..e5a2681d Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_side/normal.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_side/occlusion.png b/src-create/assets/create/textures/block/mechanical_press_side/occlusion.png new file mode 100644 index 00000000..098c2844 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_side/occlusion.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_side/porosity.png b/src-create/assets/create/textures/block/mechanical_press_side/porosity.png new file mode 100644 index 00000000..27d0fd9d Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_side/porosity.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_side/smooth.png b/src-create/assets/create/textures/block/mechanical_press_side/smooth.png new file mode 100644 index 00000000..c96105a6 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_side/smooth.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_top/color.png b/src-create/assets/create/textures/block/mechanical_press_top/color.png new file mode 100644 index 00000000..ad6b0402 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_top/color.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_top/f0.png b/src-create/assets/create/textures/block/mechanical_press_top/f0.png new file mode 100644 index 00000000..b5f01d81 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_top/f0.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_top/hcm.png b/src-create/assets/create/textures/block/mechanical_press_top/hcm.png new file mode 100644 index 00000000..ab5c39ee Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_top/hcm.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_top/height.png b/src-create/assets/create/textures/block/mechanical_press_top/height.png new file mode 100644 index 00000000..a06a1b70 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_top/height.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_top/mat.yml b/src-create/assets/create/textures/block/mechanical_press_top/mat.yml new file mode 100644 index 00000000..b1499ff1 --- /dev/null +++ b/src-create/assets/create/textures/block/mechanical_press_top/mat.yml @@ -0,0 +1,14 @@ +publish-item: true +model: create:block/mechanical_press/block +normal: + noise: 2 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + method: sobel-high + strength: 2 +smooth: + value: 0.329 +porosity: + value: 0.251 diff --git a/src-create/assets/create/textures/block/mechanical_press_top/mechanical_press_top.png b/src-create/assets/create/textures/block/mechanical_press_top/mechanical_press_top.png new file mode 100644 index 00000000..ee9cf2d5 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_top/mechanical_press_top.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_top/occlusion.png b/src-create/assets/create/textures/block/mechanical_press_top/occlusion.png new file mode 100644 index 00000000..59177fc7 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_top/occlusion.png differ diff --git a/src-create/assets/create/textures/block/mechanical_press_top/smooth.png b/src-create/assets/create/textures/block/mechanical_press_top/smooth.png new file mode 100644 index 00000000..7262f335 Binary files /dev/null and b/src-create/assets/create/textures/block/mechanical_press_top/smooth.png differ diff --git a/src-create/assets/create/textures/block/smooth_dark_log_top/color.png b/src-create/assets/create/textures/block/smooth_dark_log_top/color.png new file mode 100644 index 00000000..f6c3e8ac Binary files /dev/null and b/src-create/assets/create/textures/block/smooth_dark_log_top/color.png differ diff --git a/src-create/assets/create/textures/block/smooth_dark_log_top/color.xcf b/src-create/assets/create/textures/block/smooth_dark_log_top/color.xcf new file mode 100644 index 00000000..e42363b7 Binary files /dev/null and b/src-create/assets/create/textures/block/smooth_dark_log_top/color.xcf differ diff --git a/src-create/assets/create/textures/block/smooth_dark_log_top/height.png b/src-create/assets/create/textures/block/smooth_dark_log_top/height.png new file mode 100644 index 00000000..f7c50a39 Binary files /dev/null and b/src-create/assets/create/textures/block/smooth_dark_log_top/height.png differ diff --git a/src-create/assets/create/textures/block/smooth_dark_log_top/mat.yml b/src-create/assets/create/textures/block/smooth_dark_log_top/mat.yml new file mode 100644 index 00000000..0e16fd14 --- /dev/null +++ b/src-create/assets/create/textures/block/smooth_dark_log_top/mat.yml @@ -0,0 +1,20 @@ +publish-item: true +height: + scale: 0.5 +normal: + noise: 3 + curve-x: 90 + curve-y: 90 + radius-x: 0.2 + radius-y: 0.2 + method: sobel-high + strength: 3 +occlusion: + step-distance: 0.2 + z-bias: 2 + z-scale: 6 +smooth: + scale: 0.5 +f0: + value: 0.04 +ctm: {} diff --git a/src-create/assets/create/textures/block/smooth_dark_log_top/normal.png b/src-create/assets/create/textures/block/smooth_dark_log_top/normal.png new file mode 100644 index 00000000..fc072980 Binary files /dev/null and b/src-create/assets/create/textures/block/smooth_dark_log_top/normal.png differ diff --git a/src-create/assets/create/textures/block/smooth_dark_log_top/occlusion.png b/src-create/assets/create/textures/block/smooth_dark_log_top/occlusion.png new file mode 100644 index 00000000..6f7b8340 Binary files /dev/null and b/src-create/assets/create/textures/block/smooth_dark_log_top/occlusion.png differ diff --git a/src-create/assets/create/textures/block/smooth_dark_log_top/porosity.png b/src-create/assets/create/textures/block/smooth_dark_log_top/porosity.png new file mode 100644 index 00000000..7a1835fc Binary files /dev/null and b/src-create/assets/create/textures/block/smooth_dark_log_top/porosity.png differ diff --git a/src-create/assets/create/textures/block/smooth_dark_log_top/smooth.png b/src-create/assets/create/textures/block/smooth_dark_log_top/smooth.png new file mode 100644 index 00000000..25581556 Binary files /dev/null and b/src-create/assets/create/textures/block/smooth_dark_log_top/smooth.png differ diff --git a/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/color.png b/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/color.png new file mode 100644 index 00000000..edc87d82 Binary files /dev/null and b/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/color.png differ diff --git a/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/hcm.png b/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/hcm.png new file mode 100644 index 00000000..eafca495 Binary files /dev/null and b/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/hcm.png differ diff --git a/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/mat.yml b/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/mat.yml new file mode 100644 index 00000000..0bbb34d5 --- /dev/null +++ b/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/mat.yml @@ -0,0 +1,52 @@ +publish-item: true +wrap-x: false +wrap-y: false +model: create:block/valve_handle +normal: + noise: 0.5 +smooth: + value: 0.6536 +filters: +- name: curve-vertical + left: 0.3125 + top: 0 + width: 0.375 + height: 0.125 + normal-curve-y: 90 +- name: curve-outside + left: 0.3125 + top: 0.125 + width: 0.375 + height: 0.1875 + normal-curve-y: 90 +- name: curve-inside + left: 0.3125 + top: 0.3125 + width: 0.375 + height: 0.1875 + normal-curve-y: 90 +- name: top + left: 0 + top: 0 + width: 0.3125 + height: 0.3125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.2 +- name: side + left: 0 + top: 0.3125 + width: 0.3125 + height: 0.25 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.2 + normal-radius-y: 0.2 +- name: support + left: 0.3125 + top: 0.5 + width: 0.1875 + height: 0.125 + normal-curve-y: 90 + normal-radius-y: 0.5 diff --git a/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/valve_handle_copper.png b/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/valve_handle_copper.png new file mode 100644 index 00000000..22688d92 Binary files /dev/null and b/src-create/assets/create/textures/block/valve_handle/valve_handle_copper/valve_handle_copper.png differ diff --git a/src-create/assets/create/textures/block/wheel/color.png b/src-create/assets/create/textures/block/wheel/color.png new file mode 100644 index 00000000..fca1d480 Binary files /dev/null and b/src-create/assets/create/textures/block/wheel/color.png differ diff --git a/src-create/assets/create/textures/block/wheel/height.png b/src-create/assets/create/textures/block/wheel/height.png new file mode 100644 index 00000000..d4b65a52 Binary files /dev/null and b/src-create/assets/create/textures/block/wheel/height.png differ diff --git a/src-create/assets/create/textures/block/wheel/mat.yml b/src-create/assets/create/textures/block/wheel/mat.yml new file mode 100644 index 00000000..9aa28bdd --- /dev/null +++ b/src-create/assets/create/textures/block/wheel/mat.yml @@ -0,0 +1,16 @@ +publish-item: true +texture-size: 64 +model: create:block/water_wheel +blend-mode: cutout +height: + scale: 0.2 +normal: + noise: 3 + method: sobel-low + strength: 0.8 +smooth: + value: 0.2 +f0: + value: 0.05 +porosity: + value: 0.8 diff --git a/src-create/assets/create/textures/block/wheel/normal.png b/src-create/assets/create/textures/block/wheel/normal.png new file mode 100644 index 00000000..d87eb91f Binary files /dev/null and b/src-create/assets/create/textures/block/wheel/normal.png differ diff --git a/src-create/assets/create/textures/block/wheel/opacity.png b/src-create/assets/create/textures/block/wheel/opacity.png new file mode 100644 index 00000000..9c070cd7 Binary files /dev/null and b/src-create/assets/create/textures/block/wheel/opacity.png differ diff --git a/src-create/assets/create/textures/block/wheel/wheel.png b/src-create/assets/create/textures/block/wheel/wheel.png new file mode 100644 index 00000000..ce5fd083 Binary files /dev/null and b/src-create/assets/create/textures/block/wheel/wheel.png differ diff --git a/src-create/assets/create/textures/block/wheel_extras/color.png b/src-create/assets/create/textures/block/wheel_extras/color.png new file mode 100644 index 00000000..3303699d Binary files /dev/null and b/src-create/assets/create/textures/block/wheel_extras/color.png differ diff --git a/src-create/assets/create/textures/block/wheel_extras/mat.yml b/src-create/assets/create/textures/block/wheel_extras/mat.yml new file mode 100644 index 00000000..12efbcba --- /dev/null +++ b/src-create/assets/create/textures/block/wheel_extras/mat.yml @@ -0,0 +1,15 @@ +publish-item: true +texture-size: 64 +wrap-x: false +wrap-y: false +model: create:block/water_wheel +blend-mode: cutout +normal: + noise: 3 +smooth: + value: 0.2 +f0: + value: 0.05 +porosity: + value: 0.8 +filters: [] diff --git a/src-create/assets/create/textures/block/wheel_extras/opacity.png b/src-create/assets/create/textures/block/wheel_extras/opacity.png new file mode 100644 index 00000000..98c12b74 Binary files /dev/null and b/src-create/assets/create/textures/block/wheel_extras/opacity.png differ diff --git a/src-create/assets/create/textures/block/wheel_extras/wheel_extras.png b/src-create/assets/create/textures/block/wheel_extras/wheel_extras.png new file mode 100644 index 00000000..b0af4caf Binary files /dev/null and b/src-create/assets/create/textures/block/wheel_extras/wheel_extras.png differ diff --git a/src-create/assets/create/textures/entity/coupling/coupling.png b/src-create/assets/create/textures/entity/coupling/coupling.png new file mode 100644 index 00000000..68f7cbc7 Binary files /dev/null and b/src-create/assets/create/textures/entity/coupling/coupling.png differ diff --git a/src-create/assets/create/textures/entity/coupling/mat.yml b/src-create/assets/create/textures/entity/coupling/mat.yml new file mode 100644 index 00000000..afe00730 --- /dev/null +++ b/src-create/assets/create/textures/entity/coupling/mat.yml @@ -0,0 +1,10 @@ +texture-size: 32 +model: create:entity\minecart_coupling\attachment +color: + value: '#B2ABA9' +normal: + noise: 1 +smooth: + value: 0.4 +hcm: + value: 230 diff --git a/src-create/assets/create/textures/entity/coupling/opacity.png b/src-create/assets/create/textures/entity/coupling/opacity.png new file mode 100644 index 00000000..b69c1b47 Binary files /dev/null and b/src-create/assets/create/textures/entity/coupling/opacity.png differ diff --git a/src-create/pack.png b/src-create/pack.png new file mode 100644 index 00000000..0fca947c Binary files /dev/null and b/src-create/pack.png differ diff --git a/src-create/project.yml b/src-create/project.yml new file mode 100644 index 00000000..1405cbcd --- /dev/null +++ b/src-create/project.yml @@ -0,0 +1,24 @@ +name: Textureless Create Addon +input: + format: raw +profiles: +- edition: Java + format: 8 + name: Textureless-Create-LabPbr-32x + description: LabPbr 32x + encoding: + format: lab-1.3 + block-texture-size: 32 + item-texture-size: 32 + occlusion-quality: 0.2 + occlusion-power: 2 +- edition: Java + format: 8 + name: Textureless-Create-OldPbr-32x + description: OldPbr 32x + encoding: + format: old-pbr + block-texture-size: 32 + item-texture-size: 32 + occlusion-quality: 0.2 + occlusion-power: 2 diff --git a/src-models/LabBakedAO-32x.pack.yml b/src-models/LabBakedAO-32x.pack.yml deleted file mode 100644 index 4ebf0b5a..00000000 --- a/src-models/LabBakedAO-32x.pack.yml +++ /dev/null @@ -1,33 +0,0 @@ -edition: java -format: 8 -name: Textureless-Models-LabBakedAO-32x -description: Better models for Textureless -tags: 32x LabPBR BakedAO -encoding: - format: lab-1.3 - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: - max-value: 0 - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -texture-scale: 2 -diffuse-occlusion-strength: 0.5 -auto-generate-occlusion: false -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src-models/LabPbr-128x.pack.yml b/src-models/LabPbr-128x.pack.yml deleted file mode 100644 index 2a634e3b..00000000 --- a/src-models/LabPbr-128x.pack.yml +++ /dev/null @@ -1,31 +0,0 @@ -edition: java -format: 8 -name: Textureless-Models-LabPbr-128x -description: Better models for Textureless -tags: 128x LabPBR -encoding: - format: lab-1.3 - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 128 -texture-scale: 8 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src-models/LabPbr-16x.pack.yml b/src-models/LabPbr-16x.pack.yml deleted file mode 100644 index 7fa61429..00000000 --- a/src-models/LabPbr-16x.pack.yml +++ /dev/null @@ -1,33 +0,0 @@ -edition: java -format: 8 -name: Textureless-Models-LabPbr-16x -description: Better models for Textureless -tags: 16x LabPBR -encoding: - format: lab-1.3 - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: average - occlusion: - sampler: average - normal-x: - sampler: average - normal-y: - sampler: average - normal-z: - sampler: average - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 16 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 1 diff --git a/src-models/LabPbr-32x.pack.yml b/src-models/LabPbr-32x.pack.yml deleted file mode 100644 index 2169bb6e..00000000 --- a/src-models/LabPbr-32x.pack.yml +++ /dev/null @@ -1,31 +0,0 @@ -edition: java -format: 8 -name: Textureless-Models-LabPbr-32x -description: Better models for Textureless -tags: 32x LabPBR -encoding: - format: lab-1.3 - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -texture-scale: 2 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src-models/LabPbr-64x.pack.yml b/src-models/LabPbr-64x.pack.yml deleted file mode 100644 index cbe9a8ee..00000000 --- a/src-models/LabPbr-64x.pack.yml +++ /dev/null @@ -1,32 +0,0 @@ -edition: java -format: 8 -name: Textureless-Models-LabPbr-64x -description: Better models for Textureless -tags: 64x LabPBR -encoding: - format: lab-1.3 - sampler: bicubic - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: {} - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: - sampler: nearest - f0: - sampler: nearest - porosity: {} - sss: {} - emissive: {} -block-texture-size: 64 -texture-scale: 4 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src-models/OldPbr-32x.pack.yml b/src-models/OldPbr-32x.pack.yml deleted file mode 100644 index 269351aa..00000000 --- a/src-models/OldPbr-32x.pack.yml +++ /dev/null @@ -1,32 +0,0 @@ -edition: java -format: 8 -name: Textureless-Models-OldPbr-32x -description: Better models for Textureless -tags: 32x OldPBR -encoding: - format: old-pbr - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -texture-scale: 2 -auto-generate-occlusion: false -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src-models/OldPbr-64x.pack.yml b/src-models/OldPbr-64x.pack.yml deleted file mode 100644 index 0fef7ef5..00000000 --- a/src-models/OldPbr-64x.pack.yml +++ /dev/null @@ -1,32 +0,0 @@ -edition: java -format: 8 -name: Textureless-Models-OldPbr-64x -description: Better models for Textureless -tags: 64x OldPBR -encoding: - format: old-pbr - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 64 -texture-scale: 4 -auto-generate-occlusion: false -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src-models/assets/minecraft/models/block/ladder.json b/src-models/assets/minecraft/models/block/ladder.json index 62cc2f77..f6d2742e 100644 --- a/src-models/assets/minecraft/models/block/ladder.json +++ b/src-models/assets/minecraft/models/block/ladder.json @@ -1,7 +1,7 @@ { "ambientocclusion": false, "textures": { - "particle": "block/ladder_alt", + "particle": "block/ladder_alt_inventory", "texture": "block/ladder_alt" }, "elements": [ @@ -10,12 +10,12 @@ "from": [2, 0, 15.2], "to": [4, 16, 16], "faces": { - "north": {"uv": [12, 0, 14, 16], "texture": "#texture"}, - "east": {"uv": [2, 0, 3, 16], "texture": "#texture"}, - "south": {"uv": [14, 0, 12, 16], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [3, 0, 4, 16], "texture": "#texture"}, - "up": {"uv": [4, 0, 2, 1], "texture": "#texture", "cullface": "up"}, - "down": {"uv": [14, 15, 12, 16], "texture": "#texture", "cullface": "down"} + "north": {"uv": [1, 0, 3, 16], "rotation": 180, "texture": "#texture"}, + "east": {"uv": [3, 0, 4, 16], "rotation": 180, "texture": "#texture"}, + "south": {"uv": [6, 0, 4, 16], "rotation": 180, "texture": "#texture", "cullface": "south"}, + "west": {"uv": [0, 0, 1, 16], "rotation": 180, "texture": "#texture"}, + "up": {"uv": [10, 14.5, 8, 15.5], "texture": "#texture", "cullface": "up"}, + "down": {"uv": [14, 14.5, 12, 15.5], "texture": "#texture", "cullface": "down"} } }, { @@ -23,12 +23,12 @@ "from": [12, 0, 15.2], "to": [14, 16, 16], "faces": { - "north": {"uv": [2, 0, 4, 16], "texture": "#texture"}, - "east": {"uv": [2, 0, 3, 16], "texture": "#texture"}, - "south": {"uv": [4, 0, 2, 16], "texture": "#texture", "cullface": "south"}, + "north": {"uv": [1, 0, 3, 16], "texture": "#texture"}, + "east": {"uv": [0, 0, 1, 16], "texture": "#texture"}, + "south": {"uv": [6, 0, 4, 16], "texture": "#texture", "cullface": "south"}, "west": {"uv": [3, 0, 4, 16], "texture": "#texture"}, - "up": {"uv": [4, 0, 2, 1], "texture": "#texture", "cullface": "up"}, - "down": {"uv": [4, 15, 2, 16], "texture": "#texture", "cullface": "down"} + "up": {"uv": [10, 14.5, 8, 15.5], "texture": "#texture", "cullface": "up"}, + "down": {"uv": [14, 14.5, 12, 15.5], "texture": "#texture", "cullface": "down"} } }, { @@ -36,38 +36,38 @@ "from": [1, 1, 14.5], "to": [15, 3, 15.2], "faces": { - "north": {"uv": [1, 13, 15, 15], "texture": "#texture"}, - "east": {"uv": [1.3, 13, 2, 15], "texture": "#texture"}, - "south": {"uv": [15, 13, 1, 15], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [14, 13, 14.7, 15], "texture": "#texture"}, - "up": {"uv": [15, 13.3, 1, 14], "texture": "#texture"}, - "down": {"uv": [15, 14, 1, 14.7], "texture": "#texture"} + "north": {"uv": [12, 0, 14, 14], "rotation": 270, "texture": "#texture"}, + "east": {"uv": [8, 14.5, 10, 15.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [9, 14, 11, 0], "rotation": 270, "texture": "#texture", "cullface": "south"}, + "west": {"uv": [12, 14.5, 14, 15.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [8, 14, 9, 0], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [11, 14, 12, 0], "rotation": 270, "texture": "#texture"} } }, { "name": "horizontal-2", - "from": [1, 5, 14.5], - "to": [15, 7, 15.2], + "from": [1, 9, 14.5], + "to": [15, 11, 15.2], "faces": { - "north": {"uv": [1, 9, 15, 11], "texture": "#texture"}, - "east": {"uv": [1.3, 9, 2, 11], "texture": "#texture"}, - "south": {"uv": [15, 9, 1, 11], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [14, 9, 14.7, 11], "texture": "#texture"}, - "up": {"uv": [15, 9.3, 1, 10], "texture": "#texture"}, - "down": {"uv": [15, 10, 1, 10.7], "texture": "#texture"} + "north": {"uv": [9, 0, 11, 14], "rotation": 270, "texture": "#texture"}, + "east": {"uv": [8, 14.5, 10, 15.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [12, 14, 14, 0], "rotation": 270, "texture": "#texture", "cullface": "south"}, + "west": {"uv": [12, 14.5, 14, 15.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [11, 14, 12, 0], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [8, 14, 9, 0], "rotation": 270, "texture": "#texture"} } }, { "name": "horizontal-3", - "from": [1, 9, 14.5], - "to": [15, 11, 15.2], + "from": [1, 5, 14.5], + "to": [15, 7, 15.2], "faces": { - "north": {"uv": [1, 5, 15, 7], "texture": "#texture"}, - "east": {"uv": [1.3, 5, 2, 7], "texture": "#texture"}, - "south": {"uv": [15, 5, 1, 7], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [14, 5, 14.7, 7], "texture": "#texture"}, - "up": {"uv": [15, 5.3, 1, 6], "texture": "#texture"}, - "down": {"uv": [15, 6, 1, 6.7], "texture": "#texture"} + "north": {"uv": [12, 0, 14, 14], "rotation": 90, "texture": "#texture"}, + "east": {"uv": [8, 14.5, 10, 15.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [9, 14, 11, 0], "rotation": 90, "texture": "#texture", "cullface": "south"}, + "west": {"uv": [12, 14.5, 14, 15.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [8, 14, 9, 0], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [11, 14, 12, 0], "rotation": 90, "texture": "#texture"} } }, { @@ -75,12 +75,12 @@ "from": [1, 13, 14.5], "to": [15, 15, 15.2], "faces": { - "north": {"uv": [1, 1, 15, 3], "texture": "#texture"}, - "east": {"uv": [1.3, 1, 2, 3], "texture": "#texture"}, - "south": {"uv": [15, 1, 1, 3], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [14, 1, 14.7, 3], "texture": "#texture"}, - "up": {"uv": [15, 1.3, 1, 2], "texture": "#texture"}, - "down": {"uv": [15, 2, 1, 2.7], "texture": "#texture"} + "north": {"uv": [9, 0, 11, 14], "rotation": 90, "texture": "#texture"}, + "east": {"uv": [8, 14.5, 10, 15.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [12, 14, 14, 0], "rotation": 90, "texture": "#texture", "cullface": "south"}, + "west": {"uv": [12, 14.5, 14, 15.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [11, 14, 12, 0], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [8, 14, 9, 0], "rotation": 90, "texture": "#texture"} } } ] diff --git a/src-models/assets/minecraft/models/block/template_torch.json b/src-models/assets/minecraft/models/block/template_torch.json new file mode 100644 index 00000000..344519c4 --- /dev/null +++ b/src-models/assets/minecraft/models/block/template_torch.json @@ -0,0 +1,38 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#torch" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 10, 9 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 4, 9, 6 ], "texture": "#torch" }, + "down": { "uv": [ 7, 13, 9, 15 ], "texture": "#torch" }, + "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" } + } + } + ], + "display": { + "firstperson_righthand": { + "rotation": [ -25, 0, -20 ], + "translation": [ 0, 4, 1] + }, + "firstperson_lefthand": { + "rotation": [ -25, 0, 20 ], + "translation": [ 0, 4, 0] + }, + "thirdperson_righthand": { + "rotation": [ 20, 0, 0 ], + "translation": [ 0, 4, 1] + }, + "thirdperson_lefthand": { + "rotation": [ 20, 0, 0 ], + "translation": [ 0, 4, 1] + } + } +} diff --git a/src-models/assets/minecraft/models/block/template_torch_wall.json b/src-models/assets/minecraft/models/block/template_torch_wall.json new file mode 100644 index 00000000..37674ff9 --- /dev/null +++ b/src-models/assets/minecraft/models/block/template_torch_wall.json @@ -0,0 +1,21 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#torch" + }, + "elements": [ + { "from": [ -1, 3.5, 7 ], + "to": [ 1, 13.5, 9 ], + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "up": { "uv": [ 7, 4, 9, 6 ], "texture": "#torch" }, + "down": { "uv": [ 7, 13, 9, 15 ], "texture": "#torch" }, + "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" } + } + } + ] +} diff --git a/src-models/assets/minecraft/models/item/redstone_torch.json b/src-models/assets/minecraft/models/item/redstone_torch.json new file mode 100644 index 00000000..3e83d008 --- /dev/null +++ b/src-models/assets/minecraft/models/item/redstone_torch.json @@ -0,0 +1,3 @@ +{ + "parent": "block/redstone_torch" +} \ No newline at end of file diff --git a/src-models/assets/minecraft/models/item/soul_torch.json b/src-models/assets/minecraft/models/item/soul_torch.json new file mode 100644 index 00000000..f25a9c31 --- /dev/null +++ b/src-models/assets/minecraft/models/item/soul_torch.json @@ -0,0 +1,3 @@ +{ + "parent": "block/soul_torch" +} \ No newline at end of file diff --git a/src-models/assets/minecraft/models/item/torch.json b/src-models/assets/minecraft/models/item/torch.json new file mode 100644 index 00000000..2d1b351a --- /dev/null +++ b/src-models/assets/minecraft/models/item/torch.json @@ -0,0 +1,3 @@ +{ + "parent": "block/torch" +} \ No newline at end of file diff --git a/src-models/assets/minecraft/optifine/block.properties b/src-models/assets/minecraft/optifine/block.properties index 643d56aa..53a9b103 100644 --- a/src-models/assets/minecraft/optifine/block.properties +++ b/src-models/assets/minecraft/optifine/block.properties @@ -1,3 +1,3 @@ layer.solid=pointed_dripstone_up_base pointed_dripstone_up_frustum pointed_dripstone_up_middle pointed_dripstone_up_tip pointed_dripstone_up_tip_merge layer.cutout_mipped=oak_leaves dark_oak_leaves birch_leaves spruce_leaves acacia_leaves jungle_leaves grass_path -layer.translucent=glass glass_pane cobweb +layer.translucent=glass glass_pane cobweb glass_fluid_pipe diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/color.png b/src-models/assets/minecraft/textures/block/ladder_alt/color.png index 8deeb706..ad4eccc2 100644 Binary files a/src-models/assets/minecraft/textures/block/ladder_alt/color.png and b/src-models/assets/minecraft/textures/block/ladder_alt/color.png differ diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/height.png b/src-models/assets/minecraft/textures/block/ladder_alt/height.png new file mode 100644 index 00000000..486304c7 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/ladder_alt/height.png differ diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/mat.yml b/src-models/assets/minecraft/textures/block/ladder_alt/mat.yml index 3f1c7a76..2aa1699d 100644 --- a/src-models/assets/minecraft/textures/block/ladder_alt/mat.yml +++ b/src-models/assets/minecraft/textures/block/ladder_alt/mat.yml @@ -1,9 +1,106 @@ publish-item: true -model-type: file -model-file: ladder +model: block\ladder +height: + shift: -0.02 + scale: 0.5 + edge-fade-x: 4 + edge-fade-y: 4 +normal: + noise: 4 + method: sobel-low + strength: 6 +occlusion: + step-distance: 0.1 + z-bias: 1 + z-scale: 2 smooth: - scale: 0.7 + scale: 0.5 f0: - value: 0.03 + value: 0.044 porosity: - value: 0.6 + value: 0.8 +filters: +- name: vertical-east + left: 0 + top: 0 + width: 0.0625 + height: 1 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.1 +- name: vertical-north + left: 0.0625 + top: 0 + width: 0.125 + height: 1 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.6 + normal-radius-y: 0.1 +- name: vertical-west + left: 0.1875 + top: 0 + width: 0.0625 + height: 1 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.1 +- name: vertical-south + left: 0.25 + top: 0 + width: 0.125 + height: 1 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.6 + normal-radius-y: 0.1 +- name: horizontal-down + left: 0.5 + top: 0 + width: 0.0625 + height: 0.875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.1 +- name: horizontal-north + left: 0.5625 + top: 0 + width: 0.125 + height: 0.875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.6 + normal-radius-y: 0.1 +- name: horizontal-up + left: 0.6875 + top: 0 + width: 0.0625 + height: 0.875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.1 +- name: horizontal-south + left: 0.75 + top: 0 + width: 0.125 + height: 0.875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.6 + normal-radius-y: 0.1 +- name: end-1 + left: 0.5 + top: 0.90625 + width: 0.125 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.6 +- name: end-2 + left: 0.75 + top: 0.90625 + width: 0.125 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.6 diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/normal.png b/src-models/assets/minecraft/textures/block/ladder_alt/normal.png new file mode 100644 index 00000000..7a87b7be Binary files /dev/null and b/src-models/assets/minecraft/textures/block/ladder_alt/normal.png differ diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/occlusion.png b/src-models/assets/minecraft/textures/block/ladder_alt/occlusion.png new file mode 100644 index 00000000..d4c14f27 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/ladder_alt/occlusion.png differ diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/smooth.png b/src-models/assets/minecraft/textures/block/ladder_alt/smooth.png index 8616970f..b0da1c9c 100644 Binary files a/src-models/assets/minecraft/textures/block/ladder_alt/smooth.png and b/src-models/assets/minecraft/textures/block/ladder_alt/smooth.png differ diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/color.png b/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/color.png new file mode 100644 index 00000000..8deeb706 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/color.png differ diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/mat.yml b/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/mat.yml new file mode 100644 index 00000000..d4c8d103 --- /dev/null +++ b/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/mat.yml @@ -0,0 +1,8 @@ +publish-item: true +model: block\ladder +smooth: + scale: 0.7 +f0: + value: 0.03 +porosity: + value: 0.6 diff --git a/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/smooth.png b/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/smooth.png new file mode 100644 index 00000000..8616970f Binary files /dev/null and b/src-models/assets/minecraft/textures/block/ladder_alt/v1.ignore/smooth.png differ diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_base/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_base/mat.yml index 21c574a8..9d9cc3b1 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_base/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_base/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_down_base.json +model: block/pointed_dripstone_down_base height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_frustum/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_frustum/mat.yml index 4ffb2c4d..e46b9c88 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_frustum/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_frustum/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_down_frustum.json +model: block/pointed_dripstone_down_frustum height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_middle/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_middle/mat.yml index 17eba379..a1a460a1 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_middle/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_middle/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_down_middle.json +model: block\pointed_dripstone_down_middle height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_tip/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_tip/mat.yml index af28c21f..fa4c4eb9 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_tip/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_tip/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_down_tip.json +model: block\pointed_dripstone_down_tip height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge/mat.yml index 9efea3d6..abc1cb40 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_down_tip_merge/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_down_tip_merge.json +model: block\pointed_dripstone_down_tip_merge height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_end/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_end/mat.yml index 8abb2cd1..01ed84ae 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_end/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_end/mat.yml @@ -1,7 +1,7 @@ wrap-x: false wrap-y: false height: - value: 0 + scale: 0 normal: noise: 6 curve-x: 60 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_base/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_base/mat.yml index f4a8324d..436d9384 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_base/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_base/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_up_base.json +model: block\pointed_dripstone_up_base height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_frustum/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_frustum/mat.yml index 1636817d..1066d810 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_frustum/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_frustum/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_up_frustum.json +model: block\pointed_dripstone_up_frustum height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_middle/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_middle/mat.yml index 252e82d3..ae9a2b05 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_middle/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_middle/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_up_middle.json +model: block\pointed_dripstone_up_middle height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_tip/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_tip/mat.yml index 53866bff..1af32895 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_tip/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_tip/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_up_tip.json +model: block\pointed_dripstone_up_tip height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge/mat.yml b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge/mat.yml index 55a94ac3..4abd6285 100644 --- a/src-models/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge/mat.yml +++ b/src-models/assets/minecraft/textures/block/pointed_dripstone_up_tip_merge/mat.yml @@ -1,7 +1,6 @@ -model-type: file -model-file: assets\minecraft\models\block\pointed_dripstone_up_tip_merge.json +model: block\pointed_dripstone_up_tip_merge height: - value: 0 + scale: 0 normal: noise: 6 strength: 2 diff --git a/src-models/assets/minecraft/textures/block/redstone_torch/color.png b/src-models/assets/minecraft/textures/block/redstone_torch/color.png new file mode 100644 index 00000000..61f9f308 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch/color.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch/emissive.png b/src-models/assets/minecraft/textures/block/redstone_torch/emissive.png new file mode 100644 index 00000000..38f3704b Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch/emissive.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch/f0.png b/src-models/assets/minecraft/textures/block/redstone_torch/f0.png new file mode 100644 index 00000000..78889687 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch/f0.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch/hcm.png b/src-models/assets/minecraft/textures/block/redstone_torch/hcm.png new file mode 100644 index 00000000..d952ab8a Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch/hcm.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch/mat.yml b/src-models/assets/minecraft/textures/block/redstone_torch/mat.yml new file mode 100644 index 00000000..e5892f17 --- /dev/null +++ b/src-models/assets/minecraft/textures/block/redstone_torch/mat.yml @@ -0,0 +1,29 @@ +wrap-x: false +wrap-y: false +normal: + noise: 1 + method: sobel-low + strength: 0.4 +filters: +- name: wood + left: 0.4375 + top: 0.5 + width: 0.125 + height: 0.5 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-bottom: 0.2 +- name: ember-side + left: 0.4375 + top: 0.375 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-top: 45 +- name: ember-top + left: 0.4375 + top: 0.25 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 diff --git a/src-models/assets/minecraft/textures/block/redstone_torch/opacity.png b/src-models/assets/minecraft/textures/block/redstone_torch/opacity.png new file mode 100644 index 00000000..a8853351 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch/opacity.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch/porosity.png b/src-models/assets/minecraft/textures/block/redstone_torch/porosity.png new file mode 100644 index 00000000..bd84c9f4 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch/porosity.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch/smooth.png b/src-models/assets/minecraft/textures/block/redstone_torch/smooth.png new file mode 100644 index 00000000..c245c507 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch/smooth.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch_off/color.png b/src-models/assets/minecraft/textures/block/redstone_torch_off/color.png new file mode 100644 index 00000000..ed87ba16 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch_off/color.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch_off/f0.png b/src-models/assets/minecraft/textures/block/redstone_torch_off/f0.png new file mode 100644 index 00000000..78889687 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch_off/f0.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch_off/hcm.png b/src-models/assets/minecraft/textures/block/redstone_torch_off/hcm.png new file mode 100644 index 00000000..d952ab8a Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch_off/hcm.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch_off/mat.yml b/src-models/assets/minecraft/textures/block/redstone_torch_off/mat.yml new file mode 100644 index 00000000..2912a21b --- /dev/null +++ b/src-models/assets/minecraft/textures/block/redstone_torch_off/mat.yml @@ -0,0 +1,29 @@ +wrap-x: false +wrap-y: false +normal: + strength: 0.4 + noise: 1 + method: sobel-low +filters: +- name: wood + left: 0.4375 + top: 0.5 + width: 0.125 + height: 0.5 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-bottom: 0.2 +- name: ember-side + left: 0.4375 + top: 0.375 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-top: 45 +- name: ember-top + left: 0.4375 + top: 0.25 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 diff --git a/src-models/assets/minecraft/textures/block/redstone_torch_off/opacity.png b/src-models/assets/minecraft/textures/block/redstone_torch_off/opacity.png new file mode 100644 index 00000000..a8853351 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch_off/opacity.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch_off/porosity.png b/src-models/assets/minecraft/textures/block/redstone_torch_off/porosity.png new file mode 100644 index 00000000..bd84c9f4 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch_off/porosity.png differ diff --git a/src-models/assets/minecraft/textures/block/redstone_torch_off/smooth.png b/src-models/assets/minecraft/textures/block/redstone_torch_off/smooth.png new file mode 100644 index 00000000..c245c507 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/redstone_torch_off/smooth.png differ diff --git a/src-models/assets/minecraft/textures/block/soul_torch/color.png b/src-models/assets/minecraft/textures/block/soul_torch/color.png new file mode 100644 index 00000000..2a9b5866 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/soul_torch/color.png differ diff --git a/src-models/assets/minecraft/textures/block/soul_torch/emissive.png b/src-models/assets/minecraft/textures/block/soul_torch/emissive.png new file mode 100644 index 00000000..8a95e1ee Binary files /dev/null and b/src-models/assets/minecraft/textures/block/soul_torch/emissive.png differ diff --git a/src-models/assets/minecraft/textures/block/soul_torch/height.png b/src-models/assets/minecraft/textures/block/soul_torch/height.png new file mode 100644 index 00000000..2c1af1b1 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/soul_torch/height.png differ diff --git a/src-models/assets/minecraft/textures/block/soul_torch/mat.mcmeta b/src-models/assets/minecraft/textures/block/soul_torch/mat.mcmeta new file mode 100644 index 00000000..4894b537 --- /dev/null +++ b/src-models/assets/minecraft/textures/block/soul_torch/mat.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src-models/assets/minecraft/textures/block/soul_torch/mat.yml b/src-models/assets/minecraft/textures/block/soul_torch/mat.yml new file mode 100644 index 00000000..af679430 --- /dev/null +++ b/src-models/assets/minecraft/textures/block/soul_torch/mat.yml @@ -0,0 +1,40 @@ +publish-item: false +wrap-x: false +wrap-y: false +height: + scale: 0.1 +normal: + noise: 1 + method: sobel-high + strength: 0.1 +occlusion: + step-distance: 0.3 + z-bias: 0.1 + z-scale: 2 +f0: + value: 0.04 +emissive: + scale: 0.7 +filters: +- name: wood + left: 0.4375 + top: 0.5 + width: 0.125 + height: 0.5 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-bottom: 0.2 +- name: ember-side + left: 0.4375 + top: 0.375 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-top: 45 +- name: ember-top + left: 0.4375 + top: 0.25 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 diff --git a/src-models/assets/minecraft/textures/block/soul_torch/occlusion.png b/src-models/assets/minecraft/textures/block/soul_torch/occlusion.png new file mode 100644 index 00000000..581bf907 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/soul_torch/occlusion.png differ diff --git a/src-models/assets/minecraft/textures/block/soul_torch/opacity.png b/src-models/assets/minecraft/textures/block/soul_torch/opacity.png new file mode 100644 index 00000000..a8853351 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/soul_torch/opacity.png differ diff --git a/src-models/assets/minecraft/textures/block/soul_torch/porosity.png b/src-models/assets/minecraft/textures/block/soul_torch/porosity.png new file mode 100644 index 00000000..bd84c9f4 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/soul_torch/porosity.png differ diff --git a/src-models/assets/minecraft/textures/block/soul_torch/smooth.png b/src-models/assets/minecraft/textures/block/soul_torch/smooth.png new file mode 100644 index 00000000..ed4ab7c8 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/soul_torch/smooth.png differ diff --git a/src-models/assets/minecraft/textures/block/torch/color.png b/src-models/assets/minecraft/textures/block/torch/color.png new file mode 100644 index 00000000..a9dc5679 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/torch/color.png differ diff --git a/src-models/assets/minecraft/textures/block/torch/emissive.png b/src-models/assets/minecraft/textures/block/torch/emissive.png new file mode 100644 index 00000000..8a95e1ee Binary files /dev/null and b/src-models/assets/minecraft/textures/block/torch/emissive.png differ diff --git a/src-models/assets/minecraft/textures/block/torch/height.png b/src-models/assets/minecraft/textures/block/torch/height.png new file mode 100644 index 00000000..2c1af1b1 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/torch/height.png differ diff --git a/src-models/assets/minecraft/textures/block/torch/mat.mcmeta b/src-models/assets/minecraft/textures/block/torch/mat.mcmeta new file mode 100644 index 00000000..4894b537 --- /dev/null +++ b/src-models/assets/minecraft/textures/block/torch/mat.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 10 + } +} diff --git a/src-models/assets/minecraft/textures/block/torch/mat.yml b/src-models/assets/minecraft/textures/block/torch/mat.yml new file mode 100644 index 00000000..b13d271a --- /dev/null +++ b/src-models/assets/minecraft/textures/block/torch/mat.yml @@ -0,0 +1,38 @@ +publish-item: false +wrap-x: false +wrap-y: false +height: + scale: 0.1 +normal: + noise: 1 + method: sobel-high + strength: 0.1 +occlusion: + step-distance: 0.3 + z-bias: 0.1 + z-scale: 2 +f0: + value: 0.04 +filters: +- name: wood + left: 0.4375 + top: 0.5 + width: 0.125 + height: 0.5 + normal-curve-x: 90 + normal-curve-bottom: 45 + normal-radius-bottom: 0.2 +- name: ember-side + left: 0.4375 + top: 0.375 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-top: 45 +- name: ember-top + left: 0.4375 + top: 0.25 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 diff --git a/src-models/assets/minecraft/textures/block/torch/occlusion.png b/src-models/assets/minecraft/textures/block/torch/occlusion.png new file mode 100644 index 00000000..581bf907 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/torch/occlusion.png differ diff --git a/src-models/assets/minecraft/textures/block/torch/opacity.png b/src-models/assets/minecraft/textures/block/torch/opacity.png new file mode 100644 index 00000000..a8853351 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/torch/opacity.png differ diff --git a/src-models/assets/minecraft/textures/block/torch/porosity.png b/src-models/assets/minecraft/textures/block/torch/porosity.png new file mode 100644 index 00000000..bd84c9f4 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/torch/porosity.png differ diff --git a/src-models/assets/minecraft/textures/block/torch/smooth.png b/src-models/assets/minecraft/textures/block/torch/smooth.png new file mode 100644 index 00000000..ed4ab7c8 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/torch/smooth.png differ diff --git a/src-models/input.yml b/src-models/input.yml deleted file mode 100644 index e73736e7..00000000 --- a/src-models/input.yml +++ /dev/null @@ -1,24 +0,0 @@ -format: raw -auto-material: false -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: - max-value: 0.9 - range-max: 229 -porosity: {} -sss: {} -emissive: {} diff --git a/src-models/project.yml b/src-models/project.yml new file mode 100644 index 00000000..d4cf3fd1 --- /dev/null +++ b/src-models/project.yml @@ -0,0 +1,128 @@ +name: Textureless Models +description: Better models for Textureless +author: Null [Joshua Miller] +input: + format: raw + auto-material: false + f0: + max-value: 0.9 + range-max: 229 +profiles: +- edition: java + format: 8 + name: Textureless-Models-LabBakedAO-32x + description: Better models for Textureless + tags: 32x LabPBR BakedAO + encoding: + format: lab-1.3 + height: + sampler: bilinear + occlusion: + max-value: 0 + block-texture-size: 32 + texture-scale: 2 + diffuse-occlusion-strength: 0.5 + auto-generate-occlusion: false + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2 +- edition: java + format: 8 + name: Textureless-Models-LabPbr-128x + description: Better models for Textureless + tags: 128x LabPBR + encoding: + format: lab-1.3 + sampler: bicubic + height: + sampler: bilinear + block-texture-size: 128 + texture-scale: 8 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 2 +- edition: java + format: 8 + name: Textureless-Models-LabPbr-16x + description: Better models for Textureless + tags: 16x LabPBR + encoding: + format: lab-1.3 + height: + sampler: average + occlusion: + sampler: average + normal-x: + sampler: average + normal-y: + sampler: average + normal-z: + sampler: average + block-texture-size: 16 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 1 +- edition: java + format: 8 + name: Textureless-Models-LabPbr-32x + description: Better models for Textureless + tags: 32x LabPBR + encoding: + format: lab-1.3 + sampler: nearest + height: + sampler: bilinear + block-texture-size: 32 + texture-scale: 2 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 2 +- edition: java + format: 8 + name: Textureless-Models-LabPbr-64x + description: Better models for Textureless + tags: 64x LabPBR + encoding: + format: lab-1.3 + sampler: bicubic + metal: + sampler: nearest + f0: + sampler: nearest + block-texture-size: 64 + texture-scale: 4 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 2 +- edition: java + format: 8 + name: Textureless-Models-OldPbr-32x + description: Better models for Textureless + tags: 32x OldPBR + encoding: + format: old-pbr + sampler: nearest + height: + sampler: bilinear + block-texture-size: 32 + texture-scale: 2 + auto-generate-occlusion: false + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2 +- edition: java + format: 8 + name: Textureless-Models-OldPbr-64x + description: Better models for Textureless + tags: 64x OldPBR + encoding: + format: old-pbr + sampler: nearest + height: + sampler: bilinear + block-texture-size: 64 + texture-scale: 4 + auto-generate-occlusion: false + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2 diff --git a/src/AlphaPbr-32x.pack.yml b/src/AlphaPbr-32x.pack.yml deleted file mode 100644 index 33887fc1..00000000 --- a/src/AlphaPbr-32x.pack.yml +++ /dev/null @@ -1,34 +0,0 @@ -edition: java -format: 8 -name: Textureless-VPbr-32x -description: PBR for Vanilla Fabulous shaders -tags: AlphaPBR 32x -encoding: - format: alpha-pbr - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: {} - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -item-texture-size: 32 -texture-scale: 1 -auto-generate-normal: false -auto-generate-occlusion: false -bake-occlusion-to-color: true -occlusion-quality: 0.14 -occlusion-power: 2 -publish-connected: false diff --git a/src/BRtx-32x-height.pack.yml b/src/BRtx-32x-height.pack.yml deleted file mode 100644 index 1edf79d6..00000000 --- a/src/BRtx-32x-height.pack.yml +++ /dev/null @@ -1,41 +0,0 @@ -edition: bedrock -header-uuid: 0c4462be-f218-47ba-a698-b4f50ef15fea -module-uuid: fffaa7b3-22b0-4aca-a79c-d6a1243ce71a -format: 2 -name: Textureless-RTX-32x -description: No Textures! RTX required. -tags: '' -encoding: - format: rtx - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - texture: height - color: red - invert: true - occlusion: {} - normal-x: - texture: none - normal-y: - texture: none - normal-z: - texture: none - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - hcm: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -item-texture-size: 32 -texture-scale: 1 -auto-generate-occlusion: true -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 -publish-inventory: false diff --git a/src/BRtx-32x.pack.yml b/src/BRtx-32x.pack.yml deleted file mode 100644 index bc66e65b..00000000 --- a/src/BRtx-32x.pack.yml +++ /dev/null @@ -1,35 +0,0 @@ -edition: bedrock -header-uuid: 0c4462be-f218-47ba-a698-b4f50ef15fea -module-uuid: fffaa7b3-22b0-4aca-a79c-d6a1243ce71a -format: 2 -name: Textureless-RTX-32x -description: No Textures! RTX required. -tags: '' -encoding: - format: rtx - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -item-texture-size: 32 -texture-scale: 1 -auto-generate-occlusion: true -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 -publish-inventory: false diff --git a/src/LabBakedAO-32x.pack.yml b/src/LabBakedAO-32x.pack.yml deleted file mode 100644 index fa5719e2..00000000 --- a/src/LabBakedAO-32x.pack.yml +++ /dev/null @@ -1,34 +0,0 @@ -edition: java -format: 8 -name: Textureless-LabBakedAO-32x -description: No Textures! PBR shader required. -tags: 32x LabPBR BakedAO -encoding: - format: lab-1.3 - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: - max-value: 0 - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -item-texture-size: 32 -texture-scale: 1 -diffuse-occlusion-strength: 0.5 -auto-generate-occlusion: true -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src/LabBakedAO-64x.pack.yml b/src/LabBakedAO-64x.pack.yml deleted file mode 100644 index ed4b7f0d..00000000 --- a/src/LabBakedAO-64x.pack.yml +++ /dev/null @@ -1,37 +0,0 @@ -edition: java -format: 8 -name: Textureless-LabBakedAO-64x -description: No Textures! PBR shader required. -tags: 64x LabPBR BakedAO -encoding: - format: lab-1.3 - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: - max-value: 0 - normal-x: - sampler: bilinear - normal-y: - sampler: bilinear - normal-z: - sampler: bilinear - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 64 -item-texture-size: 64 -texture-scale: 2 -diffuse-occlusion-strength: 0.5 -auto-generate-occlusion: true -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 1 diff --git a/src/LabPbr-1024x.pack.yml b/src/LabPbr-1024x.pack.yml deleted file mode 100644 index 84bf8c33..00000000 --- a/src/LabPbr-1024x.pack.yml +++ /dev/null @@ -1,33 +0,0 @@ -edition: java -format: 8 -name: Textureless-LabPbr-128x -description: No Textures! PBR shader required. -tags: 128x LabPBR -encoding: - format: lab-1.3 - sampler: bicubic - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: {} - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: - sampler: nearest - f0: - sampler: nearest - porosity: {} - sss: {} - emissive: {} -block-texture-size: 1024 -item-texture-size: 1024 -texture-scale: 16 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 0.5 diff --git a/src/LabPbr-128x-LIN.pack.yml b/src/LabPbr-128x-LIN.pack.yml deleted file mode 100644 index 10c0a1f3..00000000 --- a/src/LabPbr-128x-LIN.pack.yml +++ /dev/null @@ -1,34 +0,0 @@ -edition: java -format: 8 -name: Textureless-LabPbr-128x -description: No Textures! PBR shader required. -tags: 128x LabPBR -encoding: - format: lab-1.3 - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: {} - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: - sampler: nearest - f0: - sampler: nearest - hcm: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 128 -item-texture-size: 128 -texture-scale: 4 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 0.5 diff --git a/src/LabPbr-128x.pack.yml b/src/LabPbr-128x.pack.yml deleted file mode 100644 index 30972103..00000000 --- a/src/LabPbr-128x.pack.yml +++ /dev/null @@ -1,34 +0,0 @@ -edition: java -format: 8 -name: Textureless-LabPbr-128x -description: No Textures! PBR shader required. -tags: 128x LabPBR -encoding: - format: lab-1.3 - sampler: bilinear - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: {} - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: - sampler: nearest - f0: - sampler: nearest - hcm: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 128 -item-texture-size: 128 -texture-scale: 4 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 0.5 diff --git a/src/LabPbr-16x.pack.yml b/src/LabPbr-16x.pack.yml deleted file mode 100644 index 2f924f00..00000000 --- a/src/LabPbr-16x.pack.yml +++ /dev/null @@ -1,35 +0,0 @@ -edition: java -format: 8 -name: Textureless-LabPbr-16x -description: No Textures! PBR shader required. -tags: 16x LabPBR -encoding: - format: lab-1.3 - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: average - occlusion: - sampler: average - normal-x: - sampler: average - normal-y: - sampler: average - normal-z: - sampler: average - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 16 -item-texture-size: 16 -texture-scale: 0.5 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 1 diff --git a/src/LabPbr-32x.pack.yml b/src/LabPbr-32x.pack.yml deleted file mode 100644 index 11794991..00000000 --- a/src/LabPbr-32x.pack.yml +++ /dev/null @@ -1,32 +0,0 @@ -edition: java -format: 8 -name: Textureless-LabPbr-32x -description: No Textures! PBR shader required. -tags: 32x LabPBR -encoding: - format: lab-1.3 - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -item-texture-size: 32 -texture-scale: 1 -auto-generate-occlusion: false -occlusion-quality: 0.2 -occlusion-power: 0.2 diff --git a/src/LabPbr-64x.pack.yml b/src/LabPbr-64x.pack.yml deleted file mode 100644 index cca4fc48..00000000 --- a/src/LabPbr-64x.pack.yml +++ /dev/null @@ -1,36 +0,0 @@ -edition: java -format: 8 -name: Textureless-LabPbr-64x -description: No Textures! PBR shader required. -tags: 64x LabPBR -encoding: - format: lab-1.3 - sampler: bicubic - opacity: {} - color-red: - sampler: nearest - color-green: - sampler: nearest - color-blue: - sampler: nearest - height: {} - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: - sampler: nearest - f0: - sampler: nearest - porosity: {} - sss: {} - emissive: {} -block-texture-size: 64 -item-texture-size: 64 -texture-scale: 2 -auto-generate-occlusion: false -occlusion-quality: 0.1 -occlusion-power: 1 diff --git a/src/Map-32x.pack.yml b/src/Map-32x.pack.yml deleted file mode 100644 index bc9e6b4e..00000000 --- a/src/Map-32x.pack.yml +++ /dev/null @@ -1,33 +0,0 @@ -edition: java -format: 8 -name: Textureless-Map-32x -description: For external map usage only. -tags: 32x -encoding: - format: color - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -item-texture-size: 32 -texture-scale: 1 -auto-generate-occlusion: true -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src/OldPbr-32x.pack.yml b/src/OldPbr-32x.pack.yml deleted file mode 100644 index bcb6bad0..00000000 --- a/src/OldPbr-32x.pack.yml +++ /dev/null @@ -1,33 +0,0 @@ -edition: java -format: 8 -name: Textureless-OldPbr-32x -description: No Textures! PBR shader required. -tags: 32x OldPBR -encoding: - format: old-pbr - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: {} - normal-y: {} - normal-z: {} - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 32 -item-texture-size: 32 -texture-scale: 1 -auto-generate-occlusion: true -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src/OldPbr-64x.pack.yml b/src/OldPbr-64x.pack.yml deleted file mode 100644 index c027cb79..00000000 --- a/src/OldPbr-64x.pack.yml +++ /dev/null @@ -1,36 +0,0 @@ -edition: java -format: 8 -name: Textureless-OldPbr-64x -description: No Textures! PBR shader required. -tags: 64x OldPBR -encoding: - format: old-pbr - sampler: nearest - opacity: {} - color-red: {} - color-green: {} - color-blue: {} - height: - sampler: bilinear - occlusion: {} - normal-x: - sampler: bilinear - normal-y: - sampler: bilinear - normal-z: - sampler: bilinear - specular: {} - smooth: {} - rough: {} - metal: {} - f0: {} - porosity: {} - sss: {} - emissive: {} -block-texture-size: 64 -item-texture-size: 64 -texture-scale: 2 -auto-generate-occlusion: false -bake-occlusion-to-color: true -occlusion-quality: 0.1 -occlusion-power: 2 diff --git a/src/assets/minecraft/blockstates/polished_andesite_stairs.json b/src/assets/minecraft/blockstates/polished_andesite_stairs.json new file mode 100644 index 00000000..ca8703d0 --- /dev/null +++ b/src/assets/minecraft/blockstates/polished_andesite_stairs.json @@ -0,0 +1,174 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_andesite_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_andesite_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "minecraft:block/polished_andesite_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "minecraft:block/polished_andesite_stairs", + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "minecraft:block/polished_andesite_stairs", + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "minecraft:block/polished_andesite_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_andesite_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_andesite_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "minecraft:block/polished_andesite_stairs", + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "minecraft:block/polished_andesite_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "minecraft:block/polished_andesite_stairs", + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "minecraft:block/polished_andesite_stairs_inner", + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "minecraft:block/polished_andesite_stairs_outer", + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "minecraft:block/polished_andesite_stairs", + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/assets/minecraft/blockstates/polished_diorite_stairs.json b/src/assets/minecraft/blockstates/polished_diorite_stairs.json new file mode 100644 index 00000000..94549738 --- /dev/null +++ b/src/assets/minecraft/blockstates/polished_diorite_stairs.json @@ -0,0 +1,174 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_diorite_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_diorite_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "minecraft:block/polished_diorite_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "minecraft:block/polished_diorite_stairs", + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "minecraft:block/polished_diorite_stairs", + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "minecraft:block/polished_diorite_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_diorite_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_diorite_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "minecraft:block/polished_diorite_stairs", + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "minecraft:block/polished_diorite_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "minecraft:block/polished_diorite_stairs", + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "minecraft:block/polished_diorite_stairs_inner", + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "minecraft:block/polished_diorite_stairs_outer", + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "minecraft:block/polished_diorite_stairs", + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/assets/minecraft/blockstates/polished_granite_stairs.json b/src/assets/minecraft/blockstates/polished_granite_stairs.json new file mode 100644 index 00000000..5f84e99e --- /dev/null +++ b/src/assets/minecraft/blockstates/polished_granite_stairs.json @@ -0,0 +1,174 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_granite_stairs_inner", + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_granite_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_granite_stairs_outer", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_granite_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "minecraft:block/polished_granite_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "minecraft:block/polished_granite_stairs_inner", + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "minecraft:block/polished_granite_stairs_inner", + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "minecraft:block/polished_granite_stairs_outer", + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "minecraft:block/polished_granite_stairs_outer", + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "minecraft:block/polished_granite_stairs", + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_granite_stairs_inner", + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_granite_stairs_inner", + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_granite_stairs_outer", + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_granite_stairs_outer", + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "minecraft:block/polished_granite_stairs", + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "minecraft:block/polished_granite_stairs_inner", + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "minecraft:block/polished_granite_stairs_inner", + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "minecraft:block/polished_granite_stairs_outer", + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "minecraft:block/polished_granite_stairs_outer", + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "minecraft:block/polished_granite_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_granite_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_granite_stairs_inner", + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_granite_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_granite_stairs_outer", + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "minecraft:block/polished_granite_stairs", + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "minecraft:block/polished_granite_stairs_inner", + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "minecraft:block/polished_granite_stairs_inner", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "minecraft:block/polished_granite_stairs_outer", + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "minecraft:block/polished_granite_stairs_outer", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "minecraft:block/polished_granite_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "minecraft:block/polished_granite_stairs_inner", + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "minecraft:block/polished_granite_stairs_inner", + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "minecraft:block/polished_granite_stairs_outer", + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "minecraft:block/polished_granite_stairs_outer", + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "minecraft:block/polished_granite_stairs", + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "minecraft:block/polished_granite_stairs_inner", + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "minecraft:block/polished_granite_stairs_inner", + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "minecraft:block/polished_granite_stairs_outer", + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "minecraft:block/polished_granite_stairs_outer", + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "minecraft:block/polished_granite_stairs", + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_button.json b/src/assets/minecraft/models/block/acacia_button.json index c76d614f..afc3f49a 100644 --- a/src/assets/minecraft/models/block/acacia_button.json +++ b/src/assets/minecraft/models/block/acacia_button.json @@ -1,6 +1,7 @@ { "parent": "block/button", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/stripped_acacia_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_button_pressed.json b/src/assets/minecraft/models/block/acacia_button_pressed.json index 928cc9c7..a6010e71 100644 --- a/src/assets/minecraft/models/block/acacia_button_pressed.json +++ b/src/assets/minecraft/models/block/acacia_button_pressed.json @@ -1,6 +1,7 @@ { "parent": "block/button_pressed", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/stripped_acacia_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_gate.json b/src/assets/minecraft/models/block/acacia_fence_gate.json index 7046318a..73116986 100644 --- a/src/assets/minecraft/models/block/acacia_fence_gate.json +++ b/src/assets/minecraft/models/block/acacia_fence_gate.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/stripped_acacia_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_gate_open.json b/src/assets/minecraft/models/block/acacia_fence_gate_open.json index 8bcdcda6..7b21b2f4 100644 --- a/src/assets/minecraft/models/block/acacia_fence_gate_open.json +++ b/src/assets/minecraft/models/block/acacia_fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_open", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/stripped_acacia_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_gate_wall.json b/src/assets/minecraft/models/block/acacia_fence_gate_wall.json index b3488db9..2ce18486 100644 --- a/src/assets/minecraft/models/block/acacia_fence_gate_wall.json +++ b/src/assets/minecraft/models/block/acacia_fence_gate_wall.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/stripped_acacia_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_gate_wall_open.json b/src/assets/minecraft/models/block/acacia_fence_gate_wall_open.json index 4f3c4720..79eb1de9 100644 --- a/src/assets/minecraft/models/block/acacia_fence_gate_wall_open.json +++ b/src/assets/minecraft/models/block/acacia_fence_gate_wall_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall_open", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/stripped_acacia_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_inventory.json b/src/assets/minecraft/models/block/acacia_fence_inventory.json index 41e73a0a..86f471bb 100644 --- a/src/assets/minecraft/models/block/acacia_fence_inventory.json +++ b/src/assets/minecraft/models/block/acacia_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/stripped_acacia_wood_inventory" + "particle": "block/stripped_acacia_wood_inventory", + "post": "block/acacia_fence_post_inventory", + "side": "block/acacia_fence_side_inventory", + "log_end": "block/stripped_acacia_log_top_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_post.json b/src/assets/minecraft/models/block/acacia_fence_post.json index 7e1feb50..e534309a 100644 --- a/src/assets/minecraft/models/block/acacia_fence_post.json +++ b/src/assets/minecraft/models/block/acacia_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "side": "block/acacia_fence_post", "end": "block/acacia_log_top" } diff --git a/src/assets/minecraft/models/block/acacia_fence_side_east.json b/src/assets/minecraft/models/block/acacia_fence_side_east.json index e51c93ff..db7f62d2 100644 --- a/src/assets/minecraft/models/block/acacia_fence_side_east.json +++ b/src/assets/minecraft/models/block/acacia_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/acacia_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_side_north.json b/src/assets/minecraft/models/block/acacia_fence_side_north.json index 98da27e0..867421d8 100644 --- a/src/assets/minecraft/models/block/acacia_fence_side_north.json +++ b/src/assets/minecraft/models/block/acacia_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/acacia_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_side_south.json b/src/assets/minecraft/models/block/acacia_fence_side_south.json index b2d864c8..0415a14c 100644 --- a/src/assets/minecraft/models/block/acacia_fence_side_south.json +++ b/src/assets/minecraft/models/block/acacia_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/acacia_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_fence_side_west.json b/src/assets/minecraft/models/block/acacia_fence_side_west.json index 6feb7a3e..15e1a1b7 100644 --- a/src/assets/minecraft/models/block/acacia_fence_side_west.json +++ b/src/assets/minecraft/models/block/acacia_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/acacia_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_pressure_plate.json b/src/assets/minecraft/models/block/acacia_pressure_plate.json index f4d6d938..f776a957 100644 --- a/src/assets/minecraft/models/block/acacia_pressure_plate.json +++ b/src/assets/minecraft/models/block/acacia_pressure_plate.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_up", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/stripped_acacia_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_pressure_plate_down.json b/src/assets/minecraft/models/block/acacia_pressure_plate_down.json index 3c395738..edf9e85d 100644 --- a/src/assets/minecraft/models/block/acacia_pressure_plate_down.json +++ b/src/assets/minecraft/models/block/acacia_pressure_plate_down.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_down", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/stripped_acacia_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/acacia_trapdoor_bottom.json b/src/assets/minecraft/models/block/acacia_trapdoor_bottom.json index d49faf26..0f097a70 100644 --- a/src/assets/minecraft/models/block/acacia_trapdoor_bottom.json +++ b/src/assets/minecraft/models/block/acacia_trapdoor_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_bottom", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/acacia_trapdoor", "side": "block/acacia_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/acacia_trapdoor_open.json b/src/assets/minecraft/models/block/acacia_trapdoor_open.json index 49ea207b..38f3fed2 100644 --- a/src/assets/minecraft/models/block/acacia_trapdoor_open.json +++ b/src/assets/minecraft/models/block/acacia_trapdoor_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_open", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/acacia_trapdoor", "side": "block/acacia_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/acacia_trapdoor_top.json b/src/assets/minecraft/models/block/acacia_trapdoor_top.json index 4f8fcafb..8866236b 100644 --- a/src/assets/minecraft/models/block/acacia_trapdoor_top.json +++ b/src/assets/minecraft/models/block/acacia_trapdoor_top.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_top", "textures": { + "particle": "block/stripped_acacia_wood_inventory", "texture": "block/acacia_trapdoor", "side": "block/acacia_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/acacia_wood.json b/src/assets/minecraft/models/block/acacia_wood.json index 66d7c6fe..dd689f6d 100644 --- a/src/assets/minecraft/models/block/acacia_wood.json +++ b/src/assets/minecraft/models/block/acacia_wood.json @@ -1,6 +1,7 @@ { "parent": "block/cube_column", "textures": { + "particle": "block/acacia_wood_inventory", "end": "block/acacia_wood", "side": "block/acacia_wood" } diff --git a/src/assets/minecraft/models/block/birch_button.json b/src/assets/minecraft/models/block/birch_button.json index 0f2ad191..f5ac5f90 100644 --- a/src/assets/minecraft/models/block/birch_button.json +++ b/src/assets/minecraft/models/block/birch_button.json @@ -1,6 +1,7 @@ { "parent": "block/button", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/stripped_birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_button_pressed.json b/src/assets/minecraft/models/block/birch_button_pressed.json index c746f898..c7457eab 100644 --- a/src/assets/minecraft/models/block/birch_button_pressed.json +++ b/src/assets/minecraft/models/block/birch_button_pressed.json @@ -1,6 +1,7 @@ { "parent": "block/button_pressed", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/stripped_birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_gate.json b/src/assets/minecraft/models/block/birch_fence_gate.json index 44534a42..a3431d34 100644 --- a/src/assets/minecraft/models/block/birch_fence_gate.json +++ b/src/assets/minecraft/models/block/birch_fence_gate.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/stripped_birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_gate_open.json b/src/assets/minecraft/models/block/birch_fence_gate_open.json index 23c8e640..e630d807 100644 --- a/src/assets/minecraft/models/block/birch_fence_gate_open.json +++ b/src/assets/minecraft/models/block/birch_fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_open", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/stripped_birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_gate_wall.json b/src/assets/minecraft/models/block/birch_fence_gate_wall.json index 536c62dd..a55a1900 100644 --- a/src/assets/minecraft/models/block/birch_fence_gate_wall.json +++ b/src/assets/minecraft/models/block/birch_fence_gate_wall.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/stripped_birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_gate_wall_open.json b/src/assets/minecraft/models/block/birch_fence_gate_wall_open.json index f8bf8eab..70a08b34 100644 --- a/src/assets/minecraft/models/block/birch_fence_gate_wall_open.json +++ b/src/assets/minecraft/models/block/birch_fence_gate_wall_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall_open", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/stripped_birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_inventory.json b/src/assets/minecraft/models/block/birch_fence_inventory.json index 4c86d351..f3c37581 100644 --- a/src/assets/minecraft/models/block/birch_fence_inventory.json +++ b/src/assets/minecraft/models/block/birch_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/stripped_birch_wood_inventory" + "particle": "block/stripped_birch_wood_inventory", + "post": "block/birch_fence_post_inventory", + "side": "block/birch_fence_side_inventory", + "log_end": "block/stripped_birch_log_top_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_post.json b/src/assets/minecraft/models/block/birch_fence_post.json index 7a7c6f55..dc7b1cd2 100644 --- a/src/assets/minecraft/models/block/birch_fence_post.json +++ b/src/assets/minecraft/models/block/birch_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/stripped_birch_wood_inventory", "side": "block/birch_fence_post", "end": "block/birch_log_top" } diff --git a/src/assets/minecraft/models/block/birch_fence_side_east.json b/src/assets/minecraft/models/block/birch_fence_side_east.json index 9446209b..e511f293 100644 --- a/src/assets/minecraft/models/block/birch_fence_side_east.json +++ b/src/assets/minecraft/models/block/birch_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/birch_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_side_north.json b/src/assets/minecraft/models/block/birch_fence_side_north.json index aabb1209..b3691452 100644 --- a/src/assets/minecraft/models/block/birch_fence_side_north.json +++ b/src/assets/minecraft/models/block/birch_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/birch_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_side_south.json b/src/assets/minecraft/models/block/birch_fence_side_south.json index b364bb02..d3ad3222 100644 --- a/src/assets/minecraft/models/block/birch_fence_side_south.json +++ b/src/assets/minecraft/models/block/birch_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/birch_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_fence_side_west.json b/src/assets/minecraft/models/block/birch_fence_side_west.json index 1e8a8a9e..5baacc2b 100644 --- a/src/assets/minecraft/models/block/birch_fence_side_west.json +++ b/src/assets/minecraft/models/block/birch_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/birch_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_log_horizontal.json b/src/assets/minecraft/models/block/birch_log_horizontal.json index 84b70cf1..52998343 100644 --- a/src/assets/minecraft/models/block/birch_log_horizontal.json +++ b/src/assets/minecraft/models/block/birch_log_horizontal.json @@ -1,6 +1,7 @@ { "parent": "block/cube_column_horizontal2", "textures": { + "particle": "block/birch_wood_inventory", "end": "block/birch_log_top", "side": "block/birch_log" } diff --git a/src/assets/minecraft/models/block/birch_pressure_plate.json b/src/assets/minecraft/models/block/birch_pressure_plate.json index 2235c07e..de14a1ad 100644 --- a/src/assets/minecraft/models/block/birch_pressure_plate.json +++ b/src/assets/minecraft/models/block/birch_pressure_plate.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_up", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/stripped_birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_pressure_plate_down.json b/src/assets/minecraft/models/block/birch_pressure_plate_down.json index 1fe1fff2..7f75c03c 100644 --- a/src/assets/minecraft/models/block/birch_pressure_plate_down.json +++ b/src/assets/minecraft/models/block/birch_pressure_plate_down.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_down", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/stripped_birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/birch_trapdoor_bottom.json b/src/assets/minecraft/models/block/birch_trapdoor_bottom.json index 1148eed7..80113601 100644 --- a/src/assets/minecraft/models/block/birch_trapdoor_bottom.json +++ b/src/assets/minecraft/models/block/birch_trapdoor_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_bottom", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/birch_trapdoor", "side": "block/birch_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/birch_trapdoor_open.json b/src/assets/minecraft/models/block/birch_trapdoor_open.json index 8514d1b5..12ecdd2a 100644 --- a/src/assets/minecraft/models/block/birch_trapdoor_open.json +++ b/src/assets/minecraft/models/block/birch_trapdoor_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_open", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/birch_trapdoor", "side": "block/birch_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/birch_trapdoor_top.json b/src/assets/minecraft/models/block/birch_trapdoor_top.json index 6ce43aaa..ce4416ac 100644 --- a/src/assets/minecraft/models/block/birch_trapdoor_top.json +++ b/src/assets/minecraft/models/block/birch_trapdoor_top.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_top", "textures": { + "particle": "block/stripped_birch_wood_inventory", "texture": "block/birch_trapdoor", "side": "block/birch_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/birch_wood.json b/src/assets/minecraft/models/block/birch_wood.json index 5aaadddc..f9bf924c 100644 --- a/src/assets/minecraft/models/block/birch_wood.json +++ b/src/assets/minecraft/models/block/birch_wood.json @@ -1,6 +1,7 @@ { "parent": "block/cube_all", "textures": { + "particle": "block/birch_wood_inventory", "all": "block/birch_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_button.json b/src/assets/minecraft/models/block/crimson_button.json index 1958c41b..20284dc1 100644 --- a/src/assets/minecraft/models/block/crimson_button.json +++ b/src/assets/minecraft/models/block/crimson_button.json @@ -1,6 +1,7 @@ { "parent": "block/button", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/stripped_crimson_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_button_pressed.json b/src/assets/minecraft/models/block/crimson_button_pressed.json index 9c7dfecd..327d5f1b 100644 --- a/src/assets/minecraft/models/block/crimson_button_pressed.json +++ b/src/assets/minecraft/models/block/crimson_button_pressed.json @@ -1,6 +1,7 @@ { "parent": "block/button_pressed", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/stripped_crimson_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_gate.json b/src/assets/minecraft/models/block/crimson_fence_gate.json index 810f9d79..640e63d2 100644 --- a/src/assets/minecraft/models/block/crimson_fence_gate.json +++ b/src/assets/minecraft/models/block/crimson_fence_gate.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/stripped_crimson_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_gate_open.json b/src/assets/minecraft/models/block/crimson_fence_gate_open.json index 3bd1e0aa..10c45f97 100644 --- a/src/assets/minecraft/models/block/crimson_fence_gate_open.json +++ b/src/assets/minecraft/models/block/crimson_fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_open", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/stripped_crimson_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_gate_wall.json b/src/assets/minecraft/models/block/crimson_fence_gate_wall.json index 6ae39e71..873e79be 100644 --- a/src/assets/minecraft/models/block/crimson_fence_gate_wall.json +++ b/src/assets/minecraft/models/block/crimson_fence_gate_wall.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/stripped_crimson_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_gate_wall_open.json b/src/assets/minecraft/models/block/crimson_fence_gate_wall_open.json index eaf49310..9c169445 100644 --- a/src/assets/minecraft/models/block/crimson_fence_gate_wall_open.json +++ b/src/assets/minecraft/models/block/crimson_fence_gate_wall_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall_open", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/stripped_crimson_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_inventory.json b/src/assets/minecraft/models/block/crimson_fence_inventory.json index fb4c96fd..d5019666 100644 --- a/src/assets/minecraft/models/block/crimson_fence_inventory.json +++ b/src/assets/minecraft/models/block/crimson_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/stripped_crimson_hyphae_inventory" + "particle": "block/stripped_crimson_hyphae_inventory", + "post": "block/crimson_fence_post_inventory", + "side": "block/crimson_fence_side_inventory", + "log_end": "block/stripped_crimson_stem_top_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_post.json b/src/assets/minecraft/models/block/crimson_fence_post.json index 09b98c3d..d3c6a4ce 100644 --- a/src/assets/minecraft/models/block/crimson_fence_post.json +++ b/src/assets/minecraft/models/block/crimson_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "side": "block/crimson_fence_post", "end": "block/crimson_stem_top" } diff --git a/src/assets/minecraft/models/block/crimson_fence_side_east.json b/src/assets/minecraft/models/block/crimson_fence_side_east.json index df43bd1b..5cae2b69 100644 --- a/src/assets/minecraft/models/block/crimson_fence_side_east.json +++ b/src/assets/minecraft/models/block/crimson_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/crimson_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_side_north.json b/src/assets/minecraft/models/block/crimson_fence_side_north.json index 380c8ace..a8609afa 100644 --- a/src/assets/minecraft/models/block/crimson_fence_side_north.json +++ b/src/assets/minecraft/models/block/crimson_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/crimson_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_side_south.json b/src/assets/minecraft/models/block/crimson_fence_side_south.json index 70802a45..3ab39278 100644 --- a/src/assets/minecraft/models/block/crimson_fence_side_south.json +++ b/src/assets/minecraft/models/block/crimson_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/crimson_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_fence_side_west.json b/src/assets/minecraft/models/block/crimson_fence_side_west.json index a0829901..2e592d0a 100644 --- a/src/assets/minecraft/models/block/crimson_fence_side_west.json +++ b/src/assets/minecraft/models/block/crimson_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/crimson_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_hyphae.json b/src/assets/minecraft/models/block/crimson_hyphae.json index 03a5e1bb..65587e6d 100644 --- a/src/assets/minecraft/models/block/crimson_hyphae.json +++ b/src/assets/minecraft/models/block/crimson_hyphae.json @@ -1,6 +1,7 @@ { "parent": "block/cube_column", "textures": { + "particle": "block/crimson_hyphae_inventory", "end": "block/crimson_hyphae", "side": "block/crimson_hyphae" } diff --git a/src/assets/minecraft/models/block/crimson_nylium.json b/src/assets/minecraft/models/block/crimson_nylium.json index 5ec59486..821fe812 100644 --- a/src/assets/minecraft/models/block/crimson_nylium.json +++ b/src/assets/minecraft/models/block/crimson_nylium.json @@ -1,7 +1,7 @@ { "parent": "block/cube_bottom_top", "textures": { - "particle": "block/netherrack", + "particle": "block/netherrack_inventory", "bottom": "block/netherrack", "top": "block/crimson_nylium", "side": "block/netherrack", diff --git a/src/assets/minecraft/models/block/crimson_pressure_plate.json b/src/assets/minecraft/models/block/crimson_pressure_plate.json index 035c1300..6cb1aae3 100644 --- a/src/assets/minecraft/models/block/crimson_pressure_plate.json +++ b/src/assets/minecraft/models/block/crimson_pressure_plate.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_up", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/stripped_crimson_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_pressure_plate_down.json b/src/assets/minecraft/models/block/crimson_pressure_plate_down.json index 6223d423..9a56788f 100644 --- a/src/assets/minecraft/models/block/crimson_pressure_plate_down.json +++ b/src/assets/minecraft/models/block/crimson_pressure_plate_down.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_down", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/stripped_crimson_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/crimson_trapdoor_bottom.json b/src/assets/minecraft/models/block/crimson_trapdoor_bottom.json index d4252ed7..a718fa22 100644 --- a/src/assets/minecraft/models/block/crimson_trapdoor_bottom.json +++ b/src/assets/minecraft/models/block/crimson_trapdoor_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_bottom", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/crimson_trapdoor", "side": "block/crimson_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/crimson_trapdoor_open.json b/src/assets/minecraft/models/block/crimson_trapdoor_open.json index 1e05ec3e..d7d256ee 100644 --- a/src/assets/minecraft/models/block/crimson_trapdoor_open.json +++ b/src/assets/minecraft/models/block/crimson_trapdoor_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_open", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/crimson_trapdoor", "side": "block/crimson_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/crimson_trapdoor_top.json b/src/assets/minecraft/models/block/crimson_trapdoor_top.json index 654c2a27..091bdab7 100644 --- a/src/assets/minecraft/models/block/crimson_trapdoor_top.json +++ b/src/assets/minecraft/models/block/crimson_trapdoor_top.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_top", "textures": { + "particle": "block/stripped_crimson_hyphae_inventory", "texture": "block/crimson_trapdoor", "side": "block/crimson_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/dark_oak_button.json b/src/assets/minecraft/models/block/dark_oak_button.json index 92d5c4fa..a4dac367 100644 --- a/src/assets/minecraft/models/block/dark_oak_button.json +++ b/src/assets/minecraft/models/block/dark_oak_button.json @@ -1,6 +1,7 @@ { "parent": "block/button", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/stripped_dark_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_button_pressed.json b/src/assets/minecraft/models/block/dark_oak_button_pressed.json index f623eae6..74dc0076 100644 --- a/src/assets/minecraft/models/block/dark_oak_button_pressed.json +++ b/src/assets/minecraft/models/block/dark_oak_button_pressed.json @@ -1,6 +1,7 @@ { "parent": "block/button_pressed", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/stripped_dark_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_gate.json b/src/assets/minecraft/models/block/dark_oak_fence_gate.json index 216e7e11..da280e01 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_gate.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_gate.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/stripped_dark_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_gate_open.json b/src/assets/minecraft/models/block/dark_oak_fence_gate_open.json index 98305288..d81dd326 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_gate_open.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_open", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/stripped_dark_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_gate_wall.json b/src/assets/minecraft/models/block/dark_oak_fence_gate_wall.json index fd936ded..73a4cd19 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_gate_wall.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_gate_wall.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/stripped_dark_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_gate_wall_open.json b/src/assets/minecraft/models/block/dark_oak_fence_gate_wall_open.json index 8c82fa7d..954c7c9e 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_gate_wall_open.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_gate_wall_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall_open", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/stripped_dark_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_inventory.json b/src/assets/minecraft/models/block/dark_oak_fence_inventory.json index 89837316..ecb42807 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_inventory.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/stripped_dark_oak_wood_inventory" + "particle": "block/stripped_dark_oak_wood_inventory", + "post": "block/dark_oak_fence_post_inventory", + "side": "block/dark_oak_fence_side_inventory", + "log_end": "block/stripped_dark_oak_log_top_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_post.json b/src/assets/minecraft/models/block/dark_oak_fence_post.json index 03755e35..6edca4d5 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_post.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "side": "block/dark_oak_fence_post", "end": "block/dark_oak_log_top" } diff --git a/src/assets/minecraft/models/block/dark_oak_fence_side_east.json b/src/assets/minecraft/models/block/dark_oak_fence_side_east.json index 29087046..9d5bdabf 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_side_east.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/dark_oak_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_side_north.json b/src/assets/minecraft/models/block/dark_oak_fence_side_north.json index b14caa8e..7286ba4d 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_side_north.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/dark_oak_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_side_south.json b/src/assets/minecraft/models/block/dark_oak_fence_side_south.json index 7613a495..c3825ee3 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_side_south.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/dark_oak_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_fence_side_west.json b/src/assets/minecraft/models/block/dark_oak_fence_side_west.json index 8fe2492a..a1ec1539 100644 --- a/src/assets/minecraft/models/block/dark_oak_fence_side_west.json +++ b/src/assets/minecraft/models/block/dark_oak_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/dark_oak_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_log_horizontal.json b/src/assets/minecraft/models/block/dark_oak_log_horizontal.json index e61f00aa..0973a2ce 100644 --- a/src/assets/minecraft/models/block/dark_oak_log_horizontal.json +++ b/src/assets/minecraft/models/block/dark_oak_log_horizontal.json @@ -1,6 +1,7 @@ { "parent": "block/cube_column_horizontal2", "textures": { + "particle": "block/dark_oak_wood_inventory", "end": "block/dark_oak_log_top", "side": "block/dark_oak_log" } diff --git a/src/assets/minecraft/models/block/dark_oak_pressure_plate.json b/src/assets/minecraft/models/block/dark_oak_pressure_plate.json index ccd24a6d..753c00e7 100644 --- a/src/assets/minecraft/models/block/dark_oak_pressure_plate.json +++ b/src/assets/minecraft/models/block/dark_oak_pressure_plate.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_up", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/stripped_dark_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_pressure_plate_down.json b/src/assets/minecraft/models/block/dark_oak_pressure_plate_down.json index 50f2c5ed..7f5211c9 100644 --- a/src/assets/minecraft/models/block/dark_oak_pressure_plate_down.json +++ b/src/assets/minecraft/models/block/dark_oak_pressure_plate_down.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_down", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/stripped_dark_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/dark_oak_trapdoor_bottom.json b/src/assets/minecraft/models/block/dark_oak_trapdoor_bottom.json index 28b2d741..e198b309 100644 --- a/src/assets/minecraft/models/block/dark_oak_trapdoor_bottom.json +++ b/src/assets/minecraft/models/block/dark_oak_trapdoor_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/template_trapdoor_bottom", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/dark_oak_trapdoor", "side": "block/dark_oak_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/dark_oak_trapdoor_open.json b/src/assets/minecraft/models/block/dark_oak_trapdoor_open.json index a5b7c056..56e2a267 100644 --- a/src/assets/minecraft/models/block/dark_oak_trapdoor_open.json +++ b/src/assets/minecraft/models/block/dark_oak_trapdoor_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_trapdoor_open", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/dark_oak_trapdoor", "side": "block/dark_oak_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/dark_oak_trapdoor_top.json b/src/assets/minecraft/models/block/dark_oak_trapdoor_top.json index b5c3edf2..61c4cbf0 100644 --- a/src/assets/minecraft/models/block/dark_oak_trapdoor_top.json +++ b/src/assets/minecraft/models/block/dark_oak_trapdoor_top.json @@ -1,6 +1,7 @@ { "parent": "block/template_trapdoor_top", "textures": { + "particle": "block/stripped_dark_oak_wood_inventory", "texture": "block/dark_oak_trapdoor", "side": "block/dark_oak_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/fence_inventory.json b/src/assets/minecraft/models/block/fence_inventory.json index 37245c38..a2909a68 100644 --- a/src/assets/minecraft/models/block/fence_inventory.json +++ b/src/assets/minecraft/models/block/fence_inventory.json @@ -10,12 +10,12 @@ "from": [6, 0, 0], "to": [10, 16, 4], "faces": { - "north": {"uv": [6, 0, 10, 16], "texture": "#texture"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#texture"}, - "south": {"uv": [6, 0, 10, 16], "texture": "#texture"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#texture"}, - "up": {"uv": [6, 0, 10, 4], "texture": "#texture"}, - "down": {"uv": [6, 0, 10, 4], "texture": "#texture", "cullface": "down"} + "north": {"uv": [0, 0, 4, 16], "texture": "#post"}, + "east": {"uv": [12, 0, 16, 16], "texture": "#post"}, + "south": {"uv": [8, 0, 12, 16], "texture": "#post"}, + "west": {"uv": [4, 0, 8, 16], "texture": "#post"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#log_end"}, + "down": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#log_end", "cullface": "down"} } }, { @@ -23,38 +23,38 @@ "from": [6, 0, 12], "to": [10, 16, 16], "faces": { - "north": {"uv": [6, 0, 10, 16], "texture": "#texture"}, - "east": {"uv": [12, 0, 16, 16], "texture": "#texture"}, - "south": {"uv": [6, 0, 10, 16], "texture": "#texture"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#texture"}, - "up": {"uv": [6, 12, 10, 16], "texture": "#texture"}, - "down": {"uv": [6, 12, 10, 16], "texture": "#texture", "cullface": "down"} + "north": {"uv": [8, 0, 12, 16], "texture": "#post"}, + "east": {"uv": [4, 0, 8, 16], "texture": "#post"}, + "south": {"uv": [0, 0, 4, 16], "texture": "#post"}, + "west": {"uv": [12, 0, 16, 16], "texture": "#post"}, + "up": {"uv": [6, 6, 10, 10], "rotation": 90, "texture": "#log_end"}, + "down": {"uv": [6, 6, 10, 10], "texture": "#log_end", "cullface": "down"} } }, { "name": "Top bar", - "from": [7, 13, -2], + "from": [7, 12, -2], "to": [9, 15, 18], "faces": { - "north": {"uv": [4, 0, 6, 2], "texture": "#texture"}, - "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#texture"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#texture"}, - "west": {"uv": [4, 0, 6, 16], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [2, 0, 4, 16], "texture": "#texture"}, - "down": {"uv": [6, 0, 8, 16], "texture": "#texture"} + "north": {"uv": [4, 0, 6, 2], "texture": "#side"}, + "east": {"uv": [2, 0, 5, 16], "rotation": 90, "texture": "#side"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#side"}, + "west": {"uv": [7, 0, 10, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [0, 0, 2, 16], "texture": "#side"}, + "down": {"uv": [5, 0, 7, 16], "texture": "#side"} } }, { "name": "Lower bar", "from": [7, 5, -2], - "to": [9, 7, 18], + "to": [9, 8, 18], "faces": { - "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, - "east": {"uv": [8, 0, 10, 16], "rotation": 90, "texture": "#texture"}, - "south": {"uv": [12, 0, 14, 2], "texture": "#texture"}, - "west": {"uv": [12, 0, 14, 16], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [10, 0, 12, 16], "texture": "#texture"}, - "down": {"uv": [14, 0, 16, 16], "texture": "#texture"} + "north": {"uv": [8, 0, 10, 2], "texture": "#side"}, + "east": {"uv": [12, 0, 15, 16], "rotation": 90, "texture": "#side"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#side"}, + "west": {"uv": [2, 0, 5, 16], "rotation": 90, "texture": "#side"}, + "up": {"uv": [10, 0, 12, 16], "texture": "#side"}, + "down": {"uv": [0, 0, 2, 16], "texture": "#side"} } } ], diff --git a/src/assets/minecraft/models/block/jungle_button.json b/src/assets/minecraft/models/block/jungle_button.json index d08af60e..d7ff36d3 100644 --- a/src/assets/minecraft/models/block/jungle_button.json +++ b/src/assets/minecraft/models/block/jungle_button.json @@ -1,6 +1,7 @@ { "parent": "block/button", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/stripped_jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_button_pressed.json b/src/assets/minecraft/models/block/jungle_button_pressed.json index 910dd5d5..8d1beb88 100644 --- a/src/assets/minecraft/models/block/jungle_button_pressed.json +++ b/src/assets/minecraft/models/block/jungle_button_pressed.json @@ -1,6 +1,7 @@ { "parent": "block/button_pressed", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/stripped_jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_gate.json b/src/assets/minecraft/models/block/jungle_fence_gate.json index a5a65033..96c32997 100644 --- a/src/assets/minecraft/models/block/jungle_fence_gate.json +++ b/src/assets/minecraft/models/block/jungle_fence_gate.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/stripped_jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_gate_open.json b/src/assets/minecraft/models/block/jungle_fence_gate_open.json index 1c06a9b2..e8a0ff04 100644 --- a/src/assets/minecraft/models/block/jungle_fence_gate_open.json +++ b/src/assets/minecraft/models/block/jungle_fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_open", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/stripped_jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_gate_wall.json b/src/assets/minecraft/models/block/jungle_fence_gate_wall.json index 6dde7fd0..afe8d1ba 100644 --- a/src/assets/minecraft/models/block/jungle_fence_gate_wall.json +++ b/src/assets/minecraft/models/block/jungle_fence_gate_wall.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/stripped_jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_gate_wall_open.json b/src/assets/minecraft/models/block/jungle_fence_gate_wall_open.json index e5d5c85a..8ef63424 100644 --- a/src/assets/minecraft/models/block/jungle_fence_gate_wall_open.json +++ b/src/assets/minecraft/models/block/jungle_fence_gate_wall_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall_open", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/stripped_jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_inventory.json b/src/assets/minecraft/models/block/jungle_fence_inventory.json index 0829a340..96cbbafc 100644 --- a/src/assets/minecraft/models/block/jungle_fence_inventory.json +++ b/src/assets/minecraft/models/block/jungle_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/stripped_jungle_wood_inventory" + "particle": "block/stripped_jungle_wood_inventory", + "post": "block/jungle_fence_post_inventory", + "side": "block/jungle_fence_side_inventory", + "log_end": "block/stripped_jungle_log_top_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_post.json b/src/assets/minecraft/models/block/jungle_fence_post.json index c6b39a10..bb724688 100644 --- a/src/assets/minecraft/models/block/jungle_fence_post.json +++ b/src/assets/minecraft/models/block/jungle_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "side": "block/jungle_fence_post", "end": "block/jungle_log_top" } diff --git a/src/assets/minecraft/models/block/jungle_fence_side_east.json b/src/assets/minecraft/models/block/jungle_fence_side_east.json index 90aaf092..0e435c89 100644 --- a/src/assets/minecraft/models/block/jungle_fence_side_east.json +++ b/src/assets/minecraft/models/block/jungle_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/jungle_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_side_north.json b/src/assets/minecraft/models/block/jungle_fence_side_north.json index 246b5b86..5dedc476 100644 --- a/src/assets/minecraft/models/block/jungle_fence_side_north.json +++ b/src/assets/minecraft/models/block/jungle_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/jungle_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_side_south.json b/src/assets/minecraft/models/block/jungle_fence_side_south.json index 619789bf..a605864f 100644 --- a/src/assets/minecraft/models/block/jungle_fence_side_south.json +++ b/src/assets/minecraft/models/block/jungle_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/jungle_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_fence_side_west.json b/src/assets/minecraft/models/block/jungle_fence_side_west.json index 86969c1c..bc653774 100644 --- a/src/assets/minecraft/models/block/jungle_fence_side_west.json +++ b/src/assets/minecraft/models/block/jungle_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/jungle_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_pressure_plate.json b/src/assets/minecraft/models/block/jungle_pressure_plate.json index 34828d7a..e55b086e 100644 --- a/src/assets/minecraft/models/block/jungle_pressure_plate.json +++ b/src/assets/minecraft/models/block/jungle_pressure_plate.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_up", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/stripped_jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_pressure_plate_down.json b/src/assets/minecraft/models/block/jungle_pressure_plate_down.json index 4c532335..34208feb 100644 --- a/src/assets/minecraft/models/block/jungle_pressure_plate_down.json +++ b/src/assets/minecraft/models/block/jungle_pressure_plate_down.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_down", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/stripped_jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/jungle_trapdoor_bottom.json b/src/assets/minecraft/models/block/jungle_trapdoor_bottom.json index d2caec2f..01b7ac26 100644 --- a/src/assets/minecraft/models/block/jungle_trapdoor_bottom.json +++ b/src/assets/minecraft/models/block/jungle_trapdoor_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_bottom", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/jungle_trapdoor", "side": "block/jungle_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/jungle_trapdoor_open.json b/src/assets/minecraft/models/block/jungle_trapdoor_open.json index de99dc6d..61f62f13 100644 --- a/src/assets/minecraft/models/block/jungle_trapdoor_open.json +++ b/src/assets/minecraft/models/block/jungle_trapdoor_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_open", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/jungle_trapdoor", "side": "block/jungle_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/jungle_trapdoor_top.json b/src/assets/minecraft/models/block/jungle_trapdoor_top.json index 952dbd12..0ad14ac9 100644 --- a/src/assets/minecraft/models/block/jungle_trapdoor_top.json +++ b/src/assets/minecraft/models/block/jungle_trapdoor_top.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_top", "textures": { + "particle": "block/stripped_jungle_wood_inventory", "texture": "block/jungle_trapdoor", "side": "block/jungle_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/jungle_wood.json b/src/assets/minecraft/models/block/jungle_wood.json index cfc368e3..3531e9bc 100644 --- a/src/assets/minecraft/models/block/jungle_wood.json +++ b/src/assets/minecraft/models/block/jungle_wood.json @@ -1,6 +1,7 @@ { "parent": "block/cube_all", "textures": { + "particle": "block/jungle_wood_inventory", "all": "block/jungle_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/nether_brick_fence_inventory.json b/src/assets/minecraft/models/block/nether_brick_fence_inventory.json index 4721709d..21bee8e1 100644 --- a/src/assets/minecraft/models/block/nether_brick_fence_inventory.json +++ b/src/assets/minecraft/models/block/nether_brick_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/nether_brick_fence_inventory" + "particle": "block/nether_brick_fence_inventory", + "post": "block/nether_brick_fence_post_inventory", + "side": "block/nether_brick_fence_side_inventory", + "log_end": "block/nether_brick_fence_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/nether_brick_fence_post.json b/src/assets/minecraft/models/block/nether_brick_fence_post.json index ac409a93..316254ca 100644 --- a/src/assets/minecraft/models/block/nether_brick_fence_post.json +++ b/src/assets/minecraft/models/block/nether_brick_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/nether_brick_fence_inventory", "side": "block/nether_brick_fence_post", "end": "block/nether_brick_fence_post" } diff --git a/src/assets/minecraft/models/block/nether_brick_fence_side_east.json b/src/assets/minecraft/models/block/nether_brick_fence_side_east.json index b5569016..e175b8d3 100644 --- a/src/assets/minecraft/models/block/nether_brick_fence_side_east.json +++ b/src/assets/minecraft/models/block/nether_brick_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/nether_brick_fence_inventory", "texture": "block/nether_brick_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/nether_brick_fence_side_north.json b/src/assets/minecraft/models/block/nether_brick_fence_side_north.json index 4bc16c81..b5522b2f 100644 --- a/src/assets/minecraft/models/block/nether_brick_fence_side_north.json +++ b/src/assets/minecraft/models/block/nether_brick_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/nether_brick_fence_inventory", "texture": "block/nether_brick_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/nether_brick_fence_side_south.json b/src/assets/minecraft/models/block/nether_brick_fence_side_south.json index cc911d10..a9bacf69 100644 --- a/src/assets/minecraft/models/block/nether_brick_fence_side_south.json +++ b/src/assets/minecraft/models/block/nether_brick_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/nether_brick_fence_inventory", "texture": "block/nether_brick_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/nether_brick_fence_side_west.json b/src/assets/minecraft/models/block/nether_brick_fence_side_west.json index 83a9f04d..f1bb295e 100644 --- a/src/assets/minecraft/models/block/nether_brick_fence_side_west.json +++ b/src/assets/minecraft/models/block/nether_brick_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/nether_brick_fence_inventory", "texture": "block/nether_brick_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_button.json b/src/assets/minecraft/models/block/oak_button.json index f4d02d69..063f49a0 100644 --- a/src/assets/minecraft/models/block/oak_button.json +++ b/src/assets/minecraft/models/block/oak_button.json @@ -1,6 +1,7 @@ { "parent": "block/button", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/stripped_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_button_pressed.json b/src/assets/minecraft/models/block/oak_button_pressed.json index 3fc56c9f..3487484c 100644 --- a/src/assets/minecraft/models/block/oak_button_pressed.json +++ b/src/assets/minecraft/models/block/oak_button_pressed.json @@ -1,6 +1,7 @@ { "parent": "block/button_pressed", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/stripped_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_gate.json b/src/assets/minecraft/models/block/oak_fence_gate.json index a88a9bc4..7efddf42 100644 --- a/src/assets/minecraft/models/block/oak_fence_gate.json +++ b/src/assets/minecraft/models/block/oak_fence_gate.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/stripped_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_gate_open.json b/src/assets/minecraft/models/block/oak_fence_gate_open.json index 177419ef..7ccba55b 100644 --- a/src/assets/minecraft/models/block/oak_fence_gate_open.json +++ b/src/assets/minecraft/models/block/oak_fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_open", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/stripped_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_gate_wall.json b/src/assets/minecraft/models/block/oak_fence_gate_wall.json index cf7951f9..fbb45c57 100644 --- a/src/assets/minecraft/models/block/oak_fence_gate_wall.json +++ b/src/assets/minecraft/models/block/oak_fence_gate_wall.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/stripped_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_gate_wall_open.json b/src/assets/minecraft/models/block/oak_fence_gate_wall_open.json index b901ed46..680a55d4 100644 --- a/src/assets/minecraft/models/block/oak_fence_gate_wall_open.json +++ b/src/assets/minecraft/models/block/oak_fence_gate_wall_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall_open", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/stripped_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_inventory.json b/src/assets/minecraft/models/block/oak_fence_inventory.json index 74277241..6f8400a4 100644 --- a/src/assets/minecraft/models/block/oak_fence_inventory.json +++ b/src/assets/minecraft/models/block/oak_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/stripped_oak_wood_inventory" + "particle": "block/stripped_oak_wood_inventory", + "post": "block/oak_fence_post_inventory", + "side": "block/oak_fence_side_inventory", + "log_end": "block/stripped_oak_log_top_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_post.json b/src/assets/minecraft/models/block/oak_fence_post.json index 39022138..aa52ee32 100644 --- a/src/assets/minecraft/models/block/oak_fence_post.json +++ b/src/assets/minecraft/models/block/oak_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/stripped_oak_wood_inventory", "side": "block/oak_fence_post", "end": "block/oak_log_top" } diff --git a/src/assets/minecraft/models/block/oak_fence_side_east.json b/src/assets/minecraft/models/block/oak_fence_side_east.json index cde2ae19..6a58e58f 100644 --- a/src/assets/minecraft/models/block/oak_fence_side_east.json +++ b/src/assets/minecraft/models/block/oak_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/oak_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_side_north.json b/src/assets/minecraft/models/block/oak_fence_side_north.json index 5a21031c..15d30bb0 100644 --- a/src/assets/minecraft/models/block/oak_fence_side_north.json +++ b/src/assets/minecraft/models/block/oak_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/oak_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_side_south.json b/src/assets/minecraft/models/block/oak_fence_side_south.json index dba4f131..8c88da16 100644 --- a/src/assets/minecraft/models/block/oak_fence_side_south.json +++ b/src/assets/minecraft/models/block/oak_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/oak_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_fence_side_west.json b/src/assets/minecraft/models/block/oak_fence_side_west.json index 5fdb972b..4bdd15ad 100644 --- a/src/assets/minecraft/models/block/oak_fence_side_west.json +++ b/src/assets/minecraft/models/block/oak_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/oak_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_log_horizontal.json b/src/assets/minecraft/models/block/oak_log_horizontal.json index 4a2eab35..43ce25ab 100644 --- a/src/assets/minecraft/models/block/oak_log_horizontal.json +++ b/src/assets/minecraft/models/block/oak_log_horizontal.json @@ -1,6 +1,7 @@ { "parent": "block/cube_column_horizontal2", "textures": { + "particle": "block/oak_wood_inventory", "end": "block/oak_log_top", "side": "block/oak_log" } diff --git a/src/assets/minecraft/models/block/oak_pressure_plate.json b/src/assets/minecraft/models/block/oak_pressure_plate.json index 1c87a824..74a82d32 100644 --- a/src/assets/minecraft/models/block/oak_pressure_plate.json +++ b/src/assets/minecraft/models/block/oak_pressure_plate.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_up", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/stripped_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_pressure_plate_down.json b/src/assets/minecraft/models/block/oak_pressure_plate_down.json index bd023077..e3bbf5b0 100644 --- a/src/assets/minecraft/models/block/oak_pressure_plate_down.json +++ b/src/assets/minecraft/models/block/oak_pressure_plate_down.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_down", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/stripped_oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/oak_trapdoor_bottom.json b/src/assets/minecraft/models/block/oak_trapdoor_bottom.json index 7686c095..af99e0ff 100644 --- a/src/assets/minecraft/models/block/oak_trapdoor_bottom.json +++ b/src/assets/minecraft/models/block/oak_trapdoor_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/template_trapdoor_bottom", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/oak_trapdoor", "side": "block/oak_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/oak_trapdoor_open.json b/src/assets/minecraft/models/block/oak_trapdoor_open.json index 44d1fd19..e554d568 100644 --- a/src/assets/minecraft/models/block/oak_trapdoor_open.json +++ b/src/assets/minecraft/models/block/oak_trapdoor_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_trapdoor_open", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/oak_trapdoor", "side": "block/oak_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/oak_trapdoor_top.json b/src/assets/minecraft/models/block/oak_trapdoor_top.json index ead966ae..c55a3b3e 100644 --- a/src/assets/minecraft/models/block/oak_trapdoor_top.json +++ b/src/assets/minecraft/models/block/oak_trapdoor_top.json @@ -1,6 +1,7 @@ { "parent": "block/template_trapdoor_top", "textures": { + "particle": "block/stripped_oak_wood_inventory", "texture": "block/oak_trapdoor", "side": "block/oak_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/oak_wood.json b/src/assets/minecraft/models/block/oak_wood.json index ba80bda3..c3524224 100644 --- a/src/assets/minecraft/models/block/oak_wood.json +++ b/src/assets/minecraft/models/block/oak_wood.json @@ -1,6 +1,7 @@ { "parent": "block/cube_all", "textures": { + "particle": "block/oak_wood_inventory", "all": "block/oak_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_andesite_stairs.json b/src/assets/minecraft/models/block/polished_andesite_stairs.json index 85954e49..b7dc787e 100644 --- a/src/assets/minecraft/models/block/polished_andesite_stairs.json +++ b/src/assets/minecraft/models/block/polished_andesite_stairs.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "block/polished_stairs", "textures": { "bottom": "block/polished_andesite", "top": "block/polished_andesite_slab", diff --git a/src/assets/minecraft/models/block/polished_andesite_stairs_inner.json b/src/assets/minecraft/models/block/polished_andesite_stairs_inner.json index 11f06d62..a16dc226 100644 --- a/src/assets/minecraft/models/block/polished_andesite_stairs_inner.json +++ b/src/assets/minecraft/models/block/polished_andesite_stairs_inner.json @@ -1,9 +1,7 @@ { - "parent": "block/inner_stairs", + "parent": "block/polished_inner_stairs", "textures": { - "bottom": "block/polished_andesite", - "top": "block/polished_andesite_slab", - "side": "block/polished_andesite_slab", - "particle": "block/polished_andesite_inventory" + "cut": "block/polished_andesite_cut", + "particle": "block/polished_andesite_cut_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_andesite_stairs_outer.json b/src/assets/minecraft/models/block/polished_andesite_stairs_outer.json index d11eefaa..3b5d5b79 100644 --- a/src/assets/minecraft/models/block/polished_andesite_stairs_outer.json +++ b/src/assets/minecraft/models/block/polished_andesite_stairs_outer.json @@ -1,9 +1,7 @@ { - "parent": "block/outer_stairs", + "parent": "block/polished_outer_stairs", "textures": { - "bottom": "block/polished_andesite", - "top": "block/polished_andesite_slab", - "side": "block/polished_andesite_slab", - "particle": "block/polished_andesite_inventory" + "cut": "block/polished_andesite_cut", + "particle": "block/polished_andesite_cut_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_diorite_stairs.json b/src/assets/minecraft/models/block/polished_diorite_stairs.json index 342f7931..8b16637f 100644 --- a/src/assets/minecraft/models/block/polished_diorite_stairs.json +++ b/src/assets/minecraft/models/block/polished_diorite_stairs.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "block/polished_stairs", "textures": { "bottom": "block/polished_diorite", "top": "block/polished_diorite_slab", diff --git a/src/assets/minecraft/models/block/polished_diorite_stairs_inner.json b/src/assets/minecraft/models/block/polished_diorite_stairs_inner.json index 079ba0a3..3b8d6a20 100644 --- a/src/assets/minecraft/models/block/polished_diorite_stairs_inner.json +++ b/src/assets/minecraft/models/block/polished_diorite_stairs_inner.json @@ -1,9 +1,7 @@ { - "parent": "block/inner_stairs", + "parent": "block/polished_inner_stairs", "textures": { - "bottom": "block/polished_diorite", - "top": "block/polished_diorite_slab", - "side": "block/polished_diorite_slab", - "particle": "block/polished_diorite_inventory" + "cut": "block/polished_diorite_cut", + "particle": "block/polished_diorite_cut_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_diorite_stairs_outer.json b/src/assets/minecraft/models/block/polished_diorite_stairs_outer.json index 2a754f3d..155a2764 100644 --- a/src/assets/minecraft/models/block/polished_diorite_stairs_outer.json +++ b/src/assets/minecraft/models/block/polished_diorite_stairs_outer.json @@ -1,9 +1,7 @@ { - "parent": "block/outer_stairs", + "parent": "block/polished_outer_stairs", "textures": { - "bottom": "block/polished_diorite", - "top": "block/polished_diorite_slab", - "side": "block/polished_diorite_slab", - "particle": "block/polished_diorite_inventory" + "cut": "block/polished_diorite_cut", + "particle": "block/polished_diorite_cut_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_granite_stairs.json b/src/assets/minecraft/models/block/polished_granite_stairs.json index 2ca7d3ff..bd946ba7 100644 --- a/src/assets/minecraft/models/block/polished_granite_stairs.json +++ b/src/assets/minecraft/models/block/polished_granite_stairs.json @@ -1,5 +1,5 @@ { - "parent": "block/stairs", + "parent": "block/polished_stairs", "textures": { "bottom": "block/polished_granite", "top": "block/polished_granite_slab", diff --git a/src/assets/minecraft/models/block/polished_granite_stairs_inner.json b/src/assets/minecraft/models/block/polished_granite_stairs_inner.json index 612986da..3e56779c 100644 --- a/src/assets/minecraft/models/block/polished_granite_stairs_inner.json +++ b/src/assets/minecraft/models/block/polished_granite_stairs_inner.json @@ -1,9 +1,7 @@ { - "parent": "block/inner_stairs", + "parent": "block/polished_inner_stairs", "textures": { - "bottom": "block/polished_granite", - "top": "block/polished_granite_slab", - "side": "block/polished_granite_slab", - "particle": "block/polished_granite_inventory" + "cut": "block/polished_granite_cut", + "particle": "block/polished_granite_cut_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_granite_stairs_outer.json b/src/assets/minecraft/models/block/polished_granite_stairs_outer.json index 9126c6b4..bddd1389 100644 --- a/src/assets/minecraft/models/block/polished_granite_stairs_outer.json +++ b/src/assets/minecraft/models/block/polished_granite_stairs_outer.json @@ -1,9 +1,7 @@ { - "parent": "block/outer_stairs", + "parent": "block/polished_outer_stairs", "textures": { - "bottom": "block/polished_granite", - "top": "block/polished_granite_slab", - "side": "block/polished_granite_slab", - "particle": "block/polished_granite_inventory" + "cut": "block/polished_granite_cut", + "particle": "block/polished_granite_cut_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_inner_stairs.json b/src/assets/minecraft/models/block/polished_inner_stairs.json new file mode 100644 index 00000000..79d8425c --- /dev/null +++ b/src/assets/minecraft/models/block/polished_inner_stairs.json @@ -0,0 +1,40 @@ +{ + "textures": { + "particle": "#cut" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "up": {"uv": [0, 0, 16, 16], "texture": "#cut"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#cut", "cullface": "down"}, + "north": {"uv": [0, 8, 16, 16], "texture": "#cut", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#cut", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#cut", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#cut", "cullface": "west"} + } + }, + { + "from": [8, 8, 0], + "to": [16, 16, 16], + "faces": { + "up": {"uv": [8, 0, 16, 16], "texture": "#cut", "cullface": "up"}, + "north": {"uv": [0, 0, 8, 8], "texture": "#cut", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#cut", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#cut", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 8], "texture": "#cut"} + } + }, + { + "from": [0, 8, 8], + "to": [8, 16, 16], + "faces": { + "up": {"uv": [0, 8, 8, 16], "texture": "#cut", "cullface": "up"}, + "north": {"uv": [8, 0, 16, 8], "texture": "#cut"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#cut", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#cut", "cullface": "west"} + } + } + ] +} \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_outer_stairs.json b/src/assets/minecraft/models/block/polished_outer_stairs.json new file mode 100644 index 00000000..e8b0a129 --- /dev/null +++ b/src/assets/minecraft/models/block/polished_outer_stairs.json @@ -0,0 +1,30 @@ +{ + "textures": { + "particle": "#cut" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "up": {"uv": [0, 0, 16, 16], "texture": "#cut"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#cut", "cullface": "down"}, + "north": {"uv": [0, 8, 16, 16], "texture": "#cut", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#cut", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#cut", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#cut", "cullface": "west"} + } + }, + { + "from": [8, 8, 8], + "to": [16, 16, 16], + "faces": { + "up": {"uv": [8, 8, 16, 16], "texture": "#cut", "cullface": "up"}, + "north": {"uv": [0, 0, 8, 8], "texture": "#cut"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#cut", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#cut", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#cut"} + } + } + ] +} \ No newline at end of file diff --git a/src/assets/minecraft/models/block/polished_stairs.json b/src/assets/minecraft/models/block/polished_stairs.json new file mode 100644 index 00000000..cd259af8 --- /dev/null +++ b/src/assets/minecraft/models/block/polished_stairs.json @@ -0,0 +1,42 @@ +{ + "parent": "block/block", + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 8, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 8], "texture": "#side"}, + "up": {"uv": [0, 0, 16, 8], "rotation": 90, "texture": "#top", "cullface": "up"} + } + } + ], + "display": { + "thirdperson_lefthand": { + "rotation": [75, -135, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "gui": { + "rotation": [30, 135, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, -90, 0] + } + } +} \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_button.json b/src/assets/minecraft/models/block/spruce_button.json index 607ef2d6..04a7e4e9 100644 --- a/src/assets/minecraft/models/block/spruce_button.json +++ b/src/assets/minecraft/models/block/spruce_button.json @@ -1,6 +1,7 @@ { "parent": "block/button", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/stripped_spruce_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_button_pressed.json b/src/assets/minecraft/models/block/spruce_button_pressed.json index 8ab61216..10906f61 100644 --- a/src/assets/minecraft/models/block/spruce_button_pressed.json +++ b/src/assets/minecraft/models/block/spruce_button_pressed.json @@ -1,6 +1,7 @@ { "parent": "block/button_pressed", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/stripped_spruce_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_gate.json b/src/assets/minecraft/models/block/spruce_fence_gate.json index 0a0689b3..9251b99d 100644 --- a/src/assets/minecraft/models/block/spruce_fence_gate.json +++ b/src/assets/minecraft/models/block/spruce_fence_gate.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/stripped_spruce_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_gate_open.json b/src/assets/minecraft/models/block/spruce_fence_gate_open.json index a6324834..35c44152 100644 --- a/src/assets/minecraft/models/block/spruce_fence_gate_open.json +++ b/src/assets/minecraft/models/block/spruce_fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_open", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/stripped_spruce_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_gate_wall.json b/src/assets/minecraft/models/block/spruce_fence_gate_wall.json index 325d903b..1abb7919 100644 --- a/src/assets/minecraft/models/block/spruce_fence_gate_wall.json +++ b/src/assets/minecraft/models/block/spruce_fence_gate_wall.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/stripped_spruce_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_gate_wall_open.json b/src/assets/minecraft/models/block/spruce_fence_gate_wall_open.json index 03b0a127..ddc65038 100644 --- a/src/assets/minecraft/models/block/spruce_fence_gate_wall_open.json +++ b/src/assets/minecraft/models/block/spruce_fence_gate_wall_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall_open", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/stripped_spruce_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_inventory.json b/src/assets/minecraft/models/block/spruce_fence_inventory.json index 32831af8..80c9d617 100644 --- a/src/assets/minecraft/models/block/spruce_fence_inventory.json +++ b/src/assets/minecraft/models/block/spruce_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/stripped_spruce_wood_inventory" + "particle": "block/stripped_spruce_wood_inventory", + "post": "block/spruce_fence_post_inventory", + "side": "block/spruce_fence_side_inventory", + "log_end": "block/stripped_spruce_log_top_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_post.json b/src/assets/minecraft/models/block/spruce_fence_post.json index aca5c6aa..2ab62606 100644 --- a/src/assets/minecraft/models/block/spruce_fence_post.json +++ b/src/assets/minecraft/models/block/spruce_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "side": "block/spruce_fence_post", "end": "block/spruce_log_top" } diff --git a/src/assets/minecraft/models/block/spruce_fence_side_east.json b/src/assets/minecraft/models/block/spruce_fence_side_east.json index ff79a70e..d3f5826d 100644 --- a/src/assets/minecraft/models/block/spruce_fence_side_east.json +++ b/src/assets/minecraft/models/block/spruce_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/spruce_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_side_north.json b/src/assets/minecraft/models/block/spruce_fence_side_north.json index 18d855b8..d6d2e380 100644 --- a/src/assets/minecraft/models/block/spruce_fence_side_north.json +++ b/src/assets/minecraft/models/block/spruce_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/spruce_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_side_south.json b/src/assets/minecraft/models/block/spruce_fence_side_south.json index f3940927..5607989d 100644 --- a/src/assets/minecraft/models/block/spruce_fence_side_south.json +++ b/src/assets/minecraft/models/block/spruce_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/spruce_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_fence_side_west.json b/src/assets/minecraft/models/block/spruce_fence_side_west.json index 4e44f20f..4101f56c 100644 --- a/src/assets/minecraft/models/block/spruce_fence_side_west.json +++ b/src/assets/minecraft/models/block/spruce_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/spruce_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_pressure_plate.json b/src/assets/minecraft/models/block/spruce_pressure_plate.json index 45966361..8a2f0d88 100644 --- a/src/assets/minecraft/models/block/spruce_pressure_plate.json +++ b/src/assets/minecraft/models/block/spruce_pressure_plate.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_up", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/stripped_spruce_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_pressure_plate_down.json b/src/assets/minecraft/models/block/spruce_pressure_plate_down.json index a0fd51dc..630cebb4 100644 --- a/src/assets/minecraft/models/block/spruce_pressure_plate_down.json +++ b/src/assets/minecraft/models/block/spruce_pressure_plate_down.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_down", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/stripped_spruce_wood" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/spruce_trapdoor_bottom.json b/src/assets/minecraft/models/block/spruce_trapdoor_bottom.json index 2cfe5d3c..6c491fa0 100644 --- a/src/assets/minecraft/models/block/spruce_trapdoor_bottom.json +++ b/src/assets/minecraft/models/block/spruce_trapdoor_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_bottom", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/spruce_trapdoor", "side": "block/spruce_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/spruce_trapdoor_open.json b/src/assets/minecraft/models/block/spruce_trapdoor_open.json index 1e80719c..200f148a 100644 --- a/src/assets/minecraft/models/block/spruce_trapdoor_open.json +++ b/src/assets/minecraft/models/block/spruce_trapdoor_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_open", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/spruce_trapdoor", "side": "block/spruce_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/spruce_trapdoor_top.json b/src/assets/minecraft/models/block/spruce_trapdoor_top.json index fa458389..fc5bb8f9 100644 --- a/src/assets/minecraft/models/block/spruce_trapdoor_top.json +++ b/src/assets/minecraft/models/block/spruce_trapdoor_top.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_top", "textures": { + "particle": "block/stripped_spruce_wood_inventory", "texture": "block/spruce_trapdoor", "side": "block/spruce_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/spruce_wood.json b/src/assets/minecraft/models/block/spruce_wood.json index 9d71514a..b383e979 100644 --- a/src/assets/minecraft/models/block/spruce_wood.json +++ b/src/assets/minecraft/models/block/spruce_wood.json @@ -1,6 +1,7 @@ { "parent": "block/cube_column", "textures": { + "particle": "spruce_wood_inventory", "end": "block/spruce_wood", "side": "block/spruce_wood" } diff --git a/src/assets/minecraft/models/block/warped_button.json b/src/assets/minecraft/models/block/warped_button.json index ecfb3300..e00d6bc7 100644 --- a/src/assets/minecraft/models/block/warped_button.json +++ b/src/assets/minecraft/models/block/warped_button.json @@ -1,6 +1,7 @@ { "parent": "block/button", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/stripped_warped_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_button_pressed.json b/src/assets/minecraft/models/block/warped_button_pressed.json index ffd4fe5c..071cb765 100644 --- a/src/assets/minecraft/models/block/warped_button_pressed.json +++ b/src/assets/minecraft/models/block/warped_button_pressed.json @@ -1,6 +1,7 @@ { "parent": "block/button_pressed", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/stripped_warped_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_gate.json b/src/assets/minecraft/models/block/warped_fence_gate.json index e044497b..dc349f39 100644 --- a/src/assets/minecraft/models/block/warped_fence_gate.json +++ b/src/assets/minecraft/models/block/warped_fence_gate.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/stripped_warped_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_gate_open.json b/src/assets/minecraft/models/block/warped_fence_gate_open.json index 132882e9..29b6452f 100644 --- a/src/assets/minecraft/models/block/warped_fence_gate_open.json +++ b/src/assets/minecraft/models/block/warped_fence_gate_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_open", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/stripped_warped_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_gate_wall.json b/src/assets/minecraft/models/block/warped_fence_gate_wall.json index e7e1b937..e3d3dd11 100644 --- a/src/assets/minecraft/models/block/warped_fence_gate_wall.json +++ b/src/assets/minecraft/models/block/warped_fence_gate_wall.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/stripped_warped_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_gate_wall_open.json b/src/assets/minecraft/models/block/warped_fence_gate_wall_open.json index bb030cb1..f19614cd 100644 --- a/src/assets/minecraft/models/block/warped_fence_gate_wall_open.json +++ b/src/assets/minecraft/models/block/warped_fence_gate_wall_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_fence_gate_wall_open", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/stripped_warped_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_inventory.json b/src/assets/minecraft/models/block/warped_fence_inventory.json index d9009adc..358ff75c 100644 --- a/src/assets/minecraft/models/block/warped_fence_inventory.json +++ b/src/assets/minecraft/models/block/warped_fence_inventory.json @@ -1,6 +1,9 @@ { "parent": "block/fence_inventory", "textures": { - "texture": "block/stripped_warped_hyphae_inventory" + "particle": "block/stripped_warped_hyphae_inventory", + "post": "block/warped_fence_post_inventory", + "side": "block/warped_fence_side_inventory", + "log_end": "block/stripped_warped_stem_top_inventory" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_post.json b/src/assets/minecraft/models/block/warped_fence_post.json index de6d985e..dd0ec43b 100644 --- a/src/assets/minecraft/models/block/warped_fence_post.json +++ b/src/assets/minecraft/models/block/warped_fence_post.json @@ -1,6 +1,7 @@ { "parent": "block/fence_post", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "side": "block/warped_fence_post", "end": "block/warped_stem_top" } diff --git a/src/assets/minecraft/models/block/warped_fence_side_east.json b/src/assets/minecraft/models/block/warped_fence_side_east.json index cb8caedb..71d490ed 100644 --- a/src/assets/minecraft/models/block/warped_fence_side_east.json +++ b/src/assets/minecraft/models/block/warped_fence_side_east.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_east", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/warped_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_side_north.json b/src/assets/minecraft/models/block/warped_fence_side_north.json index d70eb3dc..9fb29342 100644 --- a/src/assets/minecraft/models/block/warped_fence_side_north.json +++ b/src/assets/minecraft/models/block/warped_fence_side_north.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_north", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/warped_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_side_south.json b/src/assets/minecraft/models/block/warped_fence_side_south.json index 096ca127..ee2502ae 100644 --- a/src/assets/minecraft/models/block/warped_fence_side_south.json +++ b/src/assets/minecraft/models/block/warped_fence_side_south.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_south", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/warped_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_fence_side_west.json b/src/assets/minecraft/models/block/warped_fence_side_west.json index fe18e2f2..490108d9 100644 --- a/src/assets/minecraft/models/block/warped_fence_side_west.json +++ b/src/assets/minecraft/models/block/warped_fence_side_west.json @@ -1,6 +1,7 @@ { "parent": "block/fence_side_west", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/warped_fence_side" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_hyphae.json b/src/assets/minecraft/models/block/warped_hyphae.json index f619bd31..34430715 100644 --- a/src/assets/minecraft/models/block/warped_hyphae.json +++ b/src/assets/minecraft/models/block/warped_hyphae.json @@ -1,6 +1,7 @@ { "parent": "block/cube_column", "textures": { + "particle": "block/warped_hyphae_inventory", "end": "block/warped_hyphae", "side": "block/warped_hyphae" } diff --git a/src/assets/minecraft/models/block/warped_nylium.json b/src/assets/minecraft/models/block/warped_nylium.json index 8031f5c7..c37363d9 100644 --- a/src/assets/minecraft/models/block/warped_nylium.json +++ b/src/assets/minecraft/models/block/warped_nylium.json @@ -1,7 +1,7 @@ { "parent": "block/cube_bottom_top", "textures": { - "particle": "block/netherrack", + "particle": "block/netherrack_inventory", "bottom": "block/netherrack", "top": "block/warped_nylium", "side": "block/netherrack", diff --git a/src/assets/minecraft/models/block/warped_pressure_plate.json b/src/assets/minecraft/models/block/warped_pressure_plate.json index f12d15dd..f3d0d6af 100644 --- a/src/assets/minecraft/models/block/warped_pressure_plate.json +++ b/src/assets/minecraft/models/block/warped_pressure_plate.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_up", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/stripped_warped_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_pressure_plate_down.json b/src/assets/minecraft/models/block/warped_pressure_plate_down.json index ffdd57cd..22db45a8 100644 --- a/src/assets/minecraft/models/block/warped_pressure_plate_down.json +++ b/src/assets/minecraft/models/block/warped_pressure_plate_down.json @@ -1,6 +1,7 @@ { "parent": "block/pressure_plate_down", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/stripped_warped_hyphae" } } \ No newline at end of file diff --git a/src/assets/minecraft/models/block/warped_trapdoor_bottom.json b/src/assets/minecraft/models/block/warped_trapdoor_bottom.json index 2032e179..7358b50f 100644 --- a/src/assets/minecraft/models/block/warped_trapdoor_bottom.json +++ b/src/assets/minecraft/models/block/warped_trapdoor_bottom.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_bottom", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/warped_trapdoor", "side": "block/warped_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/warped_trapdoor_open.json b/src/assets/minecraft/models/block/warped_trapdoor_open.json index 45ee3fc2..cb8935a0 100644 --- a/src/assets/minecraft/models/block/warped_trapdoor_open.json +++ b/src/assets/minecraft/models/block/warped_trapdoor_open.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_open", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/warped_trapdoor", "side": "block/warped_trapdoor_side" } diff --git a/src/assets/minecraft/models/block/warped_trapdoor_top.json b/src/assets/minecraft/models/block/warped_trapdoor_top.json index 684e7c77..09d3539e 100644 --- a/src/assets/minecraft/models/block/warped_trapdoor_top.json +++ b/src/assets/minecraft/models/block/warped_trapdoor_top.json @@ -1,6 +1,7 @@ { "parent": "block/template_orientable_trapdoor_top", "textures": { + "particle": "block/stripped_warped_hyphae_inventory", "texture": "block/warped_trapdoor", "side": "block/warped_trapdoor_side" } diff --git a/src/assets/minecraft/optifine/block.properties b/src/assets/minecraft/optifine/block.properties index d1df1db0..e5757d52 100644 --- a/src/assets/minecraft/optifine/block.properties +++ b/src/assets/minecraft/optifine/block.properties @@ -1,2 +1,3 @@ layer.cutout_mipped=oak_leaves dark_oak_leaves birch_leaves spruce_leaves acacia_leaves jungle_leaves -#layer.translucent=glass glass_pane +layer.translucent=glass_fluid_pipe +# layer.translucent=glass glass_pane diff --git a/src/assets/minecraft/optifine/ctm/blue_ice/bump.png b/src/assets/minecraft/optifine/ctm/blue_ice/bump.png new file mode 100644 index 00000000..4309f137 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/blue_ice/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/blue_ice/height.png b/src/assets/minecraft/optifine/ctm/blue_ice/height.png new file mode 100644 index 00000000..e3a60a2f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/blue_ice/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/blue_ice/mat.yml b/src/assets/minecraft/optifine/ctm/blue_ice/mat.yml new file mode 100644 index 00000000..3a9da47f --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/blue_ice/mat.yml @@ -0,0 +1,16 @@ +publish-item: true +color: + value: '#3D545F' +height: + shift: -0.1 + scale: 0.8 + edge-fade-x: 2 + edge-fade-y: 2 +occlusion: + z-bias: 0.2 +f0: + value: 0.017 +ctm: + method: of-repeat + width: 4 + height: 4 diff --git a/src/assets/minecraft/optifine/ctm/blue_ice/normal.png b/src/assets/minecraft/optifine/ctm/blue_ice/normal.png new file mode 100644 index 00000000..85f8ead2 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/blue_ice/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/blue_ice/occlusion.png b/src/assets/minecraft/optifine/ctm/blue_ice/occlusion.png new file mode 100644 index 00000000..424ba5ac Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/blue_ice/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/blue_ice/smooth.png b/src/assets/minecraft/optifine/ctm/blue_ice/smooth.png new file mode 100644 index 00000000..3baf8451 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/blue_ice/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/blue_ice/sss.png b/src/assets/minecraft/optifine/ctm/blue_ice/sss.png new file mode 100644 index 00000000..e4f253c9 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/blue_ice/sss.png differ diff --git a/src/assets/minecraft/textures/block/blue_ice/height.png b/src/assets/minecraft/optifine/ctm/blue_ice/v1.ignore/height.png similarity index 100% rename from src/assets/minecraft/textures/block/blue_ice/height.png rename to src/assets/minecraft/optifine/ctm/blue_ice/v1.ignore/height.png diff --git a/src/assets/minecraft/textures/block/blue_ice/mat.yml b/src/assets/minecraft/optifine/ctm/blue_ice/v1.ignore/mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/blue_ice/mat.yml rename to src/assets/minecraft/optifine/ctm/blue_ice/v1.ignore/mat.yml diff --git a/src/assets/minecraft/textures/block/blue_ice/occlusion.png b/src/assets/minecraft/optifine/ctm/blue_ice/v1.ignore/occlusion.png similarity index 100% rename from src/assets/minecraft/textures/block/blue_ice/occlusion.png rename to src/assets/minecraft/optifine/ctm/blue_ice/v1.ignore/occlusion.png diff --git a/src/assets/minecraft/optifine/ctm/bricks/bump.png b/src/assets/minecraft/optifine/ctm/bricks/bump.png index b152291a..e0da1dcf 100644 Binary files a/src/assets/minecraft/optifine/ctm/bricks/bump.png and b/src/assets/minecraft/optifine/ctm/bricks/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/color.png b/src/assets/minecraft/optifine/ctm/bricks/color.png index 77f55b82..1860054e 100644 Binary files a/src/assets/minecraft/optifine/ctm/bricks/color.png and b/src/assets/minecraft/optifine/ctm/bricks/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/color.xcf b/src/assets/minecraft/optifine/ctm/bricks/color.xcf new file mode 100644 index 00000000..e0cd83bb Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/height.png b/src/assets/minecraft/optifine/ctm/bricks/height.png index 0a32fcc3..6d2f8d1d 100644 Binary files a/src/assets/minecraft/optifine/ctm/bricks/height.png and b/src/assets/minecraft/optifine/ctm/bricks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/height.xcf b/src/assets/minecraft/optifine/ctm/bricks/height.xcf new file mode 100644 index 00000000..88b895e6 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/height.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/mat.yml b/src/assets/minecraft/optifine/ctm/bricks/mat.yml index 02a9746b..5174bc9e 100644 --- a/src/assets/minecraft/optifine/ctm/bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/bricks/mat.yml @@ -4,18 +4,22 @@ wrap-y: true color: bake-occlusion: false height: - scale: 0.08 + texture: bump.png + shift: -0.1 + scale: 0.8 edge-fade-x: 0.8 edge-fade-y: 0.4 edge-fade-strength: 0.8 normal: - noise: 3 + noise: 2 method: sobel-low + strength: 1.5 occlusion: step-distance: 0.2 - z-scale: 2 + z-bias: 0.4 + z-scale: 6 smooth: - scale: 0.3 + scale: 0.5 f0: value: 0.077 ctm: diff --git a/src/assets/minecraft/optifine/ctm/bricks/normal.png b/src/assets/minecraft/optifine/ctm/bricks/normal.png index 7f140bfa..6a2ec9f2 100644 Binary files a/src/assets/minecraft/optifine/ctm/bricks/normal.png and b/src/assets/minecraft/optifine/ctm/bricks/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/occlusion.png b/src/assets/minecraft/optifine/ctm/bricks/occlusion.png index 9c904506..f031d613 100644 Binary files a/src/assets/minecraft/optifine/ctm/bricks/occlusion.png and b/src/assets/minecraft/optifine/ctm/bricks/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/bump-x.png b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/bump-x.png new file mode 100644 index 00000000..b152291a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/bump-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/color.png b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/color.png new file mode 100644 index 00000000..75912c09 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/color.xcf b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/color.xcf new file mode 100644 index 00000000..03660237 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/height-x.png b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/height-x.png new file mode 100644 index 00000000..0a32fcc3 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/height-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/height.xcf b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/height.xcf new file mode 100644 index 00000000..868fab68 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/height.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/mat.yml new file mode 100644 index 00000000..382f10bb --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/mat.yml @@ -0,0 +1,26 @@ +publish-item: true +wrap-x: true +wrap-y: true +color: + bake-occlusion: false +height: + shift: -0.12 + scale: 0.3 + edge-fade-x: 0.8 + edge-fade-y: 0.4 + edge-fade-strength: 0.8 +normal: + noise: 3 + method: sobel-low +occlusion: + step-distance: 0.2 + z-scale: 2 +smooth: + scale: 0.3 +f0: + value: 0.077 +ctm: + method: of-repeat + width: 3 + height: 3 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/normal.png b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/normal.png new file mode 100644 index 00000000..7f140bfa Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/occlusion.png new file mode 100644 index 00000000..9c904506 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/porosity.png new file mode 100644 index 00000000..dcf220bf Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/smooth.png new file mode 100644 index 00000000..27a6bdfb Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v1.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/calcite/normal.png b/src/assets/minecraft/optifine/ctm/calcite/normal.png index 5f78bd09..4b3a935f 100644 Binary files a/src/assets/minecraft/optifine/ctm/calcite/normal.png and b/src/assets/minecraft/optifine/ctm/calcite/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/concrete/bump.png b/src/assets/minecraft/optifine/ctm/concrete/bump.png index 5f7daa4d..22d16b24 100644 Binary files a/src/assets/minecraft/optifine/ctm/concrete/bump.png and b/src/assets/minecraft/optifine/ctm/concrete/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/concrete/mat.yml b/src/assets/minecraft/optifine/ctm/concrete/mat.yml index e0ee4772..84c225b0 100644 --- a/src/assets/minecraft/optifine/ctm/concrete/mat.yml +++ b/src/assets/minecraft/optifine/ctm/concrete/mat.yml @@ -2,19 +2,20 @@ publish-item: true color: value: '#949494' height: - texture: bump.png - shift: -0.04 - scale: 0.06 + scale: 0.02 auto-level: true normal: - noise: 4 + noise: 2 method: sobel-high + strength: 1.4 occlusion: step-distance: 0.2 - z-bias: 2 - z-scale: 4 + z-bias: 1 + z-scale: 5 +smooth: + scale: 0.56 f0: - value: 0.072 + value: 0.191 ctm: method: of-repeat width: 4 diff --git a/src/assets/minecraft/optifine/ctm/concrete/normal-x.png b/src/assets/minecraft/optifine/ctm/concrete/normal-x.png new file mode 100644 index 00000000..5b72c3f8 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/concrete/normal-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/concrete/normal.png b/src/assets/minecraft/optifine/ctm/concrete/normal.png index 5b72c3f8..da07d2cb 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-x.png b/src/assets/minecraft/optifine/ctm/concrete/occlusion-x.png new file mode 100644 index 00000000..1b09b8fb Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/concrete/occlusion-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/concrete/occlusion.png b/src/assets/minecraft/optifine/ctm/concrete/occlusion.png index 1b09b8fb..75c6f53f 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/copper_block/mat.yml b/src/assets/minecraft/optifine/ctm/copper_block/mat.yml index 2aa7bff9..51b6e909 100644 --- a/src/assets/minecraft/optifine/ctm/copper_block/mat.yml +++ b/src/assets/minecraft/optifine/ctm/copper_block/mat.yml @@ -1,6 +1,6 @@ publish-item: true color: - value: '#D2B1A1' + value: '#CEA591' height: scale: 0.16 edge-fade-x: 3 @@ -10,7 +10,7 @@ occlusion: z-bias: 1 z-scale: 24 smooth: - value: 0.9 + value: 0.7504 hcm: value: 234 ctm: diff --git a/src/assets/minecraft/optifine/ctm/cracked_polished_blackstone_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/cracked_polished_blackstone_bricks/mat.yml index 7e19112e..60fa3654 100644 --- a/src/assets/minecraft/optifine/ctm/cracked_polished_blackstone_bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/cracked_polished_blackstone_bricks/mat.yml @@ -4,7 +4,7 @@ height: scale: 0.4 normal: noise: 3 - method: sobel-high + method: sobel-low strength: 3 occlusion: step-distance: 0.15 diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/color.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/color.png new file mode 100644 index 00000000..07c8250c Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/height.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/height.png new file mode 100644 index 00000000..cc2b0e68 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/height.xcf b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/height.xcf new file mode 100644 index 00000000..32b32c15 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/height.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/mat.yml new file mode 100644 index 00000000..a2aaf7bb --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/mat.yml @@ -0,0 +1,22 @@ +publish-item: true +height: + shift: -0.2013 + scale: 0.26 + edge-fade-x: 0.5 + edge-fade-y: 0.5 + edge-fade-strength: 0.5 +normal: + noise: 2 + method: sobel-low + strength: 1.4128 +occlusion: + step-distance: 0.2 + z-bias: 0.4 + z-scale: 3 +f0: + value: 0.05 +ctm: + method: of-repeat + width: 4 + height: 4 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/normal.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/normal.png new file mode 100644 index 00000000..f0feb3a6 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/occlusion.png new file mode 100644 index 00000000..e93df8fc Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/porosity.png new file mode 100644 index 00000000..d8c80651 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/smooth.png new file mode 100644 index 00000000..dc1fe382 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/cobblestone.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/color.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/color.png index 69fcce12..f436f1e9 100644 Binary files a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/color.png and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/color.xcf b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/color.xcf new file mode 100644 index 00000000..3741ecee Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/height.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/height.png index feb84654..b5e94067 100644 Binary files a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/height.png and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/height.xcf b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/height.xcf new file mode 100644 index 00000000..78970834 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/height.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/mat.yml index 01e66529..9992c59d 100644 --- a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/mat.yml @@ -1,22 +1,19 @@ publish-item: true height: - shift: -0.12 + shift: -0.2013 + scale: 0.26 edge-fade-x: 0.5 edge-fade-y: 0.5 edge-fade-strength: 0.5 normal: - noise: 7 - method: sobel-high - strength: 3 + noise: 2 + method: sobel3 occlusion: - step-distance: 0.15 - z-bias: 0 + step-distance: 0.2 + z-bias: 1 z-scale: 10 f0: - value: 0.03 -porosity: - shift: 0.2 - scale: 0.8 + value: 0.05 ctm: method: of-repeat width: 4 diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/normal.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/normal.png index f55e7f76..facf95f2 100644 Binary files a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/normal.png and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/occlusion.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/occlusion.png index e036481b..2389ba43 100644 Binary files a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/occlusion.png and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/porosity.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/porosity.png index 683ae422..d8c80651 100644 Binary files a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/porosity.png and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/smooth.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/smooth.png index 2fe8772d..dc1fe382 100644 Binary files a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/smooth.png and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/color.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/color.png new file mode 100644 index 00000000..69fcce12 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/height.png new file mode 100644 index 00000000..feb84654 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/mat.yml new file mode 100644 index 00000000..01e66529 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/mat.yml @@ -0,0 +1,24 @@ +publish-item: true +height: + shift: -0.12 + edge-fade-x: 0.5 + edge-fade-y: 0.5 + edge-fade-strength: 0.5 +normal: + noise: 7 + method: sobel-high + strength: 3 +occlusion: + step-distance: 0.15 + z-bias: 0 + z-scale: 10 +f0: + value: 0.03 +porosity: + shift: 0.2 + scale: 0.8 +ctm: + method: of-repeat + width: 4 + height: 4 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/normal.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/normal.png new file mode 100644 index 00000000..f55e7f76 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/occlusion.png new file mode 100644 index 00000000..e036481b Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/porosity.png new file mode 100644 index 00000000..683ae422 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/smooth.png new file mode 100644 index 00000000..2fe8772d Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v1.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/color.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/color.png new file mode 100644 index 00000000..d79e8b92 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/color.xcf b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/color.xcf new file mode 100644 index 00000000..2aed3353 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height.png new file mode 100644 index 00000000..90f6a55f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height.xcf b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height.xcf new file mode 100644 index 00000000..9c6c3d17 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height2.xcf b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height2.xcf new file mode 100644 index 00000000..0495a71a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/height2.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/mat.yml new file mode 100644 index 00000000..6fae159f --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/mat.yml @@ -0,0 +1,22 @@ +publish-item: true +height: + shift: -0.2013 + scale: 0.26 + edge-fade-x: 0.5 + edge-fade-y: 0.5 + edge-fade-strength: 0.5 +normal: + noise: 2 + method: sobel3 + strength: 1.4128 +occlusion: + step-distance: 0.2 + z-bias: 0.4 + z-scale: 3 +f0: + value: 0.05 +ctm: + method: of-repeat + width: 4 + height: 4 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/normal.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/normal.png new file mode 100644 index 00000000..e902c041 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/occlusion.png new file mode 100644 index 00000000..b1fcf04b Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/porosity.png new file mode 100644 index 00000000..d8c80651 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/smooth.png new file mode 100644 index 00000000..dc1fe382 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/cracked_stone_bricks/v2.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/ice/alpha.png b/src/assets/minecraft/optifine/ctm/ice/opacity.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/ice/alpha.png rename to src/assets/minecraft/optifine/ctm/ice/opacity.png diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/color.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/color.png index 60dcf3b8..97bb8fb0 100644 Binary files a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/color.png and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/color.xcf b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/color.xcf index 63778fda..d7343830 100644 Binary files a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/color.xcf and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/height.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/height.png index fb456f65..32736a2a 100644 Binary files a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/height.png and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/height.xcf b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/height.xcf new file mode 100644 index 00000000..e8e0bc42 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/height.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/mat.yml index a36a888b..5312c6ab 100644 --- a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/mat.yml @@ -1,25 +1,19 @@ publish-item: true height: - shift: -0.06 - scale: 0.4 + shift: -0.2013 + scale: 0.26 edge-fade-x: 0.5 edge-fade-y: 0.5 edge-fade-strength: 0.5 normal: - noise: 7 - method: sobel-low - strength: 3 + noise: 2 + method: sobel3 occlusion: - step-distance: 0.15 - z-bias: 0 - z-scale: 6 + step-distance: 0.4 + z-bias: 1 + z-scale: 10 f0: - value: 0.03 -porosity: - shift: 0.2 - scale: 0.8 -sss: - scale: 0.5 + value: 0.05 ctm: method: of-repeat width: 4 diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/normal.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/normal.png index d6c01f0a..873f1bbd 100644 Binary files a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/normal.png and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/occlusion.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/occlusion.png index 47ab69df..a26eee42 100644 Binary files a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/occlusion.png and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/porosity.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/porosity.png index cc0d24b3..d8c80651 100644 Binary files a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/porosity.png and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/smooth.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/smooth.png index a1a76b42..aa5cb279 100644 Binary files a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/smooth.png and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/color.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/color.png new file mode 100644 index 00000000..60dcf3b8 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/color.xcf b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/color.xcf new file mode 100644 index 00000000..63778fda Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/height.png new file mode 100644 index 00000000..fb456f65 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/mat.yml new file mode 100644 index 00000000..a36a888b --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/mat.yml @@ -0,0 +1,27 @@ +publish-item: true +height: + shift: -0.06 + scale: 0.4 + edge-fade-x: 0.5 + edge-fade-y: 0.5 + edge-fade-strength: 0.5 +normal: + noise: 7 + method: sobel-low + strength: 3 +occlusion: + step-distance: 0.15 + z-bias: 0 + z-scale: 6 +f0: + value: 0.03 +porosity: + shift: 0.2 + scale: 0.8 +sss: + scale: 0.5 +ctm: + method: of-repeat + width: 4 + height: 4 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/normal.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/normal.png new file mode 100644 index 00000000..d6c01f0a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/occlusion.png new file mode 100644 index 00000000..47ab69df Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/porosity.png new file mode 100644 index 00000000..cc0d24b3 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/smooth.png new file mode 100644 index 00000000..a1a76b42 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/sss.png b/src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/sss.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/mossy_stone_bricks/sss.png rename to src/assets/minecraft/optifine/ctm/mossy_stone_bricks/v1.ignore/sss.png diff --git a/src/assets/minecraft/optifine/ctm/obsidian/color.png b/src/assets/minecraft/optifine/ctm/obsidian/color.png new file mode 100644 index 00000000..98f91700 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/obsidian/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/obsidian/mat.yml b/src/assets/minecraft/optifine/ctm/obsidian/mat.yml index a7455109..32d5a4ff 100644 --- a/src/assets/minecraft/optifine/ctm/obsidian/mat.yml +++ b/src/assets/minecraft/optifine/ctm/obsidian/mat.yml @@ -1,19 +1,20 @@ publish-item: true -color: - value: '#1B1825' height: - scale: 0.5 - edge-fade-x: 2 - edge-fade-y: 2 + scale: 0.3 + edge-fade-x: 4 + edge-fade-y: 4 normal: - noise: 6 + noise: 2 occlusion: step-distance: 0.1 z-scale: 20 +smooth: + shift: -0.1032 f0: value: 0.047 sss: - shift: 0.4 + shift: -0.0413 + scale: 2 ctm: method: of-repeat width: 8 diff --git a/src/assets/minecraft/optifine/ctm/obsidian/smooth.png b/src/assets/minecraft/optifine/ctm/obsidian/smooth.png index 552b27cf..e8868daa 100644 Binary files a/src/assets/minecraft/optifine/ctm/obsidian/smooth.png and b/src/assets/minecraft/optifine/ctm/obsidian/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/bump.png b/src/assets/minecraft/optifine/ctm/packed_ice/bump.png new file mode 100644 index 00000000..5bff8eef Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/packed_ice/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/color.png b/src/assets/minecraft/optifine/ctm/packed_ice/color.png new file mode 100644 index 00000000..574ef212 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/packed_ice/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/height.png b/src/assets/minecraft/optifine/ctm/packed_ice/height.png index f6a0cea2..48c26ef4 100644 Binary files a/src/assets/minecraft/optifine/ctm/packed_ice/height.png and b/src/assets/minecraft/optifine/ctm/packed_ice/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/mat.yml b/src/assets/minecraft/optifine/ctm/packed_ice/mat.yml index a5046eed..7db6d01a 100644 --- a/src/assets/minecraft/optifine/ctm/packed_ice/mat.yml +++ b/src/assets/minecraft/optifine/ctm/packed_ice/mat.yml @@ -1,29 +1,12 @@ publish-item: true -color: - value: '#7D9DC4' height: - shift: -0.01 - scale: 0.3 - edge-fade-x: 3 - edge-fade-y: 3 -normal: - noise: 1 - method: sobel-high - strength: 2 -occlusion: - scale: 0.5 - step-distance: 0.15 - z-bias: 1 - z-scale: 6 -smooth: - scale: 0.8 + scale: 0.6 + auto-level: false + edge-fade-x: 2 + edge-fade-y: 2 f0: - value: 0.08 -sss: - shift: 0.3 - scale: 0.7 + value: 0.017 ctm: method: of-repeat width: 8 height: 8 - placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/normal.png b/src/assets/minecraft/optifine/ctm/packed_ice/normal.png new file mode 100644 index 00000000..f50d1a11 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/packed_ice/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/occlusion.png b/src/assets/minecraft/optifine/ctm/packed_ice/occlusion.png index a20cd993..60cf0cbb 100644 Binary files a/src/assets/minecraft/optifine/ctm/packed_ice/occlusion.png and b/src/assets/minecraft/optifine/ctm/packed_ice/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/smooth.png b/src/assets/minecraft/optifine/ctm/packed_ice/smooth.png index 1ed667dd..c9a79292 100644 Binary files a/src/assets/minecraft/optifine/ctm/packed_ice/smooth.png and b/src/assets/minecraft/optifine/ctm/packed_ice/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/sss.png b/src/assets/minecraft/optifine/ctm/packed_ice/sss.png index 9d71194c..e2212be9 100644 Binary files a/src/assets/minecraft/optifine/ctm/packed_ice/sss.png and b/src/assets/minecraft/optifine/ctm/packed_ice/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/height.png new file mode 100644 index 00000000..f6a0cea2 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/mat.yml new file mode 100644 index 00000000..a5046eed --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/mat.yml @@ -0,0 +1,29 @@ +publish-item: true +color: + value: '#7D9DC4' +height: + shift: -0.01 + scale: 0.3 + edge-fade-x: 3 + edge-fade-y: 3 +normal: + noise: 1 + method: sobel-high + strength: 2 +occlusion: + scale: 0.5 + step-distance: 0.15 + z-bias: 1 + z-scale: 6 +smooth: + scale: 0.8 +f0: + value: 0.08 +sss: + shift: 0.3 + scale: 0.7 +ctm: + method: of-repeat + width: 8 + height: 8 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/occlusion.png new file mode 100644 index 00000000..a20cd993 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/smooth.png new file mode 100644 index 00000000..1ed667dd Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/sss.png b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/sss.png new file mode 100644 index 00000000..9d71194c Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/packed_ice/v1.ignore/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/color.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/color.png index 50bbccce..83062587 100644 Binary files a/src/assets/minecraft/optifine/ctm/prismarine_bricks/color.png and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/height.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/height.png index feccb98b..9d09dd57 100644 Binary files a/src/assets/minecraft/optifine/ctm/prismarine_bricks/height.png and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/prismarine_bricks/mat.yml index 74ff8e54..55d767e5 100644 --- a/src/assets/minecraft/optifine/ctm/prismarine_bricks/mat.yml +++ b/src/assets/minecraft/optifine/ctm/prismarine_bricks/mat.yml @@ -1,25 +1,25 @@ publish-item: true height: - shift: -0.04 - scale: 0.26 + shift: -0.4729 + scale: 0.5 edge-fade-x: 0.5 edge-fade-y: 0.5 - edge-fade-strength: 0.6 + edge-fade-strength: 0.5 normal: - noise: 7 - method: sobel-low - strength: 3 + method: sobel3 + strength: 1 occlusion: - step-distance: 0.15 - z-bias: 0 - z-scale: 6 + step-distance: 0.2 + z-bias: 0.2 + z-scale: 3 +smooth: + shift: -0.0413 + scale: 1.7019 f0: - value: 0.051 + value: 0.16 porosity: shift: 0.2 scale: 0.8 -sss: - scale: 0.6 ctm: method: of-repeat width: 4 diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/normal.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/normal.png new file mode 100644 index 00000000..e335121c Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/occlusion.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/occlusion.png new file mode 100644 index 00000000..d3959ef0 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/porosity.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/porosity.png index f9cb75d8..8b9a045a 100644 Binary files a/src/assets/minecraft/optifine/ctm/prismarine_bricks/porosity.png and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/smooth.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/smooth.png index a5ac9473..810c31e2 100644 Binary files a/src/assets/minecraft/optifine/ctm/prismarine_bricks/smooth.png and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/sss.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/sss.png index 9c86ec33..77f0156c 100644 Binary files a/src/assets/minecraft/optifine/ctm/prismarine_bricks/sss.png and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/color.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/color.png new file mode 100644 index 00000000..50bbccce Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/height.png new file mode 100644 index 00000000..feccb98b Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/height2.xcf b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/height2.xcf similarity index 100% rename from src/assets/minecraft/optifine/ctm/prismarine_bricks/height2.xcf rename to src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/height2.xcf diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/mat.yml new file mode 100644 index 00000000..74ff8e54 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/mat.yml @@ -0,0 +1,27 @@ +publish-item: true +height: + shift: -0.04 + scale: 0.26 + edge-fade-x: 0.5 + edge-fade-y: 0.5 + edge-fade-strength: 0.6 +normal: + noise: 7 + method: sobel-low + strength: 3 +occlusion: + step-distance: 0.15 + z-bias: 0 + z-scale: 6 +f0: + value: 0.051 +porosity: + shift: 0.2 + scale: 0.8 +sss: + scale: 0.6 +ctm: + method: of-repeat + width: 4 + height: 4 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/porosity.png new file mode 100644 index 00000000..f9cb75d8 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/smooth.png new file mode 100644 index 00000000..810c31e2 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/sss.png b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/sss.png new file mode 100644 index 00000000..9c86ec33 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/prismarine_bricks/v1.ignore/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/snow/mat.yml b/src/assets/minecraft/optifine/ctm/snow/mat.yml index ed413a3b..f2d8b935 100644 --- a/src/assets/minecraft/optifine/ctm/snow/mat.yml +++ b/src/assets/minecraft/optifine/ctm/snow/mat.yml @@ -4,10 +4,10 @@ opacity: color: value: '#C6DDEC' height: - shift: -0.1 - scale: 0.4 - edge-fade-x: 2 - edge-fade-y: 2 + shift: -0.1620 + scale: 0.3 + edge-fade-x: 3 + edge-fade-y: 3 normal: noise: 16 method: sobel9 @@ -21,8 +21,7 @@ smooth: f0: value: 0.02 sss: - shift: 0.3 - scale: 0.72 + scale: 0.6 ctm: method: of-repeat width: 8 diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/color.png b/src/assets/minecraft/optifine/ctm/stone_bricks/color.png new file mode 100644 index 00000000..26d2b12e Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/color.xcf b/src/assets/minecraft/optifine/ctm/stone_bricks/color.xcf new file mode 100644 index 00000000..d7343830 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/height.png b/src/assets/minecraft/optifine/ctm/stone_bricks/height.png index 629d4c46..cd4d6111 100644 Binary files a/src/assets/minecraft/optifine/ctm/stone_bricks/height.png and b/src/assets/minecraft/optifine/ctm/stone_bricks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/height.xcf b/src/assets/minecraft/optifine/ctm/stone_bricks/height.xcf new file mode 100644 index 00000000..e8e0bc42 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/height.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/stone_bricks/mat.yml new file mode 100644 index 00000000..9992c59d --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/stone_bricks/mat.yml @@ -0,0 +1,21 @@ +publish-item: true +height: + shift: -0.2013 + scale: 0.26 + edge-fade-x: 0.5 + edge-fade-y: 0.5 + edge-fade-strength: 0.5 +normal: + noise: 2 + method: sobel3 +occlusion: + step-distance: 0.2 + z-bias: 1 + z-scale: 10 +f0: + value: 0.05 +ctm: + method: of-repeat + width: 4 + height: 4 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/normal.png b/src/assets/minecraft/optifine/ctm/stone_bricks/normal.png new file mode 100644 index 00000000..6c41de95 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/occlusion.png b/src/assets/minecraft/optifine/ctm/stone_bricks/occlusion.png new file mode 100644 index 00000000..d2b89d7e Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/porosity.png b/src/assets/minecraft/optifine/ctm/stone_bricks/porosity.png new file mode 100644 index 00000000..d8c80651 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/smooth.png b/src/assets/minecraft/optifine/ctm/stone_bricks/smooth.png new file mode 100644 index 00000000..dc1fe382 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/mat.yml index b75206a2..66648df0 100644 --- a/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/mat.yml +++ b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/mat.yml @@ -1,6 +1,5 @@ publish-item: true height: - texture: bump.png shift: -0.06 scale: 0.3 edge-fade-x: 0.5 diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/color.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/color.png new file mode 100644 index 00000000..db0ef4ac Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/height.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/height.png new file mode 100644 index 00000000..9cf37727 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/height.xcf b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/height.xcf new file mode 100644 index 00000000..c30b6696 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/height.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/mat.yml new file mode 100644 index 00000000..a2aaf7bb --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/mat.yml @@ -0,0 +1,22 @@ +publish-item: true +height: + shift: -0.2013 + scale: 0.26 + edge-fade-x: 0.5 + edge-fade-y: 0.5 + edge-fade-strength: 0.5 +normal: + noise: 2 + method: sobel-low + strength: 1.4128 +occlusion: + step-distance: 0.2 + z-bias: 0.4 + z-scale: 3 +f0: + value: 0.05 +ctm: + method: of-repeat + width: 4 + height: 4 + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/normal.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/normal.png new file mode 100644 index 00000000..a02b6559 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/occlusion.png new file mode 100644 index 00000000..0cc2c406 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/porosity.png new file mode 100644 index 00000000..d8c80651 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/smooth.png new file mode 100644 index 00000000..dc1fe382 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/v2.ignore/smooth.png differ diff --git a/src/assets/minecraft/textures/block/acacia_door/mat.yml b/src/assets/minecraft/textures/block/acacia_door/mat.yml index a67f46df..54406806 100644 --- a/src/assets/minecraft/textures/block/acacia_door/mat.yml +++ b/src/assets/minecraft/textures/block/acacia_door/mat.yml @@ -2,7 +2,7 @@ height: scale: 0.4 normal: strength: 0.5 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 3 diff --git a/src/assets/minecraft/textures/block/acacia_fence_post/mat.yml b/src/assets/minecraft/textures/block/acacia_fence_post/mat.yml index c5c9f5ca..a75c64c3 100644 --- a/src/assets/minecraft/textures/block/acacia_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/acacia_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: acacia_fence_post height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: north width: 0.25 diff --git a/src/assets/minecraft/textures/block/acacia_fence_side/mat.yml b/src/assets/minecraft/textures/block/acacia_fence_side/mat.yml index af765e6c..09ee5885 100644 --- a/src/assets/minecraft/textures/block/acacia_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/acacia_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: acacia_fence_side_north height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: up width: 0.125 diff --git a/src/assets/minecraft/textures/block/acacia_trapdoor_side/mat.yml b/src/assets/minecraft/textures/block/acacia_trapdoor_side/mat.yml index 6281bc74..ed85c723 100644 --- a/src/assets/minecraft/textures/block/acacia_trapdoor_side/mat.yml +++ b/src/assets/minecraft/textures/block/acacia_trapdoor_side/mat.yml @@ -1,12 +1,10 @@ publish-item: true -model-type: file -model-file: acacia_trapdoor_top +model: acacia_trapdoor_top +blend-mode: cutout opacity: value: 255 color: - value-red: 173 - value-green: 93 - value-blue: 50 + value: '#AD5D32' occlusion: value: 0 smooth: diff --git a/src/assets/minecraft/textures/block/allium/bump.png b/src/assets/minecraft/textures/block/allium/bump.png new file mode 100644 index 00000000..8866afe1 Binary files /dev/null and b/src/assets/minecraft/textures/block/allium/bump.png differ diff --git a/src/assets/minecraft/textures/block/allium/albedo.png b/src/assets/minecraft/textures/block/allium/color.png similarity index 100% rename from src/assets/minecraft/textures/block/allium/albedo.png rename to src/assets/minecraft/textures/block/allium/color.png diff --git a/src/assets/minecraft/textures/block/allium/height.png b/src/assets/minecraft/textures/block/allium/height.png index 8866afe1..e4c43a2f 100644 Binary files a/src/assets/minecraft/textures/block/allium/height.png and b/src/assets/minecraft/textures/block/allium/height.png differ diff --git a/src/assets/minecraft/textures/block/allium/mat.yml b/src/assets/minecraft/textures/block/allium/mat.yml index fa532b35..dcabe38d 100644 --- a/src/assets/minecraft/textures/block/allium/mat.yml +++ b/src/assets/minecraft/textures/block/allium/mat.yml @@ -1,7 +1,7 @@ publish-item: true wrap-y: false height: - value: 0 + scale: 0.1 normal: method: sobel3 occlusion: diff --git a/src/assets/minecraft/textures/block/allium/alpha.png b/src/assets/minecraft/textures/block/allium/opacity.png similarity index 100% rename from src/assets/minecraft/textures/block/allium/alpha.png rename to src/assets/minecraft/textures/block/allium/opacity.png diff --git a/src/assets/minecraft/textures/block/barrel_top/mat.yml b/src/assets/minecraft/textures/block/barrel_top/mat.yml index 3ca5e336..e03f004d 100644 --- a/src/assets/minecraft/textures/block/barrel_top/mat.yml +++ b/src/assets/minecraft/textures/block/barrel_top/mat.yml @@ -17,4 +17,3 @@ occlusion: step-distance: 0.1 z-bias: 0.6 z-scale: 6 -ctm: {} diff --git a/src/assets/minecraft/textures/block/beehive_end/mat.yml b/src/assets/minecraft/textures/block/beehive_end/mat.yml index 06897cd8..963f8696 100644 --- a/src/assets/minecraft/textures/block/beehive_end/mat.yml +++ b/src/assets/minecraft/textures/block/beehive_end/mat.yml @@ -10,7 +10,7 @@ height: edge-fade-y: 0.2 normal: strength: 0.5 - filter: sobel-high + method: sobel-high occlusion: z-bias: 1 z-scale: 2 diff --git a/src/assets/minecraft/textures/block/beehive_front/mat.yml b/src/assets/minecraft/textures/block/beehive_front/mat.yml index 691e52ad..71dda7c4 100644 --- a/src/assets/minecraft/textures/block/beehive_front/mat.yml +++ b/src/assets/minecraft/textures/block/beehive_front/mat.yml @@ -1,17 +1,12 @@ -alpha: - value: 255 -albedo: {} height: edge-fade-x: 0.2 edge-fade-y: 0.2 normal: - filter: sobel-high + method: sobel-high occlusion: z-bias: 1 z-scale: 5 step-distance: 0.2 -smooth: {} -f0: {} porosity: value: 0.8 create-inventory: true diff --git a/src/assets/minecraft/textures/block/beehive_front_honey/mat.yml b/src/assets/minecraft/textures/block/beehive_front_honey/mat.yml index 691e52ad..71dda7c4 100644 --- a/src/assets/minecraft/textures/block/beehive_front_honey/mat.yml +++ b/src/assets/minecraft/textures/block/beehive_front_honey/mat.yml @@ -1,17 +1,12 @@ -alpha: - value: 255 -albedo: {} height: edge-fade-x: 0.2 edge-fade-y: 0.2 normal: - filter: sobel-high + method: sobel-high occlusion: z-bias: 1 z-scale: 5 step-distance: 0.2 -smooth: {} -f0: {} porosity: value: 0.8 create-inventory: true diff --git a/src/assets/minecraft/textures/block/beehive_side/mat.yml b/src/assets/minecraft/textures/block/beehive_side/mat.yml index 691e52ad..71dda7c4 100644 --- a/src/assets/minecraft/textures/block/beehive_side/mat.yml +++ b/src/assets/minecraft/textures/block/beehive_side/mat.yml @@ -1,17 +1,12 @@ -alpha: - value: 255 -albedo: {} height: edge-fade-x: 0.2 edge-fade-y: 0.2 normal: - filter: sobel-high + method: sobel-high occlusion: z-bias: 1 z-scale: 5 step-distance: 0.2 -smooth: {} -f0: {} porosity: value: 0.8 create-inventory: true diff --git a/src/assets/minecraft/textures/block/birch_fence_post/mat.yml b/src/assets/minecraft/textures/block/birch_fence_post/mat.yml index faf25031..ed6ee455 100644 --- a/src/assets/minecraft/textures/block/birch_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/birch_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: birch_fence_post height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: north width: 0.25 diff --git a/src/assets/minecraft/textures/block/birch_fence_side/mat.yml b/src/assets/minecraft/textures/block/birch_fence_side/mat.yml index 1b7ac785..6db169b4 100644 --- a/src/assets/minecraft/textures/block/birch_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/birch_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: birch_fence_side_north height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: up width: 0.125 diff --git a/src/assets/minecraft/textures/block/blackstone_top/mat.yml b/src/assets/minecraft/textures/block/blackstone_top/mat.yml index f73ff1e9..5b636a36 100644 --- a/src/assets/minecraft/textures/block/blackstone_top/mat.yml +++ b/src/assets/minecraft/textures/block/blackstone_top/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 35 value-green: 32 @@ -9,7 +7,7 @@ height: normal: strength: 0.8 noise: 4 - filter: sobel3 + method: sobel3 occlusion: z-bias: 0 z-scale: 5 diff --git a/src/assets/minecraft/textures/block/campfire_fire/mat.yml b/src/assets/minecraft/textures/block/campfire_fire/mat.yml index 2a34d8b6..8d2e3d39 100644 --- a/src/assets/minecraft/textures/block/campfire_fire/mat.yml +++ b/src/assets/minecraft/textures/block/campfire_fire/mat.yml @@ -1,6 +1,5 @@ wrap-x: false wrap-y: false -model-type: cross height: value: 0 occlusion: diff --git a/src/assets/minecraft/textures/block/chain_command_block_back/mat.yml b/src/assets/minecraft/textures/block/chain_command_block_back/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/chain_command_block_back/mat.yml +++ b/src/assets/minecraft/textures/block/chain_command_block_back/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/chain_command_block_front/mat.yml b/src/assets/minecraft/textures/block/chain_command_block_front/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/chain_command_block_front/mat.yml +++ b/src/assets/minecraft/textures/block/chain_command_block_front/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/chain_command_block_side/mat.yml b/src/assets/minecraft/textures/block/chain_command_block_side/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/chain_command_block_side/mat.yml +++ b/src/assets/minecraft/textures/block/chain_command_block_side/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/chiseled_nether_bricks/mat.yml b/src/assets/minecraft/textures/block/chiseled_nether_bricks/mat.yml index 8312b696..d5687a11 100644 --- a/src/assets/minecraft/textures/block/chiseled_nether_bricks/mat.yml +++ b/src/assets/minecraft/textures/block/chiseled_nether_bricks/mat.yml @@ -1,16 +1,13 @@ -alpha: - value: 255 height: scale: 0.3 normal: strength: 0.5 noise: 2 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 6 step-distance: 0.2 -smooth: {} f0: value: 0.05 porosity: diff --git a/src/assets/minecraft/textures/block/chiseled_stone_bricks/mat.yml b/src/assets/minecraft/textures/block/chiseled_stone_bricks/mat.yml index 1d69c190..6432ac92 100644 --- a/src/assets/minecraft/textures/block/chiseled_stone_bricks/mat.yml +++ b/src/assets/minecraft/textures/block/chiseled_stone_bricks/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 116 value-green: 115 @@ -9,13 +7,11 @@ height: normal: strength: 1.6 noise: 4 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 6 step-distance: 0.15 -smooth: {} f0: value: 0.07 -porosity: {} create-inventory: true diff --git a/src/assets/minecraft/textures/block/command_block_back/mat.yml b/src/assets/minecraft/textures/block/command_block_back/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/command_block_back/mat.yml +++ b/src/assets/minecraft/textures/block/command_block_back/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/command_block_conditional/color.png b/src/assets/minecraft/textures/block/command_block_conditional/color.png new file mode 100644 index 00000000..630744e8 Binary files /dev/null and b/src/assets/minecraft/textures/block/command_block_conditional/color.png differ diff --git a/src/assets/minecraft/textures/block/command_block_conditional/command_block_conditional.png b/src/assets/minecraft/textures/block/command_block_conditional/command_block_conditional.png deleted file mode 100644 index 5334c1f3..00000000 Binary files a/src/assets/minecraft/textures/block/command_block_conditional/command_block_conditional.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/command_block_conditional/emissive.png b/src/assets/minecraft/textures/block/command_block_conditional/emissive.png new file mode 100644 index 00000000..af4d5250 Binary files /dev/null and b/src/assets/minecraft/textures/block/command_block_conditional/emissive.png differ diff --git a/src/assets/minecraft/textures/block/command_block_conditional/hcm.png b/src/assets/minecraft/textures/block/command_block_conditional/hcm.png new file mode 100644 index 00000000..6fb64639 Binary files /dev/null and b/src/assets/minecraft/textures/block/command_block_conditional/hcm.png differ diff --git a/src/assets/minecraft/textures/block/command_block_conditional/height.png b/src/assets/minecraft/textures/block/command_block_conditional/height.png new file mode 100644 index 00000000..4c1144a1 Binary files /dev/null and b/src/assets/minecraft/textures/block/command_block_conditional/height.png differ diff --git a/src/assets/minecraft/textures/block/command_block_conditional/mat.yml b/src/assets/minecraft/textures/block/command_block_conditional/mat.yml index c034bfd3..094fc7b4 100644 --- a/src/assets/minecraft/textures/block/command_block_conditional/mat.yml +++ b/src/assets/minecraft/textures/block/command_block_conditional/mat.yml @@ -1 +1,16 @@ publish-item: true +height: + scale: 0.4 +normal: + curve-x: 90 + curve-y: 90 + radius-x: 0.1 + radius-y: 0.1 + method: sobel-low + strength: 1.5 +occlusion: + z-bias: 1 +f0: + value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/command_block_conditional/occlusion.png b/src/assets/minecraft/textures/block/command_block_conditional/occlusion.png new file mode 100644 index 00000000..d21e9a88 Binary files /dev/null and b/src/assets/minecraft/textures/block/command_block_conditional/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/command_block_conditional/smooth.png b/src/assets/minecraft/textures/block/command_block_conditional/smooth.png new file mode 100644 index 00000000..79eddea7 Binary files /dev/null and b/src/assets/minecraft/textures/block/command_block_conditional/smooth.png differ diff --git a/src/assets/minecraft/textures/block/command_block_front/mat.yml b/src/assets/minecraft/textures/block/command_block_front/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/command_block_front/mat.yml +++ b/src/assets/minecraft/textures/block/command_block_front/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/command_block_side/mat.yml b/src/assets/minecraft/textures/block/command_block_side/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/command_block_side/mat.yml +++ b/src/assets/minecraft/textures/block/command_block_side/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/comparator/mat.yml b/src/assets/minecraft/textures/block/comparator/mat.yml index 4dba3464..e953e24b 100644 --- a/src/assets/minecraft/textures/block/comparator/mat.yml +++ b/src/assets/minecraft/textures/block/comparator/mat.yml @@ -1,15 +1,11 @@ -alpha: - value: 255 height: scale: 0.3 edge-fade-x: 1 edge-fade-y: 1 normal: strength: 0.4 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 2 step-distance: 0.2 -smooth: {} -f0: {} diff --git a/src/assets/minecraft/textures/block/cracked_nether_bricks.ignore/mat.yml b/src/assets/minecraft/textures/block/cracked_nether_bricks.ignore/mat.yml index 8fe6d9cc..11c936cc 100644 --- a/src/assets/minecraft/textures/block/cracked_nether_bricks.ignore/mat.yml +++ b/src/assets/minecraft/textures/block/cracked_nether_bricks.ignore/mat.yml @@ -1,17 +1,13 @@ -alpha: - value: 255 height: scale: 0.3 normal: strength: 0.5 noise: 2 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 3 step-distance: 0.2 -smooth: {} -f0: {} porosity: value: 0.6 create-inventory: true diff --git a/src/assets/minecraft/textures/block/cracked_polished_blackstone_bricks.ignore/mat.yml b/src/assets/minecraft/textures/block/cracked_polished_blackstone_bricks.ignore/mat.yml index e3d381ac..0b358aff 100644 --- a/src/assets/minecraft/textures/block/cracked_polished_blackstone_bricks.ignore/mat.yml +++ b/src/assets/minecraft/textures/block/cracked_polished_blackstone_bricks.ignore/mat.yml @@ -1,17 +1,12 @@ -alpha: - value: 255 -albedo: {} height: scale: 0.4 normal: strength: 0.5 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 4 step-distance: 0.2 -smooth: {} -f0: {} porosity: value: 0.15 create-inventory: true diff --git a/src/assets/minecraft/textures/block/crimson_fence_post/mat.yml b/src/assets/minecraft/textures/block/crimson_fence_post/mat.yml index 5b33062c..4fdae810 100644 --- a/src/assets/minecraft/textures/block/crimson_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/crimson_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: crimson_fence_post height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: north width: 0.25 diff --git a/src/assets/minecraft/textures/block/crimson_fence_side/mat.yml b/src/assets/minecraft/textures/block/crimson_fence_side/mat.yml index 4b60aea8..678fc8af 100644 --- a/src/assets/minecraft/textures/block/crimson_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/crimson_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: crimson_fence_side_north height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: up width: 0.125 diff --git a/src/assets/minecraft/textures/block/dandelion/mat.yml b/src/assets/minecraft/textures/block/dandelion/mat.yml index 4acba735..05302f4e 100644 --- a/src/assets/minecraft/textures/block/dandelion/mat.yml +++ b/src/assets/minecraft/textures/block/dandelion/mat.yml @@ -1,7 +1,6 @@ publish-item: true wrap-x: false wrap-y: false -model-file: cross height: texture: alpha.png scale: 0.15 diff --git a/src/assets/minecraft/textures/block/dark_oak_door/mat.yml b/src/assets/minecraft/textures/block/dark_oak_door/mat.yml index dedf73f5..fe16ae56 100644 --- a/src/assets/minecraft/textures/block/dark_oak_door/mat.yml +++ b/src/assets/minecraft/textures/block/dark_oak_door/mat.yml @@ -1,9 +1,7 @@ -alpha: - value: 255 height: shift: -0.02 normal: - filter: sobel-low + method: sobel-low occlusion: quality: 0.1 z-bias: 0 diff --git a/src/assets/minecraft/textures/block/dark_oak_fence_post/mat.yml b/src/assets/minecraft/textures/block/dark_oak_fence_post/mat.yml index 42066f90..88093f4a 100644 --- a/src/assets/minecraft/textures/block/dark_oak_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/dark_oak_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: dark_oak_fence_post height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: north width: 0.25 diff --git a/src/assets/minecraft/textures/block/dark_oak_fence_side/mat.yml b/src/assets/minecraft/textures/block/dark_oak_fence_side/mat.yml index 4b9dbe61..76d72a42 100644 --- a/src/assets/minecraft/textures/block/dark_oak_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/dark_oak_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: dark_oak_fence_side_north height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: up width: 0.125 diff --git a/src/assets/minecraft/textures/block/dark_prismarine/mat.yml b/src/assets/minecraft/textures/block/dark_prismarine/mat.yml index abec7da5..bdd60aa0 100644 --- a/src/assets/minecraft/textures/block/dark_prismarine/mat.yml +++ b/src/assets/minecraft/textures/block/dark_prismarine/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 52 value-green: 95 @@ -10,7 +8,7 @@ height: normal: strength: 0.5 noise: 2 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/destroy_stage_0.png b/src/assets/minecraft/textures/block/destroy_stage_0/destroy_stage_0.png deleted file mode 100644 index f65b7ede..00000000 Binary files a/src/assets/minecraft/textures/block/destroy_stage_0/destroy_stage_0.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/height.png b/src/assets/minecraft/textures/block/destroy_stage_0/height.png index 77a1b4ab..93a5c1a0 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_0/height.png and b/src/assets/minecraft/textures/block/destroy_stage_0/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_0/mat.yml index 7403f5b8..6d3ba5ce 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_0/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_0/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.02 + scale: 0.03 normal: - noise: 2 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/normal.png b/src/assets/minecraft/textures/block/destroy_stage_0/normal.png new file mode 100644 index 00000000..8a5ef020 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_0/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_0/occlusion.png index 1cceaedc..32e41b7c 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_0/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_0/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_0/opacity.png index a1cdff59..b8ca30fd 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_0/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_0/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/height.png new file mode 100644 index 00000000..77a1b4ab Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/mat.yml new file mode 100644 index 00000000..7403f5b8 --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.02 +normal: + noise: 2 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/occlusion.png new file mode 100644 index 00000000..1cceaedc Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/opacity.png new file mode 100644 index 00000000..a1cdff59 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_0/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/height.png b/src/assets/minecraft/textures/block/destroy_stage_1/height.png index dcef6a74..3c1c12d6 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_1/height.png and b/src/assets/minecraft/textures/block/destroy_stage_1/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_1/mat.yml index 49f73e46..b540bb08 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_1/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_1/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.04 + scale: 0.06 normal: - noise: 4 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/normal.png b/src/assets/minecraft/textures/block/destroy_stage_1/normal.png new file mode 100644 index 00000000..3d9f9e05 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_1/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_1/occlusion.png index dc84639f..8c84aa58 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_1/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_1/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_1/opacity.png index 03e07598..9beab8ee 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_1/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_1/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/height.png new file mode 100644 index 00000000..dcef6a74 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/mat.yml new file mode 100644 index 00000000..49f73e46 --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.04 +normal: + noise: 4 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/occlusion.png new file mode 100644 index 00000000..dc84639f Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/opacity.png new file mode 100644 index 00000000..03e07598 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_1/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/height.png b/src/assets/minecraft/textures/block/destroy_stage_2/height.png index 95240270..b85c35df 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_2/height.png and b/src/assets/minecraft/textures/block/destroy_stage_2/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_2/mat.yml index aa66bb74..ba534959 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_2/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_2/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.06 + scale: 0.1 normal: - noise: 6 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/normal.png b/src/assets/minecraft/textures/block/destroy_stage_2/normal.png new file mode 100644 index 00000000..22ce5cad Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_2/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_2/occlusion.png index 37e489fd..60b51877 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_2/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_2/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_2/opacity.png index 1be03782..8d3aac6a 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_2/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_2/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/height.png new file mode 100644 index 00000000..95240270 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/mat.yml new file mode 100644 index 00000000..aa66bb74 --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.06 +normal: + noise: 6 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/occlusion.png new file mode 100644 index 00000000..37e489fd Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/opacity.png new file mode 100644 index 00000000..1be03782 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_2/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/height.png b/src/assets/minecraft/textures/block/destroy_stage_3/height.png index 1aa1647d..c75c1982 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_3/height.png and b/src/assets/minecraft/textures/block/destroy_stage_3/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_3/mat.yml index f1e6aad5..45503f84 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_3/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_3/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.08 + scale: 0.12 normal: - noise: 8 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/normal.png b/src/assets/minecraft/textures/block/destroy_stage_3/normal.png new file mode 100644 index 00000000..80dc62e2 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_3/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_3/occlusion.png index 464851dc..e8350568 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_3/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_3/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_3/opacity.png index ad94c620..63d59dfa 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_3/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_3/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/height.png new file mode 100644 index 00000000..1aa1647d Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/mat.yml new file mode 100644 index 00000000..f1e6aad5 --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.08 +normal: + noise: 8 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/occlusion.png new file mode 100644 index 00000000..464851dc Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/opacity.png new file mode 100644 index 00000000..ad94c620 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_3/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/height.png b/src/assets/minecraft/textures/block/destroy_stage_4/height.png index a9ee26d0..1e6e1591 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_4/height.png and b/src/assets/minecraft/textures/block/destroy_stage_4/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_4/mat.yml index d113938e..b04deedd 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_4/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_4/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.1 + scale: 0.15 normal: - noise: 10 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/normal.png b/src/assets/minecraft/textures/block/destroy_stage_4/normal.png new file mode 100644 index 00000000..15e977da Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_4/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_4/occlusion.png index 87a33724..38f93132 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_4/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_4/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_4/opacity.png index 059ce1d6..cae81279 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_4/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_4/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/height.png new file mode 100644 index 00000000..a9ee26d0 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/mat.yml new file mode 100644 index 00000000..d113938e --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.1 +normal: + noise: 10 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/occlusion.png new file mode 100644 index 00000000..87a33724 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/opacity.png new file mode 100644 index 00000000..059ce1d6 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_4/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/height.png b/src/assets/minecraft/textures/block/destroy_stage_5/height.png index 82391e53..3a354add 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_5/height.png and b/src/assets/minecraft/textures/block/destroy_stage_5/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_5/mat.yml index f71cb209..2edca810 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_5/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_5/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.12 + scale: 0.2 normal: noise: 12 - method: sobel-high - strength: 2 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/normal.png b/src/assets/minecraft/textures/block/destroy_stage_5/normal.png new file mode 100644 index 00000000..2bf7cbbd Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_5/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_5/occlusion.png index 2facf30a..686da0b8 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_5/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_5/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_5/opacity.png index 3b2009e9..6a5a5f78 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_5/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_5/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/height.png new file mode 100644 index 00000000..82391e53 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/mat.yml new file mode 100644 index 00000000..f71cb209 --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.12 +normal: + noise: 12 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/occlusion.png new file mode 100644 index 00000000..2facf30a Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/opacity.png new file mode 100644 index 00000000..3b2009e9 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_5/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/height.png b/src/assets/minecraft/textures/block/destroy_stage_6/height.png index 3d303212..ef896503 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_6/height.png and b/src/assets/minecraft/textures/block/destroy_stage_6/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_6/mat.yml index 2b2b8086..ff8f068d 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_6/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_6/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.14 + scale: 0.25 normal: - noise: 14 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/normal.png b/src/assets/minecraft/textures/block/destroy_stage_6/normal.png new file mode 100644 index 00000000..b654e94a Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_6/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_6/occlusion.png index 14f6f34a..04244af3 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_6/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_6/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_6/opacity.png index 0a0dc714..9aeb0589 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_6/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_6/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/height.png new file mode 100644 index 00000000..3d303212 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/mat.yml new file mode 100644 index 00000000..2b2b8086 --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.14 +normal: + noise: 14 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/occlusion.png new file mode 100644 index 00000000..14f6f34a Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/opacity.png new file mode 100644 index 00000000..0a0dc714 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_6/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/height.png b/src/assets/minecraft/textures/block/destroy_stage_7/height.png index 7908e61e..a44207b5 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_7/height.png and b/src/assets/minecraft/textures/block/destroy_stage_7/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_7/mat.yml index 8ef76278..0f536fc6 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_7/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_7/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.16 + scale: 0.3 normal: - noise: 16 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/normal.png b/src/assets/minecraft/textures/block/destroy_stage_7/normal.png new file mode 100644 index 00000000..e5a0f09b Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_7/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_7/occlusion.png index 440f1237..8cf920bd 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_7/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_7/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_7/opacity.png index df6946a2..2cca4195 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_7/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_7/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/height.png new file mode 100644 index 00000000..7908e61e Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/mat.yml new file mode 100644 index 00000000..8ef76278 --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.16 +normal: + noise: 16 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/occlusion.png new file mode 100644 index 00000000..440f1237 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/opacity.png new file mode 100644 index 00000000..df6946a2 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_7/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/height.png b/src/assets/minecraft/textures/block/destroy_stage_8/height.png index 3d77e043..95565632 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_8/height.png and b/src/assets/minecraft/textures/block/destroy_stage_8/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_8/mat.yml index 3a88f0b1..1326fae4 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_8/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_8/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.18 + scale: 0.35 normal: - noise: 18 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/normal.png b/src/assets/minecraft/textures/block/destroy_stage_8/normal.png new file mode 100644 index 00000000..7fd60bce Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_8/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_8/occlusion.png index 60037752..8bd369d5 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_8/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_8/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_8/opacity.png index ae62f046..3892b5db 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_8/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_8/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/height.png b/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/height.png new file mode 100644 index 00000000..3d77e043 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/mat.yml new file mode 100644 index 00000000..3a88f0b1 --- /dev/null +++ b/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/mat.yml @@ -0,0 +1,12 @@ +wrap-x: false +wrap-y: false +color: + value-red: 60 + value-green: 60 + value-blue: 60 +height: + scale: 0.18 +normal: + noise: 18 + method: sobel-high + strength: 2 diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/occlusion.png new file mode 100644 index 00000000..60037752 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/opacity.png new file mode 100644 index 00000000..ae62f046 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_8/v1.ignore/opacity.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_9/height.png b/src/assets/minecraft/textures/block/destroy_stage_9/height.png index b4f52f9d..62bcfb79 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_9/height.png and b/src/assets/minecraft/textures/block/destroy_stage_9/height.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_9/mat.yml b/src/assets/minecraft/textures/block/destroy_stage_9/mat.yml index 7b8e0c03..bb5b2f3e 100644 --- a/src/assets/minecraft/textures/block/destroy_stage_9/mat.yml +++ b/src/assets/minecraft/textures/block/destroy_stage_9/mat.yml @@ -1,12 +1,15 @@ wrap-x: false wrap-y: false +blend-mode: opaque color: - value-red: 60 - value-green: 60 - value-blue: 60 + value: '#161616' height: - scale: 0.2 + scale: 0.4 normal: - noise: 20 - method: sobel-high - strength: 2 + noise: 12 + method: sobel-low + strength: 0.1 +smooth: + value: 0.2 +f0: + value: 0.04 diff --git a/src/assets/minecraft/textures/block/destroy_stage_9/normal.png b/src/assets/minecraft/textures/block/destroy_stage_9/normal.png new file mode 100644 index 00000000..0ce9cf33 Binary files /dev/null and b/src/assets/minecraft/textures/block/destroy_stage_9/normal.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_9/occlusion.png b/src/assets/minecraft/textures/block/destroy_stage_9/occlusion.png index 0fe143a1..282d7d89 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_9/occlusion.png and b/src/assets/minecraft/textures/block/destroy_stage_9/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/destroy_stage_9/opacity.png b/src/assets/minecraft/textures/block/destroy_stage_9/opacity.png index 20726d57..c906dccc 100644 Binary files a/src/assets/minecraft/textures/block/destroy_stage_9/opacity.png and b/src/assets/minecraft/textures/block/destroy_stage_9/opacity.png differ diff --git a/src/assets/minecraft/textures/block/dispenser_front/mat.yml b/src/assets/minecraft/textures/block/dispenser_front/mat.yml index 4548b356..f5a4be75 100644 --- a/src/assets/minecraft/textures/block/dispenser_front/mat.yml +++ b/src/assets/minecraft/textures/block/dispenser_front/mat.yml @@ -1,14 +1,8 @@ -alpha: - value: 255 -height: {} normal: noise: 1 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 6 step-distance: 0.2 -smooth: {} -f0: {} -porosity: {} create-inventory: true diff --git a/src/assets/minecraft/textures/block/dispenser_front_vertical/mat.yml b/src/assets/minecraft/textures/block/dispenser_front_vertical/mat.yml index a8a81ab2..8baaf049 100644 --- a/src/assets/minecraft/textures/block/dispenser_front_vertical/mat.yml +++ b/src/assets/minecraft/textures/block/dispenser_front_vertical/mat.yml @@ -1,15 +1,10 @@ -alpha: - value: 255 -height: {} normal: noise: 1 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 6 step-distance: 0.2 -smooth: {} f0: value: 0.05 -porosity: {} create-inventory: true diff --git a/src/assets/minecraft/textures/block/dropper_front/mat.yml b/src/assets/minecraft/textures/block/dropper_front/mat.yml index d1634115..dc0abdb0 100644 --- a/src/assets/minecraft/textures/block/dropper_front/mat.yml +++ b/src/assets/minecraft/textures/block/dropper_front/mat.yml @@ -1,16 +1,11 @@ -alpha: - value: 255 height: scale: 0.6 normal: strength: 0.6 noise: 1 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 6 step-distance: 0.2 -smooth: {} -f0: {} -porosity: {} create-inventory: true diff --git a/src/assets/minecraft/textures/block/dropper_front_vertical/mat.yml b/src/assets/minecraft/textures/block/dropper_front_vertical/mat.yml index c7f0fc48..c9b275f2 100644 --- a/src/assets/minecraft/textures/block/dropper_front_vertical/mat.yml +++ b/src/assets/minecraft/textures/block/dropper_front_vertical/mat.yml @@ -1,17 +1,13 @@ -alpha: - value: 255 height: scale: 0.6 normal: strength: 0.6 noise: 1 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 6 step-distance: 0.2 -smooth: {} f0: value: 0.05 -porosity: {} create-inventory: true diff --git a/src/assets/minecraft/textures/block/farmland_moist/1.pbr.yml b/src/assets/minecraft/textures/block/farmland_moist/1.mat.yml similarity index 86% rename from src/assets/minecraft/textures/block/farmland_moist/1.pbr.yml rename to src/assets/minecraft/textures/block/farmland_moist/1.mat.yml index 5d3302b3..a736ad58 100644 --- a/src/assets/minecraft/textures/block/farmland_moist/1.pbr.yml +++ b/src/assets/minecraft/textures/block/farmland_moist/1.mat.yml @@ -1,4 +1,4 @@ -model-file: block\farmland_moist_1 +model: block\farmland_moist_1 opacity: value: 255 height: diff --git a/src/assets/minecraft/textures/block/farmland_moist/2.pbr.yml b/src/assets/minecraft/textures/block/farmland_moist/2.mat.yml similarity index 86% rename from src/assets/minecraft/textures/block/farmland_moist/2.pbr.yml rename to src/assets/minecraft/textures/block/farmland_moist/2.mat.yml index 86b6c592..b37a88ad 100644 --- a/src/assets/minecraft/textures/block/farmland_moist/2.pbr.yml +++ b/src/assets/minecraft/textures/block/farmland_moist/2.mat.yml @@ -1,4 +1,4 @@ -model-file: block\farmland_moist_2 +model: block\farmland_moist_2 opacity: value: 255 height: diff --git a/src/assets/minecraft/textures/block/farmland_moist/3.pbr.yml b/src/assets/minecraft/textures/block/farmland_moist/3.mat.yml similarity index 86% rename from src/assets/minecraft/textures/block/farmland_moist/3.pbr.yml rename to src/assets/minecraft/textures/block/farmland_moist/3.mat.yml index 31788441..f63efc9e 100644 --- a/src/assets/minecraft/textures/block/farmland_moist/3.pbr.yml +++ b/src/assets/minecraft/textures/block/farmland_moist/3.mat.yml @@ -1,4 +1,4 @@ -model-file: block\farmland_moist_3 +model: block\farmland_moist_3 opacity: value: 255 height: diff --git a/src/assets/minecraft/textures/block/farmland_moist/4.pbr.yml b/src/assets/minecraft/textures/block/farmland_moist/4.mat.yml similarity index 86% rename from src/assets/minecraft/textures/block/farmland_moist/4.pbr.yml rename to src/assets/minecraft/textures/block/farmland_moist/4.mat.yml index a065ec85..678c056a 100644 --- a/src/assets/minecraft/textures/block/farmland_moist/4.pbr.yml +++ b/src/assets/minecraft/textures/block/farmland_moist/4.mat.yml @@ -1,4 +1,4 @@ -model-file: block\farmland_moist_4 +model: block\farmland_moist_4 opacity: value: 255 height: diff --git a/src/assets/minecraft/textures/block/farmland_moist/5.pbr.yml b/src/assets/minecraft/textures/block/farmland_moist/5.mat.yml similarity index 86% rename from src/assets/minecraft/textures/block/farmland_moist/5.pbr.yml rename to src/assets/minecraft/textures/block/farmland_moist/5.mat.yml index 7608ed65..091d5c3a 100644 --- a/src/assets/minecraft/textures/block/farmland_moist/5.pbr.yml +++ b/src/assets/minecraft/textures/block/farmland_moist/5.mat.yml @@ -1,4 +1,4 @@ -model-file: block\farmland_moist_5 +model: block\farmland_moist_5 opacity: value: 255 height: diff --git a/src/assets/minecraft/textures/block/farmland_moist/6.pbr.yml b/src/assets/minecraft/textures/block/farmland_moist/6.mat.yml similarity index 86% rename from src/assets/minecraft/textures/block/farmland_moist/6.pbr.yml rename to src/assets/minecraft/textures/block/farmland_moist/6.mat.yml index 9b4211d3..b77c2432 100644 --- a/src/assets/minecraft/textures/block/farmland_moist/6.pbr.yml +++ b/src/assets/minecraft/textures/block/farmland_moist/6.mat.yml @@ -1,4 +1,4 @@ -model-file: block\farmland_moist_6 +model: block\farmland_moist_6 opacity: value: 255 height: diff --git a/src/assets/minecraft/textures/block/farmland_moist/7.pbr.yml b/src/assets/minecraft/textures/block/farmland_moist/7.mat.yml similarity index 86% rename from src/assets/minecraft/textures/block/farmland_moist/7.pbr.yml rename to src/assets/minecraft/textures/block/farmland_moist/7.mat.yml index 40472506..9e0d537a 100644 --- a/src/assets/minecraft/textures/block/farmland_moist/7.pbr.yml +++ b/src/assets/minecraft/textures/block/farmland_moist/7.mat.yml @@ -1,4 +1,4 @@ -model-file: block\farmland_moist_7 +model: block\farmland_moist_7 opacity: value: 255 height: diff --git a/src/assets/minecraft/textures/block/fern/mat.yml b/src/assets/minecraft/textures/block/fern/mat.yml index 9f1b62b8..117177c1 100644 --- a/src/assets/minecraft/textures/block/fern/mat.yml +++ b/src/assets/minecraft/textures/block/fern/mat.yml @@ -1,7 +1,6 @@ publish-item: true wrap-x: false wrap-y: false -model-type: cross color: value-red: 148 value-green: 148 diff --git a/src/assets/minecraft/textures/block/fletching_table_top/mat.yml b/src/assets/minecraft/textures/block/fletching_table_top/mat.yml index e2d2f9f1..2a2f519f 100644 --- a/src/assets/minecraft/textures/block/fletching_table_top/mat.yml +++ b/src/assets/minecraft/textures/block/fletching_table_top/mat.yml @@ -1,10 +1,8 @@ -alpha: - value: 255 height: scale: 0.3 normal: strength: 0.4 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 2 diff --git a/src/assets/minecraft/textures/block/grindstone_round/mat.yml b/src/assets/minecraft/textures/block/grindstone_round/mat.yml index 23417065..7650fd27 100644 --- a/src/assets/minecraft/textures/block/grindstone_round/mat.yml +++ b/src/assets/minecraft/textures/block/grindstone_round/mat.yml @@ -2,11 +2,10 @@ albedo: value-red: 143 value-green: 143 value-blue: 143 -height: {} normal: strength: 1 noise: 1 - filter: sobel3 + method: sobel3 occlusion: z-bias: 0 z-scale: 2 diff --git a/src/assets/minecraft/textures/block/grindstone_side/mat.yml b/src/assets/minecraft/textures/block/grindstone_side/mat.yml index 0a68911e..5a2dda30 100644 --- a/src/assets/minecraft/textures/block/grindstone_side/mat.yml +++ b/src/assets/minecraft/textures/block/grindstone_side/mat.yml @@ -7,7 +7,7 @@ height: normal: strength: 0.5 noise: 3 - filter: sobel3 + method: sobel3 occlusion: z-bias: 0 z-scale: 2 diff --git a/src/assets/minecraft/textures/block/honey_block_bottom/mat.yml b/src/assets/minecraft/textures/block/honey_block_bottom/mat.yml index bf85e265..cbfb7313 100644 --- a/src/assets/minecraft/textures/block/honey_block_bottom/mat.yml +++ b/src/assets/minecraft/textures/block/honey_block_bottom/mat.yml @@ -1,10 +1,9 @@ publish-item: true +blend-mode: transparent opacity: - value: 210 + value: 0.6 color: - value-red: 215 - value-green: 129 - value-blue: 7 + value: '#9E6013' height: scale: 0.6 normal: @@ -14,9 +13,8 @@ occlusion: z-bias: 0 z-scale: 4 smooth: - value: 0.78 + value: 0.56 f0: value: 0.028 sss: - value: 0.9 -ctm: {} + value: 0.7 diff --git a/src/assets/minecraft/textures/block/honey_block_side/mat.yml b/src/assets/minecraft/textures/block/honey_block_side/mat.yml index b6728fbb..db198a8e 100644 --- a/src/assets/minecraft/textures/block/honey_block_side/mat.yml +++ b/src/assets/minecraft/textures/block/honey_block_side/mat.yml @@ -1,9 +1,9 @@ publish-item: true blend-mode: transparent opacity: - value: 210 + value: 0.66 color: - value: '#D78107' + value: '#9E6013' height: scale: 0.7 normal: @@ -13,8 +13,8 @@ occlusion: z-bias: 0 z-scale: 4 smooth: - value: 0.78 + value: 0.56 f0: value: 0.028 sss: - value: 0.6 + value: 0.7 diff --git a/src/assets/minecraft/textures/block/honey_block_top/mat.yml b/src/assets/minecraft/textures/block/honey_block_top/mat.yml index 4381a51e..60bb22cf 100644 --- a/src/assets/minecraft/textures/block/honey_block_top/mat.yml +++ b/src/assets/minecraft/textures/block/honey_block_top/mat.yml @@ -1,9 +1,9 @@ publish-item: true blend-mode: transparent opacity: - value: 210 + value: 0.66 color: - value: '#D78107' + value: '#9E6013' height: shift: -0.1 scale: 0.5 @@ -16,8 +16,8 @@ occlusion: z-bias: 0 z-scale: 4 smooth: - value: 0.78 + value: 0.56 f0: value: 0.028 sss: - value: 0.6 + value: 0.7 diff --git a/src/assets/minecraft/textures/block/item_frame/mat.yml b/src/assets/minecraft/textures/block/item_frame/mat.yml index c452d738..3a9bf14e 100644 --- a/src/assets/minecraft/textures/block/item_frame/mat.yml +++ b/src/assets/minecraft/textures/block/item_frame/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 height: value: 0 normal: diff --git a/src/assets/minecraft/textures/block/jungle_door/mat.yml b/src/assets/minecraft/textures/block/jungle_door/mat.yml index a448407e..54556cb7 100644 --- a/src/assets/minecraft/textures/block/jungle_door/mat.yml +++ b/src/assets/minecraft/textures/block/jungle_door/mat.yml @@ -2,7 +2,7 @@ height: scale: 0.8 normal: strength: 0.8 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 4 diff --git a/src/assets/minecraft/textures/block/jungle_fence_post/mat.yml b/src/assets/minecraft/textures/block/jungle_fence_post/mat.yml index 9edd7301..f958ba54 100644 --- a/src/assets/minecraft/textures/block/jungle_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/jungle_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: jungle_fence_post height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: north width: 0.25 diff --git a/src/assets/minecraft/textures/block/jungle_fence_side/mat.yml b/src/assets/minecraft/textures/block/jungle_fence_side/mat.yml index 47da59c2..2d0d3369 100644 --- a/src/assets/minecraft/textures/block/jungle_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/jungle_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: jungle_fence_side_north height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: up width: 0.125 diff --git a/src/assets/minecraft/textures/block/kelp/mat.yml b/src/assets/minecraft/textures/block/kelp/mat.yml index 3c2316d1..bd290390 100644 --- a/src/assets/minecraft/textures/block/kelp/mat.yml +++ b/src/assets/minecraft/textures/block/kelp/mat.yml @@ -2,7 +2,6 @@ texture-width: 32 wrap-x: false wrap-y: false opacity: - scale: 0.2 input: sampler: bilinear height: @@ -18,4 +17,3 @@ smooth: value: 0.8 f0: value: 0.017 -ctm: {} diff --git a/src/assets/minecraft/textures/block/lantern/.ignore/albedo.png b/src/assets/minecraft/textures/block/lantern/.ignore/albedo.png deleted file mode 100644 index b4b69308..00000000 Binary files a/src/assets/minecraft/textures/block/lantern/.ignore/albedo.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/lantern/.ignore/mat.mcmeta b/src/assets/minecraft/textures/block/lantern/.ignore/mat.mcmeta deleted file mode 100644 index 6e59ec00..00000000 --- a/src/assets/minecraft/textures/block/lantern/.ignore/mat.mcmeta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "animation": { - "frametime": 40, - "interpolate": true, - "frames": [ - 0, - 1, - 0, - 2 - ] - } -} \ No newline at end of file diff --git a/src/assets/minecraft/textures/block/lantern/height.png b/src/assets/minecraft/textures/block/lantern/height.png index 3aaad068..ce769b69 100644 Binary files a/src/assets/minecraft/textures/block/lantern/height.png and b/src/assets/minecraft/textures/block/lantern/height.png differ diff --git a/src/assets/minecraft/textures/block/lantern/mat.yml b/src/assets/minecraft/textures/block/lantern/mat.yml index 7e145102..62a2abe7 100644 --- a/src/assets/minecraft/textures/block/lantern/mat.yml +++ b/src/assets/minecraft/textures/block/lantern/mat.yml @@ -7,7 +7,6 @@ occlusion: step-distance: 0.15 z-bias: 0 z-scale: 3 -ctm: {} filters: - name: side left: 0 @@ -33,3 +32,21 @@ filters: width: 0.25 height: 0.3125 normal-curve-x: 90 +- name: top2 + left: 0.0625 + top: 0 + width: 0.25 + height: 0.125 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.4 + normal-radius-y: 0.8 +- name: top3 + left: 0.0625 + top: 0.625 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 diff --git a/src/assets/minecraft/textures/block/lapis_block/mat.yml b/src/assets/minecraft/textures/block/lapis_block/mat.yml index 4771187c..a585e2a5 100644 --- a/src/assets/minecraft/textures/block/lapis_block/mat.yml +++ b/src/assets/minecraft/textures/block/lapis_block/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 32 value-green: 71 @@ -8,13 +6,11 @@ height: scale: 0.5 normal: strength: 1.4 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 4 step-distance: 0.2 -smooth: {} -metal: {} f0: value: 0.053 sss: diff --git a/src/assets/minecraft/textures/block/lectern_base/mat.yml b/src/assets/minecraft/textures/block/lectern_base/mat.yml index 33e46306..35c61658 100644 --- a/src/assets/minecraft/textures/block/lectern_base/mat.yml +++ b/src/assets/minecraft/textures/block/lectern_base/mat.yml @@ -1,16 +1,13 @@ -alpha: - value: 255 height: scale: 0.05 edge-fade-x: 0.1 edge-fade-y: 0.1 normal: - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 2 step-distance: 0.15 -smooth: {} f0: value: 0.04 porosity: diff --git a/src/assets/minecraft/textures/block/lectern_front/mat.yml b/src/assets/minecraft/textures/block/lectern_front/mat.yml index 2ae726c8..f1b699da 100644 --- a/src/assets/minecraft/textures/block/lectern_front/mat.yml +++ b/src/assets/minecraft/textures/block/lectern_front/mat.yml @@ -1,11 +1,7 @@ -alpha: - value: 255 -albedo: {} -height: {} normal: strength: 0.4 noise: 2 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 3 diff --git a/src/assets/minecraft/textures/block/lectern_sides/mat.yml b/src/assets/minecraft/textures/block/lectern_sides/mat.yml index 56d10d9b..ded80edd 100644 --- a/src/assets/minecraft/textures/block/lectern_sides/mat.yml +++ b/src/assets/minecraft/textures/block/lectern_sides/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 176 value-green: 141 @@ -9,7 +7,7 @@ height: normal: strength: 0.4 noise: 2 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 2 diff --git a/src/assets/minecraft/textures/block/lectern_top/mat.yml b/src/assets/minecraft/textures/block/lectern_top/mat.yml index de7a0530..a05eab7b 100644 --- a/src/assets/minecraft/textures/block/lectern_top/mat.yml +++ b/src/assets/minecraft/textures/block/lectern_top/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 176 value-green: 141 @@ -11,12 +9,11 @@ height: normal: strength: 0.4 noise: 2 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 1 step-distance: 0.15 -smooth: {} f0: value: 0.04 porosity: diff --git a/src/assets/minecraft/textures/block/lodestone_side/mat.yml b/src/assets/minecraft/textures/block/lodestone_side/mat.yml index bc6a906b..752b0611 100644 --- a/src/assets/minecraft/textures/block/lodestone_side/mat.yml +++ b/src/assets/minecraft/textures/block/lodestone_side/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 129 value-green: 129 @@ -8,7 +6,7 @@ height: scale: 0.6 normal: noise: 3 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 3 diff --git a/src/assets/minecraft/textures/block/lodestone_top/mat.yml b/src/assets/minecraft/textures/block/lodestone_top/mat.yml index 4534982f..b047f6e5 100644 --- a/src/assets/minecraft/textures/block/lodestone_top/mat.yml +++ b/src/assets/minecraft/textures/block/lodestone_top/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 149 value-green: 151 @@ -8,12 +6,11 @@ height: scale: 0.5 normal: noise: 3 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 2 step-distance: 0.2 -smooth: {} f0: value: 0.05 porosity: diff --git a/src/assets/minecraft/textures/block/melon_stem/mat.yml b/src/assets/minecraft/textures/block/melon_stem/mat.yml index 4abf751b..adb2b77f 100644 --- a/src/assets/minecraft/textures/block/melon_stem/mat.yml +++ b/src/assets/minecraft/textures/block/melon_stem/mat.yml @@ -1,6 +1,5 @@ wrap-x: false wrap-y: false -model-type: cross color: value-red: 128 value-green: 128 diff --git a/src/assets/minecraft/textures/block/mushroom_block_inside/mat.yml b/src/assets/minecraft/textures/block/mushroom_block_inside/mat.yml index 4c1d5806..4d44224c 100644 --- a/src/assets/minecraft/textures/block/mushroom_block_inside/mat.yml +++ b/src/assets/minecraft/textures/block/mushroom_block_inside/mat.yml @@ -1,13 +1,10 @@ -alpha: - value: 255 albedo: value-red: 202 value-green: 171 value-blue: 120 -height: {} normal: noise: 6 - filter: sobel3 + method: sobel3 occlusion: z-scale: 3 step-distance: 0.15 diff --git a/src/assets/minecraft/textures/block/mushroom_block_inside/mushroom_block_inside.png b/src/assets/minecraft/textures/block/mushroom_block_inside/mushroom_block_inside.png deleted file mode 100644 index 194114a0..00000000 Binary files a/src/assets/minecraft/textures/block/mushroom_block_inside/mushroom_block_inside.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/nether_brick_fence_post/mat.yml b/src/assets/minecraft/textures/block/nether_brick_fence_post/mat.yml index 1ac3a45a..39bc13e1 100644 --- a/src/assets/minecraft/textures/block/nether_brick_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/nether_brick_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: nether_brick_fence_post color: value: '#786478' diff --git a/src/assets/minecraft/textures/block/nether_brick_fence_side/mat.yml b/src/assets/minecraft/textures/block/nether_brick_fence_side/mat.yml index 139dc935..4a020f3f 100644 --- a/src/assets/minecraft/textures/block/nether_brick_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/nether_brick_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: nether_brick_fence_side_north color: value: '#786478' diff --git a/src/assets/minecraft/textures/block/nether_portal/height.png b/src/assets/minecraft/textures/block/nether_portal/height.png new file mode 100644 index 00000000..eeb9f5e4 Binary files /dev/null and b/src/assets/minecraft/textures/block/nether_portal/height.png differ diff --git a/src/assets/minecraft/textures/block/nether_portal/mat.yml b/src/assets/minecraft/textures/block/nether_portal/mat.yml index dd3f7a2b..77823a47 100644 --- a/src/assets/minecraft/textures/block/nether_portal/mat.yml +++ b/src/assets/minecraft/textures/block/nether_portal/mat.yml @@ -8,8 +8,9 @@ color: sampler: bilinear input-blue: sampler: bilinear +height: + scale: 0.5 emissive: scale: 4 input: sampler: bilinear -ctm: {} diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/mat.yml b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/mat.yml index 20d46826..ca040e5d 100644 --- a/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/mat.yml +++ b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/mat.yml @@ -1,18 +1,13 @@ -alpha: - value: 255 height: scale: 0.6 normal: strength: 0.8 noise: 3 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 10 step-distance: 0.15 -smooth: {} -f0: {} -porosity: {} sss: scale: 0.4 create-inventory: true diff --git a/src/assets/minecraft/textures/block/nether_sprouts/mat.yml b/src/assets/minecraft/textures/block/nether_sprouts/mat.yml index 1fdc46ad..0f1ff70b 100644 --- a/src/assets/minecraft/textures/block/nether_sprouts/mat.yml +++ b/src/assets/minecraft/textures/block/nether_sprouts/mat.yml @@ -1,6 +1,5 @@ wrap-x: false wrap-y: false -model-type: cross color: value-red: 20 value-green: 142 diff --git a/src/assets/minecraft/textures/block/oak_fence_post/mat.yml b/src/assets/minecraft/textures/block/oak_fence_post/mat.yml index 601d0efc..9de05d93 100644 --- a/src/assets/minecraft/textures/block/oak_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/oak_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: oak_fence_post height: shift: -0.02 @@ -18,18 +19,17 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: north width: 0.25 normal-curve-x: 90 normal-radius-x: 0.5 -- name: south +- name: west left: 0.25 width: 0.25 normal-curve-x: 90 normal-radius-x: 0.5 -- name: west +- name: south left: 0.5 width: 0.25 normal-curve-x: 90 diff --git a/src/assets/minecraft/textures/block/oak_fence_side/mat.yml b/src/assets/minecraft/textures/block/oak_fence_side/mat.yml index 77551067..d664472f 100644 --- a/src/assets/minecraft/textures/block/oak_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/oak_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: oak_fence_side_north height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: up width: 0.125 diff --git a/src/assets/minecraft/textures/block/observer_back/mat.yml b/src/assets/minecraft/textures/block/observer_back/mat.yml index 30d41d0b..ad062ad4 100644 --- a/src/assets/minecraft/textures/block/observer_back/mat.yml +++ b/src/assets/minecraft/textures/block/observer_back/mat.yml @@ -1,18 +1,14 @@ -alpha: - value: 255 height: scale: 0.3 edge-fade-x: 0.1 edge-fade-y: 0.1 normal: strength: 0.6 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 3 step-distance: 0.15 -smooth: {} -metal: {} porosity: value: 0 create-inventory: true diff --git a/src/assets/minecraft/textures/block/observer_back_on/mat.yml b/src/assets/minecraft/textures/block/observer_back_on/mat.yml index 30d41d0b..ad062ad4 100644 --- a/src/assets/minecraft/textures/block/observer_back_on/mat.yml +++ b/src/assets/minecraft/textures/block/observer_back_on/mat.yml @@ -1,18 +1,14 @@ -alpha: - value: 255 height: scale: 0.3 edge-fade-x: 0.1 edge-fade-y: 0.1 normal: strength: 0.6 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 3 step-distance: 0.15 -smooth: {} -metal: {} porosity: value: 0 create-inventory: true diff --git a/src/assets/minecraft/textures/block/observer_front/mat.yml b/src/assets/minecraft/textures/block/observer_front/mat.yml index 37079287..b463f9a3 100644 --- a/src/assets/minecraft/textures/block/observer_front/mat.yml +++ b/src/assets/minecraft/textures/block/observer_front/mat.yml @@ -1,18 +1,14 @@ -alpha: - value: 255 height: scale: 0.3 edge-fade-x: 0.1 edge-fade-y: 0.1 normal: strength: 0.5 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 3 step-distance: 0.15 -smooth: {} -metal: {} porosity: value: 0 create-inventory: true diff --git a/src/assets/minecraft/textures/block/piston_bottom/mat.yml b/src/assets/minecraft/textures/block/piston_bottom/mat.yml index 7c47625b..08b0d629 100644 --- a/src/assets/minecraft/textures/block/piston_bottom/mat.yml +++ b/src/assets/minecraft/textures/block/piston_bottom/mat.yml @@ -1,14 +1,10 @@ -alpha: - value: 255 height: scale: 0.5 normal: strength: 1.5 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 3 step-distance: 0.15 -smooth: {} -porosity: {} create-inventory: true diff --git a/src/assets/minecraft/textures/block/piston_inner/mat.yml b/src/assets/minecraft/textures/block/piston_inner/mat.yml index 2a552a08..62bc89a4 100644 --- a/src/assets/minecraft/textures/block/piston_inner/mat.yml +++ b/src/assets/minecraft/textures/block/piston_inner/mat.yml @@ -1,13 +1,9 @@ -alpha: - value: 255 height: scale: 0.5 normal: strength: 1.5 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 3 step-distance: 0.15 -smooth: {} -porosity: {} diff --git a/src/assets/minecraft/textures/block/piston_side/mat.yml b/src/assets/minecraft/textures/block/piston_side/mat.yml index 078131e1..fda36a91 100644 --- a/src/assets/minecraft/textures/block/piston_side/mat.yml +++ b/src/assets/minecraft/textures/block/piston_side/mat.yml @@ -1,7 +1,5 @@ publish-item: true wrap-y: false -opacity: - value: 255 height: scale: 0.5 normal: diff --git a/src/assets/minecraft/textures/block/polished_andesite_cut/bump.png b/src/assets/minecraft/textures/block/polished_andesite_cut/bump.png new file mode 100644 index 00000000..3aed781a Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_andesite_cut/bump.png differ diff --git a/src/assets/minecraft/textures/block/polished_andesite_cut/color.png b/src/assets/minecraft/textures/block/polished_andesite_cut/color.png new file mode 100644 index 00000000..96f68ddc Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_andesite_cut/color.png differ diff --git a/src/assets/minecraft/textures/block/polished_andesite_cut/height.png b/src/assets/minecraft/textures/block/polished_andesite_cut/height.png new file mode 100644 index 00000000..a6acacef Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_andesite_cut/height.png differ diff --git a/src/assets/minecraft/textures/block/polished_andesite_cut/mat.yml b/src/assets/minecraft/textures/block/polished_andesite_cut/mat.yml new file mode 100644 index 00000000..97e7a3dc --- /dev/null +++ b/src/assets/minecraft/textures/block/polished_andesite_cut/mat.yml @@ -0,0 +1,61 @@ +publish-item: true +wrap-x: false +wrap-y: false +height: + shift: -0.08 + scale: 0.2 + edge-fade-x: 1 + edge-fade-y: 1 +normal: + noise: 2 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + method: sobel-high + strength: 0.3 +occlusion: + step-distance: 0.4 + z-bias: 2 + z-scale: 4 +f0: + value: 0.05 +porosity: + value: 0.1 +filters: +- name: top-left + left: 0 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: top-right + left: 0.5 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: bottom-left + left: 0 + top: 0.5 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: bottom-right + left: 0.5 + top: 0.5 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 diff --git a/src/assets/minecraft/textures/block/polished_andesite_cut/occlusion.png b/src/assets/minecraft/textures/block/polished_andesite_cut/occlusion.png new file mode 100644 index 00000000..b9802e59 Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_andesite_cut/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/polished_andesite_cut/smooth.png b/src/assets/minecraft/textures/block/polished_andesite_cut/smooth.png new file mode 100644 index 00000000..8060306f Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_andesite_cut/smooth.png differ diff --git a/src/assets/minecraft/textures/block/polished_basalt_side/mat.yml b/src/assets/minecraft/textures/block/polished_basalt_side/mat.yml index 79d32535..aa486ec2 100644 --- a/src/assets/minecraft/textures/block/polished_basalt_side/mat.yml +++ b/src/assets/minecraft/textures/block/polished_basalt_side/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 80 value-green: 80 @@ -9,7 +7,7 @@ height: edge-fade-x: 1.8 normal: curve-x: 40 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 2 diff --git a/src/assets/minecraft/textures/block/polished_basalt_top/mat.yml b/src/assets/minecraft/textures/block/polished_basalt_top/mat.yml index 0e3dc213..dac3ff8a 100644 --- a/src/assets/minecraft/textures/block/polished_basalt_top/mat.yml +++ b/src/assets/minecraft/textures/block/polished_basalt_top/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 107 value-green: 107 @@ -8,7 +6,7 @@ height: scale: 0.15 normal: strength: 0.5 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 2 diff --git a/src/assets/minecraft/textures/block/polished_blackstone_bricks.ignore/mat.yml b/src/assets/minecraft/textures/block/polished_blackstone_bricks.ignore/mat.yml index 90941d20..d8138527 100644 --- a/src/assets/minecraft/textures/block/polished_blackstone_bricks.ignore/mat.yml +++ b/src/assets/minecraft/textures/block/polished_blackstone_bricks.ignore/mat.yml @@ -1,17 +1,12 @@ -alpha: - value: 255 -albedo: {} height: scale: 0.4 normal: strength: 0.5 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 3 step-distance: 0.15 -smooth: {} -f0: {} porosity: value: 0.15 create-inventory: true diff --git a/src/assets/minecraft/textures/block/polished_diorite_cut/bump.png b/src/assets/minecraft/textures/block/polished_diorite_cut/bump.png new file mode 100644 index 00000000..3aed781a Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_diorite_cut/bump.png differ diff --git a/src/assets/minecraft/textures/block/polished_diorite_cut/color.png b/src/assets/minecraft/textures/block/polished_diorite_cut/color.png new file mode 100644 index 00000000..110ce35b Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_diorite_cut/color.png differ diff --git a/src/assets/minecraft/textures/block/polished_diorite_cut/height.png b/src/assets/minecraft/textures/block/polished_diorite_cut/height.png new file mode 100644 index 00000000..a6acacef Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_diorite_cut/height.png differ diff --git a/src/assets/minecraft/textures/block/polished_diorite_cut/mat.yml b/src/assets/minecraft/textures/block/polished_diorite_cut/mat.yml new file mode 100644 index 00000000..eadd9752 --- /dev/null +++ b/src/assets/minecraft/textures/block/polished_diorite_cut/mat.yml @@ -0,0 +1,59 @@ +publish-item: true +wrap-x: false +wrap-y: false +height: + shift: -0.08 + scale: 0.2 + edge-fade-x: 1 + edge-fade-y: 1 +normal: + noise: 2 + method: sobel-high + strength: 0.3 +occlusion: + step-distance: 0.4 + z-bias: 2 + z-scale: 4 +smooth: + shift: 0.1 +f0: + value: 0.05 +porosity: + value: 0.1 +filters: +- name: top-left + left: 0 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: top-right + left: 0.5 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: bottom-left + left: 0 + top: 0.5 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: bottom-right + left: 0.5 + top: 0.5 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 diff --git a/src/assets/minecraft/textures/block/polished_diorite_cut/occlusion.png b/src/assets/minecraft/textures/block/polished_diorite_cut/occlusion.png new file mode 100644 index 00000000..b9802e59 Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_diorite_cut/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/polished_diorite_cut/smooth.png b/src/assets/minecraft/textures/block/polished_diorite_cut/smooth.png new file mode 100644 index 00000000..8060306f Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_diorite_cut/smooth.png differ diff --git a/src/assets/minecraft/textures/block/polished_granite_cut/bump.png b/src/assets/minecraft/textures/block/polished_granite_cut/bump.png new file mode 100644 index 00000000..3aed781a Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_granite_cut/bump.png differ diff --git a/src/assets/minecraft/textures/block/polished_granite_cut/color.png b/src/assets/minecraft/textures/block/polished_granite_cut/color.png new file mode 100644 index 00000000..267aced1 Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_granite_cut/color.png differ diff --git a/src/assets/minecraft/textures/block/polished_granite_cut/height.png b/src/assets/minecraft/textures/block/polished_granite_cut/height.png new file mode 100644 index 00000000..a6acacef Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_granite_cut/height.png differ diff --git a/src/assets/minecraft/textures/block/polished_granite_cut/mat.yml b/src/assets/minecraft/textures/block/polished_granite_cut/mat.yml new file mode 100644 index 00000000..97e7a3dc --- /dev/null +++ b/src/assets/minecraft/textures/block/polished_granite_cut/mat.yml @@ -0,0 +1,61 @@ +publish-item: true +wrap-x: false +wrap-y: false +height: + shift: -0.08 + scale: 0.2 + edge-fade-x: 1 + edge-fade-y: 1 +normal: + noise: 2 + curve-x: 90 + curve-y: 90 + radius-x: 0.15 + radius-y: 0.15 + method: sobel-high + strength: 0.3 +occlusion: + step-distance: 0.4 + z-bias: 2 + z-scale: 4 +f0: + value: 0.05 +porosity: + value: 0.1 +filters: +- name: top-left + left: 0 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: top-right + left: 0.5 + top: 0 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: bottom-left + left: 0 + top: 0.5 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: bottom-right + left: 0.5 + top: 0.5 + width: 0.5 + height: 0.5 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 diff --git a/src/assets/minecraft/textures/block/polished_granite_cut/occlusion.png b/src/assets/minecraft/textures/block/polished_granite_cut/occlusion.png new file mode 100644 index 00000000..b9802e59 Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_granite_cut/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/polished_granite_cut/smooth.png b/src/assets/minecraft/textures/block/polished_granite_cut/smooth.png new file mode 100644 index 00000000..8060306f Binary files /dev/null and b/src/assets/minecraft/textures/block/polished_granite_cut/smooth.png differ diff --git a/src/assets/minecraft/textures/block/purpur_block/mat.yml b/src/assets/minecraft/textures/block/purpur_block/mat.yml index 1c8066a1..1a93e5e4 100644 --- a/src/assets/minecraft/textures/block/purpur_block/mat.yml +++ b/src/assets/minecraft/textures/block/purpur_block/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 159 value-green: 114 @@ -7,7 +5,7 @@ albedo: height: scale: 0.4 normal: - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 3 diff --git a/src/assets/minecraft/textures/block/purpur_pillar_top/mat.yml b/src/assets/minecraft/textures/block/purpur_pillar_top/mat.yml index 5ce923e0..9e31ca9b 100644 --- a/src/assets/minecraft/textures/block/purpur_pillar_top/mat.yml +++ b/src/assets/minecraft/textures/block/purpur_pillar_top/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 159 value-green: 114 @@ -7,7 +5,7 @@ albedo: height: scale: 0.3 normal: - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 3 diff --git a/src/assets/minecraft/textures/block/quartz_pillar_top/mat.yml b/src/assets/minecraft/textures/block/quartz_pillar_top/mat.yml index 5fa78ee8..8075ba4f 100644 --- a/src/assets/minecraft/textures/block/quartz_pillar_top/mat.yml +++ b/src/assets/minecraft/textures/block/quartz_pillar_top/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 236 value-green: 232 @@ -9,12 +7,11 @@ height: normal: strength: 0.3 noise: 2 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 2 step-distance: 0.15 -smooth: {} f0: value: 0.1 porosity: diff --git a/src/assets/minecraft/textures/block/redstone_dust_dot/mat.yml b/src/assets/minecraft/textures/block/redstone_dust_dot/mat.yml index e1f9d29a..b94d10df 100644 --- a/src/assets/minecraft/textures/block/redstone_dust_dot/mat.yml +++ b/src/assets/minecraft/textures/block/redstone_dust_dot/mat.yml @@ -1,6 +1,6 @@ wrap-x: false wrap-y: false -color-tint: '#D00000' +tint-color: '#D00000' color: value-red: 235 value-green: 235 diff --git a/src/assets/minecraft/textures/block/redstone_dust_line0/mat.yml b/src/assets/minecraft/textures/block/redstone_dust_line0/mat.yml index 0c62065a..8947ad36 100644 --- a/src/assets/minecraft/textures/block/redstone_dust_line0/mat.yml +++ b/src/assets/minecraft/textures/block/redstone_dust_line0/mat.yml @@ -1,5 +1,5 @@ wrap-x: false -color-tint: '#D00000' +tint-color: '#D00000' color: value-red: 235 value-green: 235 diff --git a/src/assets/minecraft/textures/block/redstone_dust_line1/mat.yml b/src/assets/minecraft/textures/block/redstone_dust_line1/mat.yml index 0c62065a..8947ad36 100644 --- a/src/assets/minecraft/textures/block/redstone_dust_line1/mat.yml +++ b/src/assets/minecraft/textures/block/redstone_dust_line1/mat.yml @@ -1,5 +1,5 @@ wrap-x: false -color-tint: '#D00000' +tint-color: '#D00000' color: value-red: 235 value-green: 235 diff --git a/src/assets/minecraft/textures/block/redstone_torch_off/mat.yml b/src/assets/minecraft/textures/block/redstone_torch_off/mat.yml index 292d2057..9a0b51ea 100644 --- a/src/assets/minecraft/textures/block/redstone_torch_off/mat.yml +++ b/src/assets/minecraft/textures/block/redstone_torch_off/mat.yml @@ -5,7 +5,7 @@ height: normal: strength: 0.4 noise: 1 - filter: sobel-low + method: sobel-low occlusion: value: 0 filters: diff --git a/src/assets/minecraft/textures/block/repeater/mat.yml b/src/assets/minecraft/textures/block/repeater/mat.yml index e3cb3f51..d840f21d 100644 --- a/src/assets/minecraft/textures/block/repeater/mat.yml +++ b/src/assets/minecraft/textures/block/repeater/mat.yml @@ -1,16 +1,12 @@ -alpha: - value: 255 height: scale: 0.3 edge-fade-x: 1 edge-fade-y: 1 normal: strength: 0.4 - filter: sobel-high + method: sobel-high occlusion: quality: 0.1 z-bias: 0 z-scale: 5 step-distance: 0.2 -smooth: {} -f0: {} diff --git a/src/assets/minecraft/textures/block/repeater_on/mat.yml b/src/assets/minecraft/textures/block/repeater_on/mat.yml index 397b2b4c..2cb9b916 100644 --- a/src/assets/minecraft/textures/block/repeater_on/mat.yml +++ b/src/assets/minecraft/textures/block/repeater_on/mat.yml @@ -1,18 +1,14 @@ -alpha: - value: 255 height: scale: 0.3 edge-fade-x: 1 edge-fade-y: 1 normal: strength: 0.4 - filter: sobel-high + method: sobel-high occlusion: quality: 0.1 z-bias: 0 z-scale: 5 step-distance: 0.2 -smooth: {} -f0: {} emissive: scale: 0.3 diff --git a/src/assets/minecraft/textures/block/repeating_command_block_back/mat.yml b/src/assets/minecraft/textures/block/repeating_command_block_back/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/repeating_command_block_back/mat.yml +++ b/src/assets/minecraft/textures/block/repeating_command_block_back/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/repeating_command_block_front/mat.yml b/src/assets/minecraft/textures/block/repeating_command_block_front/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/repeating_command_block_front/mat.yml +++ b/src/assets/minecraft/textures/block/repeating_command_block_front/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/repeating_command_block_side/mat.yml b/src/assets/minecraft/textures/block/repeating_command_block_side/mat.yml index b76c1f66..fafa2992 100644 --- a/src/assets/minecraft/textures/block/repeating_command_block_side/mat.yml +++ b/src/assets/minecraft/textures/block/repeating_command_block_side/mat.yml @@ -12,3 +12,5 @@ occlusion: z-bias: 1 f0: value: 0.04 +emissive: + scale: 2 diff --git a/src/assets/minecraft/textures/block/scaffolding_bottom/mat.yml b/src/assets/minecraft/textures/block/scaffolding_bottom/mat.yml index ca2cf677..167aae33 100644 --- a/src/assets/minecraft/textures/block/scaffolding_bottom/mat.yml +++ b/src/assets/minecraft/textures/block/scaffolding_bottom/mat.yml @@ -6,7 +6,7 @@ height: value: 0 normal: strength: 1.2 - filter: sobel-high + method: sobel-high occlusion: quality: 0.1 z-bias: 0 diff --git a/src/assets/minecraft/textures/block/scaffolding_side/mat.yml b/src/assets/minecraft/textures/block/scaffolding_side/mat.yml index fe1aa55b..6fc86467 100644 --- a/src/assets/minecraft/textures/block/scaffolding_side/mat.yml +++ b/src/assets/minecraft/textures/block/scaffolding_side/mat.yml @@ -2,15 +2,12 @@ height: value: 0 normal: strength: 1.4 - filter: sobel-high + method: sobel-high occlusion: quality: 0.1 z-bias: 0 z-scale: 5 step-distance: 0.2 -smooth: {} -f0: {} -porosity: {} create-inventory: true wrap-x: false wrap-y: false diff --git a/src/assets/minecraft/textures/block/scaffolding_top/mat.yml b/src/assets/minecraft/textures/block/scaffolding_top/mat.yml index 60ff132a..167cfa02 100644 --- a/src/assets/minecraft/textures/block/scaffolding_top/mat.yml +++ b/src/assets/minecraft/textures/block/scaffolding_top/mat.yml @@ -3,13 +3,10 @@ height: edge-fade-x: 0.1 edge-fade-y: 0.1 normal: - filter: sobel-low + method: sobel-low occlusion: quality: 0.1 z-bias: 0 z-scale: 6 step-distance: 0.2 -smooth: {} -f0: {} -porosity: {} create-inventory: true diff --git a/src/assets/minecraft/textures/block/seagrass/mat.yml b/src/assets/minecraft/textures/block/seagrass/mat.yml index 7b74452d..0b7e0b3b 100644 --- a/src/assets/minecraft/textures/block/seagrass/mat.yml +++ b/src/assets/minecraft/textures/block/seagrass/mat.yml @@ -1,6 +1,5 @@ wrap-x: false wrap-y: false -model-type: cross color: value-red: 45 value-green: 120 diff --git a/src/assets/minecraft/textures/block/smithing_table_side/mat.yml b/src/assets/minecraft/textures/block/smithing_table_side/mat.yml index 6c9b6e7d..897228d7 100644 --- a/src/assets/minecraft/textures/block/smithing_table_side/mat.yml +++ b/src/assets/minecraft/textures/block/smithing_table_side/mat.yml @@ -1,10 +1,8 @@ -alpha: - value: 255 height: scale: 0.7 normal: strength: 0.6 - filter: sobel-low + method: sobel-low occlusion: z-bias: 0 z-scale: 5 diff --git a/src/assets/minecraft/textures/block/smoker_bottom/mat.yml b/src/assets/minecraft/textures/block/smoker_bottom/mat.yml index 1e099dda..2f6b17b1 100644 --- a/src/assets/minecraft/textures/block/smoker_bottom/mat.yml +++ b/src/assets/minecraft/textures/block/smoker_bottom/mat.yml @@ -1,9 +1,7 @@ create-inventory: true -alpha: - value: 255 normal: strength: 3 - filter: sobel-high + method: sobel-high occlusion: z-scale: 6 step-distance: 0.15 diff --git a/src/assets/minecraft/textures/block/smoker_front/mat.yml b/src/assets/minecraft/textures/block/smoker_front/mat.yml index 0a213e20..0aa1bf6e 100644 --- a/src/assets/minecraft/textures/block/smoker_front/mat.yml +++ b/src/assets/minecraft/textures/block/smoker_front/mat.yml @@ -1,10 +1,7 @@ create-inventory: true -alpha: - value: 255 -height: {} normal: strength: 3 - filter: sobel-low + method: sobel-low occlusion: z-scale: 3 step-distance: 0.15 diff --git a/src/assets/minecraft/textures/block/smoker_side/mat.yml b/src/assets/minecraft/textures/block/smoker_side/mat.yml index 1132842b..de1aed2a 100644 --- a/src/assets/minecraft/textures/block/smoker_side/mat.yml +++ b/src/assets/minecraft/textures/block/smoker_side/mat.yml @@ -1,11 +1,9 @@ create-inventory: true -alpha: - value: 255 height: scale: 0.8 normal: strength: 2 - filter: sobel-low + method: sobel-low occlusion: z-scale: 3 step-distance: 0.15 diff --git a/src/assets/minecraft/textures/block/smoker_top/mat.yml b/src/assets/minecraft/textures/block/smoker_top/mat.yml index cd9c8252..dc6b0d5c 100644 --- a/src/assets/minecraft/textures/block/smoker_top/mat.yml +++ b/src/assets/minecraft/textures/block/smoker_top/mat.yml @@ -1,12 +1,7 @@ create-inventory: true -alpha: - value: 255 -height: {} normal: strength: 3 - filter: sobel-low + method: sobel-low occlusion: z-scale: 6 step-distance: 0.15 -f0: {} -porosity: {} diff --git a/src/assets/minecraft/textures/block/soul_fire_0/mat.yml b/src/assets/minecraft/textures/block/soul_fire_0/mat.yml index 984f11dd..b2b4ceb8 100644 --- a/src/assets/minecraft/textures/block/soul_fire_0/mat.yml +++ b/src/assets/minecraft/textures/block/soul_fire_0/mat.yml @@ -1,5 +1,4 @@ wrap-x: false wrap-y: false -model-type: cross emissive: scale: 0.8 diff --git a/src/assets/minecraft/textures/block/soul_fire_1/mat.yml b/src/assets/minecraft/textures/block/soul_fire_1/mat.yml index 984f11dd..b2b4ceb8 100644 --- a/src/assets/minecraft/textures/block/soul_fire_1/mat.yml +++ b/src/assets/minecraft/textures/block/soul_fire_1/mat.yml @@ -1,5 +1,4 @@ wrap-x: false wrap-y: false -model-type: cross emissive: scale: 0.8 diff --git a/src/assets/minecraft/textures/block/soul_lantern/color.png b/src/assets/minecraft/textures/block/soul_lantern/color.png new file mode 100644 index 00000000..1144bb63 Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/color.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/emissive.png b/src/assets/minecraft/textures/block/soul_lantern/emissive.png index 2898a1c7..205625c0 100644 Binary files a/src/assets/minecraft/textures/block/soul_lantern/emissive.png and b/src/assets/minecraft/textures/block/soul_lantern/emissive.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/hcm.png b/src/assets/minecraft/textures/block/soul_lantern/hcm.png index 0567a70e..bd98c694 100644 Binary files a/src/assets/minecraft/textures/block/soul_lantern/hcm.png and b/src/assets/minecraft/textures/block/soul_lantern/hcm.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/height.png b/src/assets/minecraft/textures/block/soul_lantern/height.png index ffcb76d3..ce769b69 100644 Binary files a/src/assets/minecraft/textures/block/soul_lantern/height.png and b/src/assets/minecraft/textures/block/soul_lantern/height.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/mat.yml b/src/assets/minecraft/textures/block/soul_lantern/mat.yml index 4f9f4f3f..62a2abe7 100644 --- a/src/assets/minecraft/textures/block/soul_lantern/mat.yml +++ b/src/assets/minecraft/textures/block/soul_lantern/mat.yml @@ -1,15 +1,52 @@ +wrap-x: false wrap-y: false -model-file: template_lantern -height: - scale: 0.8 normal: method: sobel-low - strength: 0.6 + strength: 1.5 occlusion: step-distance: 0.15 z-bias: 0 - z-scale: 2 -smooth: - value: 0.82 -porosity: - value: 0 + z-scale: 3 +filters: +- name: side + left: 0 + top: 0.125 + width: 0.375 + height: 0.4375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: top + left: 0 + top: 0.5625 + width: 0.375 + height: 0.375 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 +- name: glass + left: 0.0625 + top: 0.1875 + width: 0.25 + height: 0.3125 + normal-curve-x: 90 +- name: top2 + left: 0.0625 + top: 0 + width: 0.25 + height: 0.125 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-x: 0.4 + normal-radius-y: 0.8 +- name: top3 + left: 0.0625 + top: 0.625 + width: 0.25 + height: 0.25 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.3 + normal-radius-y: 0.3 diff --git a/src/assets/minecraft/textures/block/soul_lantern/normal.png b/src/assets/minecraft/textures/block/soul_lantern/normal.png new file mode 100644 index 00000000..44065b63 Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/normal.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/occlusion.png b/src/assets/minecraft/textures/block/soul_lantern/occlusion.png index 4852586c..392dfa66 100644 Binary files a/src/assets/minecraft/textures/block/soul_lantern/occlusion.png and b/src/assets/minecraft/textures/block/soul_lantern/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/opacity.png b/src/assets/minecraft/textures/block/soul_lantern/opacity.png new file mode 100644 index 00000000..aa204d6e Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/opacity.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/smooth.png b/src/assets/minecraft/textures/block/soul_lantern/smooth.png new file mode 100644 index 00000000..e8e36fe6 Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/smooth.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/albedo.png b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/albedo.png similarity index 100% rename from src/assets/minecraft/textures/block/soul_lantern/albedo.png rename to src/assets/minecraft/textures/block/soul_lantern/v1.ignore/albedo.png diff --git a/src/assets/minecraft/textures/block/soul_lantern/alpha.png b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/alpha.png similarity index 100% rename from src/assets/minecraft/textures/block/soul_lantern/alpha.png rename to src/assets/minecraft/textures/block/soul_lantern/v1.ignore/alpha.png diff --git a/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/bump.xcf b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/bump.xcf new file mode 100644 index 00000000..bf20b34a Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/bump.xcf differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/emissive.png b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/emissive.png new file mode 100644 index 00000000..2898a1c7 Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/emissive.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/f0.png b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/f0.png new file mode 100644 index 00000000..3f152e01 Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/f0.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/hcm.png b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/hcm.png new file mode 100644 index 00000000..0567a70e Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/hcm.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/height.png b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/height.png new file mode 100644 index 00000000..ffcb76d3 Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/height.xcf b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/height.xcf new file mode 100644 index 00000000..bf20b34a Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/height.xcf differ diff --git a/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/mat.yml b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/mat.yml new file mode 100644 index 00000000..47c5f705 --- /dev/null +++ b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/mat.yml @@ -0,0 +1,15 @@ +wrap-y: false +model: template_lantern +height: + scale: 0.8 +normal: + method: sobel-low + strength: 0.6 +occlusion: + step-distance: 0.15 + z-bias: 0 + z-scale: 2 +smooth: + value: 0.82 +porosity: + value: 0 diff --git a/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/occlusion.png b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/occlusion.png new file mode 100644 index 00000000..4852586c Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_lantern/v1.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/soul_sand.ignore/mat.yml b/src/assets/minecraft/textures/block/soul_sand.ignore/mat.yml index f0f689c4..bc0bcfdb 100644 --- a/src/assets/minecraft/textures/block/soul_sand.ignore/mat.yml +++ b/src/assets/minecraft/textures/block/soul_sand.ignore/mat.yml @@ -1,5 +1,3 @@ -alpha: - value: 255 albedo: value-red: 86 value-green: 66 @@ -9,7 +7,7 @@ height: normal: strength: 0.3 noise: 3 - filter: sobel-high + method: sobel-high occlusion: z-bias: 0 z-scale: 4 diff --git a/src/assets/minecraft/textures/block/soul_torch/mat.yml b/src/assets/minecraft/textures/block/soul_torch/mat.yml index 90dc8d5f..6491cc78 100644 --- a/src/assets/minecraft/textures/block/soul_torch/mat.yml +++ b/src/assets/minecraft/textures/block/soul_torch/mat.yml @@ -6,7 +6,7 @@ height: normal: strength: 0.4 noise: 1 - filter: sobel-low + method: sobel-low occlusion: value: 0 f0: diff --git a/src/assets/minecraft/textures/block/spruce_fence_post/mat.yml b/src/assets/minecraft/textures/block/spruce_fence_post/mat.yml index 514b26ed..e9872048 100644 --- a/src/assets/minecraft/textures/block/spruce_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/spruce_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: spruce_fence_post height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: north width: 0.25 diff --git a/src/assets/minecraft/textures/block/spruce_fence_side/mat.yml b/src/assets/minecraft/textures/block/spruce_fence_side/mat.yml index 6475a547..ddbe8a0a 100644 --- a/src/assets/minecraft/textures/block/spruce_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/spruce_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: spruce_fence_side_north height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: up width: 0.125 diff --git a/src/assets/minecraft/textures/block/stained_glass/black.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/black.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/black.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/black.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/blue.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/blue.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/blue.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/blue.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/brown.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/brown.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/brown.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/brown.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/cyan.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/cyan.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/cyan.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/cyan.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/gray.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/gray.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/gray.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/gray.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/green.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/green.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/green.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/green.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/light_blue.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/light_blue.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/light_blue.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/light_blue.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/light_gray.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/light_gray.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/light_gray.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/light_gray.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/lime.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/lime.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/lime.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/lime.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/magenta.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/magenta.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/magenta.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/magenta.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/orange.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/orange.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/orange.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/orange.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/pink.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/pink.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/pink.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/pink.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/purple.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/purple.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/purple.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/purple.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/red.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/red.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/red.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/red.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/white.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/white.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/white.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/white.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass/yellow.pbr.yml b/src/assets/minecraft/textures/block/stained_glass/yellow.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass/yellow.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass/yellow.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/black.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/black.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/black.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/black.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/blue.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/blue.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/blue.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/blue.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/brown.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/brown.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/brown.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/brown.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/cyan.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/cyan.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/cyan.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/cyan.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/gray.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/gray.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/gray.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/gray.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/green.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/green.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/green.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/green.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/light_blue.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/light_blue.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/light_blue.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/light_blue.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/light_gray.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/light_gray.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/light_gray.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/light_gray.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/lime.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/lime.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/lime.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/lime.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/magenta.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/magenta.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/magenta.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/magenta.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/orange.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/orange.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/orange.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/orange.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/pink.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/pink.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/pink.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/pink.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/purple.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/purple.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/purple.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/purple.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/red.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/red.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/red.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/red.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/white.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/white.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/white.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/white.mat.yml diff --git a/src/assets/minecraft/textures/block/stained_glass_pane_top/yellow.pbr.yml b/src/assets/minecraft/textures/block/stained_glass_pane_top/yellow.mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/stained_glass_pane_top/yellow.pbr.yml rename to src/assets/minecraft/textures/block/stained_glass_pane_top/yellow.mat.yml diff --git a/src/assets/minecraft/textures/block/stonecutter_bottom/mat.yml b/src/assets/minecraft/textures/block/stonecutter_bottom/mat.yml index 5c9f375f..0bf47995 100644 --- a/src/assets/minecraft/textures/block/stonecutter_bottom/mat.yml +++ b/src/assets/minecraft/textures/block/stonecutter_bottom/mat.yml @@ -1,7 +1,7 @@ height: scale: 0.5 normal: - filter: sobel-low + method: sobel-low occlusion: quality: 0.1 z-bias: 0 diff --git a/src/assets/minecraft/textures/block/stonecutter_side/mat.yml b/src/assets/minecraft/textures/block/stonecutter_side/mat.yml index 2d3f8eb8..86fbb612 100644 --- a/src/assets/minecraft/textures/block/stonecutter_side/mat.yml +++ b/src/assets/minecraft/textures/block/stonecutter_side/mat.yml @@ -1,14 +1,11 @@ -alpha: {} -height: {} normal: noise: 2 - filter: sobel-low + method: sobel-low occlusion: quality: 0.1 z-bias: 0 z-scale: 5 step-distance: 0.2 -f0: {} create-inventory: true wrap-x: false wrap-y: false diff --git a/src/assets/minecraft/textures/block/stonecutter_top/mat.yml b/src/assets/minecraft/textures/block/stonecutter_top/mat.yml index 1247ae93..86fbb612 100644 --- a/src/assets/minecraft/textures/block/stonecutter_top/mat.yml +++ b/src/assets/minecraft/textures/block/stonecutter_top/mat.yml @@ -1,15 +1,11 @@ -alpha: - value: 255 -height: {} normal: noise: 2 - filter: sobel-low + method: sobel-low occlusion: quality: 0.1 z-bias: 0 z-scale: 5 step-distance: 0.2 -f0: {} create-inventory: true wrap-x: false wrap-y: false diff --git a/src/assets/minecraft/textures/block/stripped_dark_oak_log_top/smooth_dark_log_top.png b/src/assets/minecraft/textures/block/stripped_dark_oak_log_top/smooth_dark_log_top.png new file mode 100644 index 00000000..f456516f Binary files /dev/null and b/src/assets/minecraft/textures/block/stripped_dark_oak_log_top/smooth_dark_log_top.png differ diff --git a/src/assets/minecraft/textures/block/sugar_cane/mat.yml b/src/assets/minecraft/textures/block/sugar_cane/mat.yml index f7e15b93..8d967598 100644 --- a/src/assets/minecraft/textures/block/sugar_cane/mat.yml +++ b/src/assets/minecraft/textures/block/sugar_cane/mat.yml @@ -1,4 +1,3 @@ -model-type: cross height: texture: opacity.png scale: 0.1 diff --git a/src/assets/minecraft/textures/block/sweet_berry_bush_stage0/mat.yml b/src/assets/minecraft/textures/block/sweet_berry_bush_stage0/mat.yml index 6c24537b..79a5a808 100644 --- a/src/assets/minecraft/textures/block/sweet_berry_bush_stage0/mat.yml +++ b/src/assets/minecraft/textures/block/sweet_berry_bush_stage0/mat.yml @@ -1,6 +1,5 @@ wrap-x: false wrap-y: false -model-type: cross color: value-red: 41 value-green: 84 diff --git a/src/assets/minecraft/textures/block/sweet_berry_bush_stage1/mat.yml b/src/assets/minecraft/textures/block/sweet_berry_bush_stage1/mat.yml index 51d0bc17..7adaf84b 100644 --- a/src/assets/minecraft/textures/block/sweet_berry_bush_stage1/mat.yml +++ b/src/assets/minecraft/textures/block/sweet_berry_bush_stage1/mat.yml @@ -1,6 +1,5 @@ wrap-x: false wrap-y: false -model-type: cross color: value-red: 49 value-green: 97 diff --git a/src/assets/minecraft/textures/block/torch/albedo.png b/src/assets/minecraft/textures/block/torch/albedo.png deleted file mode 100644 index 97073e22..00000000 Binary files a/src/assets/minecraft/textures/block/torch/albedo.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/torch/alpha.png b/src/assets/minecraft/textures/block/torch/alpha.png deleted file mode 100644 index 6d033463..00000000 Binary files a/src/assets/minecraft/textures/block/torch/alpha.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/torch/color.png b/src/assets/minecraft/textures/block/torch/color.png new file mode 100644 index 00000000..96415d5e Binary files /dev/null and b/src/assets/minecraft/textures/block/torch/color.png differ diff --git a/src/assets/minecraft/textures/block/torch/height.png b/src/assets/minecraft/textures/block/torch/height.png index 7f98e9f2..4a9fd4fe 100644 Binary files a/src/assets/minecraft/textures/block/torch/height.png and b/src/assets/minecraft/textures/block/torch/height.png differ diff --git a/src/assets/minecraft/textures/block/torch/mat.yml b/src/assets/minecraft/textures/block/torch/mat.yml index 9f361a00..ffefb2f2 100644 --- a/src/assets/minecraft/textures/block/torch/mat.yml +++ b/src/assets/minecraft/textures/block/torch/mat.yml @@ -1,19 +1,21 @@ publish-item: true wrap-x: false wrap-y: false +model: block/torch height: - value: 0 + scale: 0 normal: noise: 1 - method: sobel-low - strength: 0.4 + method: sobel-high + strength: 0.1 occlusion: - step-distance: 0.15 - z-bias: 0 + step-distance: 0.3 + z-bias: 0.1 + z-scale: 2 f0: value: 0.04 filters: -- name: Torch +- name: wood left: 0.4375 top: 0.5 width: 0.125 diff --git a/src/assets/minecraft/textures/block/torch/occlusion.png b/src/assets/minecraft/textures/block/torch/occlusion.png new file mode 100644 index 00000000..581bf907 Binary files /dev/null and b/src/assets/minecraft/textures/block/torch/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/torch/opacity.png b/src/assets/minecraft/textures/block/torch/opacity.png new file mode 100644 index 00000000..6254b125 Binary files /dev/null and b/src/assets/minecraft/textures/block/torch/opacity.png differ diff --git a/src/assets/minecraft/textures/block/warped_fence_post/mat.yml b/src/assets/minecraft/textures/block/warped_fence_post/mat.yml index 61e2ea21..7a02f731 100644 --- a/src/assets/minecraft/textures/block/warped_fence_post/mat.yml +++ b/src/assets/minecraft/textures/block/warped_fence_post/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: warped_fence_post height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: north width: 0.25 diff --git a/src/assets/minecraft/textures/block/warped_fence_side/mat.yml b/src/assets/minecraft/textures/block/warped_fence_side/mat.yml index 1b1ca2c6..00c728f0 100644 --- a/src/assets/minecraft/textures/block/warped_fence_side/mat.yml +++ b/src/assets/minecraft/textures/block/warped_fence_side/mat.yml @@ -1,3 +1,4 @@ +publish-item: true model: warped_fence_side_north height: shift: -0.02 @@ -18,7 +19,6 @@ f0: value: 0.044 porosity: value: 0.8 -ctm: {} filters: - name: up width: 0.125 diff --git a/src/assets/minecraft/textures/block/warped_nylium/mat.yml b/src/assets/minecraft/textures/block/warped_nylium/mat.yml index 69ef7c01..9372f862 100644 --- a/src/assets/minecraft/textures/block/warped_nylium/mat.yml +++ b/src/assets/minecraft/textures/block/warped_nylium/mat.yml @@ -1,18 +1,14 @@ -alpha: - value: 255 -albedo: {} height: scale: 0.32 normal: strength: 0.6 noise: 5 - filter: sobel3 + method: sobel3 occlusion: quality: 0.1 z-bias: 0 z-scale: 5 step-distance: 0.2 -smooth: {} f0: value: 0.02 sss: diff --git a/src/assets/minecraft/textures/entity/banner_base/height.png b/src/assets/minecraft/textures/entity/banner_base/height.png index 4ef75961..66fe4e03 100644 Binary files a/src/assets/minecraft/textures/entity/banner_base/height.png and b/src/assets/minecraft/textures/entity/banner_base/height.png differ diff --git a/src/assets/minecraft/textures/entity/banner_base/mat.yml b/src/assets/minecraft/textures/entity/banner_base/mat.yml index 9c8e9927..4449099e 100644 --- a/src/assets/minecraft/textures/entity/banner_base/mat.yml +++ b/src/assets/minecraft/textures/entity/banner_base/mat.yml @@ -4,15 +4,14 @@ wrap-y: false height: scale: 0 normal: - noise: 6 + noise: 2 method: sobel5 - strength: 5 + strength: 3.7628 occlusion: step-distance: 0.15 z-bias: 0.8 z-scale: 4 +smooth: + value: 0.2271 f0: value: 0.03 -sss: - scale: 2 -ctm: {} diff --git a/src/assets/minecraft/textures/entity/banner_base/normal.png b/src/assets/minecraft/textures/entity/banner_base/normal-x.png similarity index 100% rename from src/assets/minecraft/textures/entity/banner_base/normal.png rename to src/assets/minecraft/textures/entity/banner_base/normal-x.png diff --git a/src/assets/minecraft/textures/entity/banner_base/sss.png b/src/assets/minecraft/textures/entity/banner_base/sss.png index 97114c6d..b3535528 100644 Binary files a/src/assets/minecraft/textures/entity/banner_base/sss.png and b/src/assets/minecraft/textures/entity/banner_base/sss.png differ diff --git a/src/assets/minecraft/textures/entity/bear/polarbear/mat.yml b/src/assets/minecraft/textures/entity/bear/polarbear/mat.yml index 2abde5c3..63e9e3f5 100644 --- a/src/assets/minecraft/textures/entity/bear/polarbear/mat.yml +++ b/src/assets/minecraft/textures/entity/bear/polarbear/mat.yml @@ -17,7 +17,7 @@ occlusion: smooth: value: 0.08 sss: - value: 0.24 + scale: 0.6032 filters: - name: head-up left: 0.0546875 diff --git a/src/assets/minecraft/textures/entity/bear/polarbear/sss.png b/src/assets/minecraft/textures/entity/bear/polarbear/sss.png new file mode 100644 index 00000000..1d782c96 Binary files /dev/null and b/src/assets/minecraft/textures/entity/bear/polarbear/sss.png differ diff --git a/src/assets/minecraft/textures/entity/bell/bell_body/mat.yml b/src/assets/minecraft/textures/entity/bell/bell_body/mat.yml index 53c4f92a..6560215f 100644 --- a/src/assets/minecraft/textures/entity/bell/bell_body/mat.yml +++ b/src/assets/minecraft/textures/entity/bell/bell_body/mat.yml @@ -2,7 +2,7 @@ texture-size: 64 wrap-x: false wrap-y: false color: - value: '#856641' + value: '#B7A186' height: scale: 3 normal: diff --git a/src/assets/minecraft/textures/entity/blaze/mat.yml b/src/assets/minecraft/textures/entity/blaze/mat.yml index bafbe9d3..36f98898 100644 --- a/src/assets/minecraft/textures/entity/blaze/mat.yml +++ b/src/assets/minecraft/textures/entity/blaze/mat.yml @@ -2,7 +2,7 @@ texture-width: 128 texture-height: 64 wrap-x: false wrap-y: false -model-file: entity/blaze +model: entity/blaze height: value: 0 occlusion: diff --git a/src/assets/minecraft/textures/entity/ghast/ghast/color.png b/src/assets/minecraft/textures/entity/ghast/ghast/color.png index 65016be2..edf9ebba 100644 Binary files a/src/assets/minecraft/textures/entity/ghast/ghast/color.png and b/src/assets/minecraft/textures/entity/ghast/ghast/color.png differ diff --git a/src/assets/minecraft/textures/entity/ghast/ghast/height.png b/src/assets/minecraft/textures/entity/ghast/ghast/height.png index 0ea7d2cf..a6dbc1c1 100644 Binary files a/src/assets/minecraft/textures/entity/ghast/ghast/height.png and b/src/assets/minecraft/textures/entity/ghast/ghast/height.png differ diff --git a/src/assets/minecraft/textures/entity/ghast/ghast/mat.yml b/src/assets/minecraft/textures/entity/ghast/ghast/mat.yml index a6e3157e..4c980627 100644 --- a/src/assets/minecraft/textures/entity/ghast/ghast/mat.yml +++ b/src/assets/minecraft/textures/entity/ghast/ghast/mat.yml @@ -1,21 +1,23 @@ texture-width: 256 texture-height: 128 +wrap-x: false +wrap-y: false model: entity/ghast height: scale: 0 normal: noise: 3 - method: sobel3 - strength: 2 + method: sobel5 + strength: 1.8102 occlusion: - z-scale: 3 + step-distance: 0.3 + z-scale: 10 smooth: value: 0.3 f0: value: 0.02 sss: value: 0.3 -ctm: {} filters: - name: Body-Up left: 0.25 diff --git a/src/assets/minecraft/textures/entity/ghast/ghast/occlusion.png b/src/assets/minecraft/textures/entity/ghast/ghast/occlusion.png index 90816f62..eab7300b 100644 Binary files a/src/assets/minecraft/textures/entity/ghast/ghast/occlusion.png and b/src/assets/minecraft/textures/entity/ghast/ghast/occlusion.png differ diff --git a/src/assets/minecraft/textures/entity/ghast/ghast_shooting.ignore/mat.yml b/src/assets/minecraft/textures/entity/ghast/ghast_shooting.ignore/mat.yml index fe953cb6..a3d4740b 100644 --- a/src/assets/minecraft/textures/entity/ghast/ghast_shooting.ignore/mat.yml +++ b/src/assets/minecraft/textures/entity/ghast/ghast_shooting.ignore/mat.yml @@ -1 +1 @@ -model-file: entity/ghast +model: entity/ghast diff --git a/src/assets/minecraft/textures/entity/guardian/mat.yml b/src/assets/minecraft/textures/entity/guardian/mat.yml index 0d0c8c22..3316247a 100644 --- a/src/assets/minecraft/textures/entity/guardian/mat.yml +++ b/src/assets/minecraft/textures/entity/guardian/mat.yml @@ -9,12 +9,11 @@ occlusion: z-bias: 0.02 z-scale: 4 smooth: - scale: 0.8 + scale: 0.6658 f0: value: 0.053 emissive: scale: 3 -ctm: {} filters: - name: body-top left: 0.25 diff --git a/src/assets/minecraft/textures/entity/illager/pillager/mat.yml b/src/assets/minecraft/textures/entity/illager/pillager/mat.yml index bb7751e4..eb77cc50 100644 --- a/src/assets/minecraft/textures/entity/illager/pillager/mat.yml +++ b/src/assets/minecraft/textures/entity/illager/pillager/mat.yml @@ -9,6 +9,8 @@ normal: occlusion: step-distance: 0.15 z-scale: 2 +smooth: + scale: 0.6491 filters: - name: head-top left: 0.125 diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/albedo.png b/src/assets/minecraft/textures/entity/piglin/piglin/albedo.png deleted file mode 100644 index 22b3aed1..00000000 Binary files a/src/assets/minecraft/textures/entity/piglin/piglin/albedo.png and /dev/null differ diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/bump.png b/src/assets/minecraft/textures/entity/piglin/piglin/bump.png new file mode 100644 index 00000000..94feb201 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/piglin/bump.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/color.png b/src/assets/minecraft/textures/entity/piglin/piglin/color.png new file mode 100644 index 00000000..259b6877 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/piglin/color.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/albedo.xcf b/src/assets/minecraft/textures/entity/piglin/piglin/color.xcf similarity index 100% rename from src/assets/minecraft/textures/entity/piglin/piglin/albedo.xcf rename to src/assets/minecraft/textures/entity/piglin/piglin/color.xcf diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/height.png b/src/assets/minecraft/textures/entity/piglin/piglin/height.png index 94feb201..72587b17 100644 Binary files a/src/assets/minecraft/textures/entity/piglin/piglin/height.png and b/src/assets/minecraft/textures/entity/piglin/piglin/height.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/mat.yml b/src/assets/minecraft/textures/entity/piglin/piglin/mat.yml index 50772ed1..b689ee4a 100644 --- a/src/assets/minecraft/textures/entity/piglin/piglin/mat.yml +++ b/src/assets/minecraft/textures/entity/piglin/piglin/mat.yml @@ -1,12 +1,638 @@ texture-size: 128 -wrap-x: true +wrap-x: false wrap-y: false height: - scale: 0 + scale: 0.8 normal: - method: sobel3 - strength: 2 + method: sobel-high + strength: 3 occlusion: - step-distance: 0.15 - z-bias: 0 - z-scale: 5 + step-distance: 0.1 + z-bias: 1 + z-scale: 6 +filters: +- name: head-up + left: 0.125 + top: 0 + width: 0.15625 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-down + left: 0.28125 + top: 0 + width: 0.15625 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-north + left: 0.125 + top: 0.125 + width: 0.15625 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-south + left: 0.40625 + top: 0.125 + width: 0.15625 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-west + left: 0.28125 + top: 0.125 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-east + left: 0 + top: 0.125 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head2-up + left: 0.5 + top: 0.015625 + width: 0.0625 + height: 0.015625 + normal-curve-bottom: 45 +- name: head2-down + left: 0.5625 + top: 0.015625 + width: 0.0625 + height: 0.015625 +- name: head2-north + left: 0.5 + top: 0.03125 + width: 0.0625 + height: 0.0625 + normal-curve-top: 45 + normal-radius-top: 0.4 +- name: head2-south + left: 0.578125 + top: 0.03125 + width: 0.0625 + height: 0.0625 +- name: head2-west + left: 0.5625 + top: 0.03125 + width: 0.015625 + height: 0.0625 + normal-curve-left: 45 +- name: head2-east + left: 0.484375 + top: 0.03125 + width: 0.015625 + height: 0.0625 + normal-curve-right: 45 +- name: head3-up + left: 0.046875 + top: 0.0625 + width: 0.015625 + height: 0.015625 +- name: head3-down + left: 0.0625 + top: 0.0625 + width: 0.015625 + height: 0.015625 +- name: head3-north + left: 0.046875 + top: 0.078125 + width: 0.015625 + height: 0.03125 +- name: head3-south + left: 0.078125 + top: 0.078125 + width: 0.015625 + height: 0.03125 +- name: head3-west + left: 0.0625 + top: 0.078125 + width: 0.015625 + height: 0.03125 +- name: head3-east + left: 0.03125 + top: 0.078125 + width: 0.015625 + height: 0.03125 +- name: head4-up + left: 0.046875 + top: 0 + width: 0.015625 + height: 0.015625 +- name: head4-down + left: 0.0625 + top: 0 + width: 0.015625 + height: 0.015625 +- name: head4-north + left: 0.046875 + top: 0.015625 + width: 0.015625 + height: 0.03125 +- name: head4-south + left: 0.078125 + top: 0.015625 + width: 0.015625 + height: 0.03125 +- name: head4-west + left: 0.0625 + top: 0.015625 + width: 0.015625 + height: 0.03125 +- name: head4-east + left: 0.03125 + top: 0.015625 + width: 0.015625 + height: 0.03125 +- name: left_ear-up + left: 0.859375 + top: 0.09375 + width: 0.015625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.4 +- name: left_ear-down + left: 0.875 + top: 0.09375 + width: 0.015625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.4 +- name: left_ear-north + left: 0.859375 + top: 0.15625 + width: 0.015625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: left_ear-south + left: 0.9375 + top: 0.15625 + width: 0.015625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: left_ear-west + left: 0.875 + top: 0.15625 + width: 0.0625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: left_ear-east + left: 0.796875 + top: 0.15625 + width: 0.0625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: right_ear-up + left: 0.671875 + top: 0.09375 + width: 0.015625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.4 +- name: right_ear-down + left: 0.6875 + top: 0.09375 + width: 0.015625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.4 +- name: right_ear-north + left: 0.671875 + top: 0.15625 + width: 0.015625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: right_ear-south + left: 0.75 + top: 0.15625 + width: 0.015625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: right_ear-west + left: 0.6875 + top: 0.15625 + width: 0.0625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: right_ear-east + left: 0.609375 + top: 0.15625 + width: 0.0625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: body-up + left: 0.3125 + top: 0.25 + width: 0.125 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: body-down + left: 0.4375 + top: 0.25 + width: 0.125 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: body-north + left: 0.3125 + top: 0.3125 + width: 0.125 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.4 + normal-radius-bottom: 0.2 +- name: body-south + left: 0.5 + top: 0.3125 + width: 0.125 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.4 + normal-radius-bottom: 0.2 +- name: body-west + left: 0.4375 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.4 + normal-radius-bottom: 0.2 +- name: body-east + left: 0.25 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.4 + normal-radius-bottom: 0.2 +- name: jacket-up + left: 0.3125 + top: 0.5 + width: 0.125 + height: 0.0625 +- name: jacket-down + left: 0.4375 + top: 0.5 + width: 0.125 + height: 0.0625 +- name: jacket-north + left: 0.3125 + top: 0.5625 + width: 0.125 + height: 0.1875 +- name: jacket-south + left: 0.5 + top: 0.5625 + width: 0.125 + height: 0.1875 +- name: jacket-west + left: 0.4375 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: jacket-east + left: 0.25 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: left_arm-up + left: 0.5625 + top: 0.75 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: left_arm-down + left: 0.625 + top: 0.75 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: left_arm-north + left: 0.5625 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: left_arm-south + left: 0.6875 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: left_arm-west + left: 0.625 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: left_arm-east + left: 0.5 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: left_sleeve-up + left: 0.8125 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_sleeve-down + left: 0.875 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_sleeve-north + left: 0.8125 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_sleeve-south + left: 0.9375 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_sleeve-west + left: 0.875 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_sleeve-east + left: 0.75 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: right_arm-up + left: 0.6875 + top: 0.25 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: right_arm-down + left: 0.75 + top: 0.25 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: right_arm-north + left: 0.6875 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: right_arm-south + left: 0.8125 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: right_arm-west + left: 0.625 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: right_arm-east + left: 0.75 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: right_sleeve-up + left: 0.6875 + top: 0.5 + width: 0.0625 + height: 0.0625 +- name: right_sleeve-down + left: 0.75 + top: 0.5 + width: 0.0625 + height: 0.0625 +- name: right_sleeve-north + left: 0.6875 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_sleeve-south + left: 0.8125 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_sleeve-west + left: 0.625 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_sleeve-east + left: 0.75 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: left_leg-up + left: 0.3125 + top: 0.75 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: left_leg-down + left: 0.375 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_leg-north + left: 0.3125 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: left_leg-south + left: 0.4375 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: left_leg-west + left: 0.375 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: left_leg-east + left: 0.25 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: left_pants-up + left: 0.0625 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_pants-down + left: 0.125 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_pants-north + left: 0.0625 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_pants-south + left: 0.1875 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_pants-west + left: 0.125 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_pants-east + left: 0 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: right_leg-up + left: 0.0625 + top: 0.25 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: right_leg-down + left: 0.125 + top: 0.25 + width: 0.0625 + height: 0.0625 +- name: right_leg-north + left: 0.0625 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: right_leg-south + left: 0.1875 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: right_leg-west + left: 0.125 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: right_leg-east + left: 0 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: right_pants-up + left: 0.0625 + top: 0.5 + width: 0.0625 + height: 0.0625 +- name: right_pants-down + left: 0.125 + top: 0.5 + width: 0.0625 + height: 0.0625 +- name: right_pants-north + left: 0.0625 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_pants-south + left: 0.1875 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_pants-west + left: 0.125 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_pants-east + left: 0 + top: 0.5625 + width: 0.0625 + height: 0.1875 diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/normal.png b/src/assets/minecraft/textures/entity/piglin/piglin/normal.png new file mode 100644 index 00000000..3a617969 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/piglin/normal.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/occlusion.png b/src/assets/minecraft/textures/entity/piglin/piglin/occlusion.png index fc4630be..94c7d427 100644 Binary files a/src/assets/minecraft/textures/entity/piglin/piglin/occlusion.png and b/src/assets/minecraft/textures/entity/piglin/piglin/occlusion.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/alpha.png b/src/assets/minecraft/textures/entity/piglin/piglin/opacity.png similarity index 100% rename from src/assets/minecraft/textures/entity/piglin/piglin/alpha.png rename to src/assets/minecraft/textures/entity/piglin/piglin/opacity.png diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/piglin.png b/src/assets/minecraft/textures/entity/piglin/piglin/piglin.png new file mode 100644 index 00000000..f93df815 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/piglin/piglin.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/smooth.png b/src/assets/minecraft/textures/entity/piglin/piglin/smooth.png index 6ef43b2d..643a3074 100644 Binary files a/src/assets/minecraft/textures/entity/piglin/piglin/smooth.png and b/src/assets/minecraft/textures/entity/piglin/piglin/smooth.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/piglin/sss.png b/src/assets/minecraft/textures/entity/piglin/piglin/sss.png index eb657c77..8d3f2abf 100644 Binary files a/src/assets/minecraft/textures/entity/piglin/piglin/sss.png and b/src/assets/minecraft/textures/entity/piglin/piglin/sss.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/color.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/color.png new file mode 100644 index 00000000..2ba7a7af Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/color.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/f0.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/f0.png new file mode 100644 index 00000000..f9f1ad34 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/f0.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/hcm.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/hcm.png new file mode 100644 index 00000000..6d8881c2 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/hcm.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/height.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/height.png new file mode 100644 index 00000000..a90dce6f Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/height.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/mat.yml b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/mat.yml new file mode 100644 index 00000000..ec7693f7 --- /dev/null +++ b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/mat.yml @@ -0,0 +1,632 @@ +texture-size: 128 +wrap-x: false +wrap-y: false +normal: + noise: 2 + method: sobel-high +filters: +- name: head-up + left: 0.125 + top: 0 + width: 0.15625 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-down + left: 0.28125 + top: 0 + width: 0.15625 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-north + left: 0.125 + top: 0.125 + width: 0.15625 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-south + left: 0.40625 + top: 0.125 + width: 0.15625 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-west + left: 0.28125 + top: 0.125 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head-east + left: 0 + top: 0.125 + width: 0.125 + height: 0.125 + normal-curve-x: 90 + normal-curve-y: 90 +- name: head2-up + left: 0.5 + top: 0.015625 + width: 0.0625 + height: 0.015625 + normal-curve-bottom: 45 +- name: head2-down + left: 0.5625 + top: 0.015625 + width: 0.0625 + height: 0.015625 +- name: head2-north + left: 0.5 + top: 0.03125 + width: 0.0625 + height: 0.0625 + normal-curve-top: 45 + normal-radius-top: 0.4 +- name: head2-south + left: 0.578125 + top: 0.03125 + width: 0.0625 + height: 0.0625 +- name: head2-west + left: 0.5625 + top: 0.03125 + width: 0.015625 + height: 0.0625 + normal-curve-left: 45 +- name: head2-east + left: 0.484375 + top: 0.03125 + width: 0.015625 + height: 0.0625 + normal-curve-right: 45 +- name: head3-up + left: 0.046875 + top: 0.0625 + width: 0.015625 + height: 0.015625 +- name: head3-down + left: 0.0625 + top: 0.0625 + width: 0.015625 + height: 0.015625 +- name: head3-north + left: 0.046875 + top: 0.078125 + width: 0.015625 + height: 0.03125 +- name: head3-south + left: 0.078125 + top: 0.078125 + width: 0.015625 + height: 0.03125 +- name: head3-west + left: 0.0625 + top: 0.078125 + width: 0.015625 + height: 0.03125 +- name: head3-east + left: 0.03125 + top: 0.078125 + width: 0.015625 + height: 0.03125 +- name: head4-up + left: 0.046875 + top: 0 + width: 0.015625 + height: 0.015625 +- name: head4-down + left: 0.0625 + top: 0 + width: 0.015625 + height: 0.015625 +- name: head4-north + left: 0.046875 + top: 0.015625 + width: 0.015625 + height: 0.03125 +- name: head4-south + left: 0.078125 + top: 0.015625 + width: 0.015625 + height: 0.03125 +- name: head4-west + left: 0.0625 + top: 0.015625 + width: 0.015625 + height: 0.03125 +- name: head4-east + left: 0.03125 + top: 0.015625 + width: 0.015625 + height: 0.03125 +- name: left_ear-up + left: 0.859375 + top: 0.09375 + width: 0.015625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.4 +- name: left_ear-down + left: 0.875 + top: 0.09375 + width: 0.015625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.4 +- name: left_ear-north + left: 0.859375 + top: 0.15625 + width: 0.015625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: left_ear-south + left: 0.9375 + top: 0.15625 + width: 0.015625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: left_ear-west + left: 0.875 + top: 0.15625 + width: 0.0625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: left_ear-east + left: 0.796875 + top: 0.15625 + width: 0.0625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: right_ear-up + left: 0.671875 + top: 0.09375 + width: 0.015625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.4 +- name: right_ear-down + left: 0.6875 + top: 0.09375 + width: 0.015625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.4 +- name: right_ear-north + left: 0.671875 + top: 0.15625 + width: 0.015625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: right_ear-south + left: 0.75 + top: 0.15625 + width: 0.015625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-y: 0.3 +- name: right_ear-west + left: 0.6875 + top: 0.15625 + width: 0.0625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: right_ear-east + left: 0.609375 + top: 0.15625 + width: 0.0625 + height: 0.078125 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-x: 0.4 + normal-radius-y: 0.3 +- name: body-up + left: 0.3125 + top: 0.25 + width: 0.125 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: body-down + left: 0.4375 + top: 0.25 + width: 0.125 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: body-north + left: 0.3125 + top: 0.3125 + width: 0.125 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.4 + normal-radius-bottom: 0.2 +- name: body-south + left: 0.5 + top: 0.3125 + width: 0.125 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.4 + normal-radius-bottom: 0.2 +- name: body-west + left: 0.4375 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.4 + normal-radius-bottom: 0.2 +- name: body-east + left: 0.25 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.4 + normal-radius-bottom: 0.2 +- name: jacket-up + left: 0.3125 + top: 0.5 + width: 0.125 + height: 0.0625 +- name: jacket-down + left: 0.4375 + top: 0.5 + width: 0.125 + height: 0.0625 +- name: jacket-north + left: 0.3125 + top: 0.5625 + width: 0.125 + height: 0.1875 +- name: jacket-south + left: 0.5 + top: 0.5625 + width: 0.125 + height: 0.1875 +- name: jacket-west + left: 0.4375 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: jacket-east + left: 0.25 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: left_arm-up + left: 0.5625 + top: 0.75 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: left_arm-down + left: 0.625 + top: 0.75 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: left_arm-north + left: 0.5625 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: left_arm-south + left: 0.6875 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: left_arm-west + left: 0.625 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: left_arm-east + left: 0.5 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: left_sleeve-up + left: 0.8125 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_sleeve-down + left: 0.875 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_sleeve-north + left: 0.8125 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_sleeve-south + left: 0.9375 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_sleeve-west + left: 0.875 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_sleeve-east + left: 0.75 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: right_arm-up + left: 0.6875 + top: 0.25 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: right_arm-down + left: 0.75 + top: 0.25 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: right_arm-north + left: 0.6875 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: right_arm-south + left: 0.8125 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: right_arm-west + left: 0.625 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: right_arm-east + left: 0.75 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-y: 90 + normal-radius-top: 0.3 + normal-radius-bottom: 0.15 +- name: right_sleeve-up + left: 0.6875 + top: 0.5 + width: 0.0625 + height: 0.0625 +- name: right_sleeve-down + left: 0.75 + top: 0.5 + width: 0.0625 + height: 0.0625 +- name: right_sleeve-north + left: 0.6875 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_sleeve-south + left: 0.8125 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_sleeve-west + left: 0.625 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_sleeve-east + left: 0.75 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: left_leg-up + left: 0.3125 + top: 0.75 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: left_leg-down + left: 0.375 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_leg-north + left: 0.3125 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: left_leg-south + left: 0.4375 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: left_leg-west + left: 0.375 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: left_leg-east + left: 0.25 + top: 0.8125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: left_pants-up + left: 0.0625 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_pants-down + left: 0.125 + top: 0.75 + width: 0.0625 + height: 0.0625 +- name: left_pants-north + left: 0.0625 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_pants-south + left: 0.1875 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_pants-west + left: 0.125 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: left_pants-east + left: 0 + top: 0.8125 + width: 0.0625 + height: 0.1875 +- name: right_leg-up + left: 0.0625 + top: 0.25 + width: 0.0625 + height: 0.0625 + normal-curve-x: 90 + normal-curve-y: 90 +- name: right_leg-down + left: 0.125 + top: 0.25 + width: 0.0625 + height: 0.0625 +- name: right_leg-north + left: 0.0625 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: right_leg-south + left: 0.1875 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: right_leg-west + left: 0.125 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: right_leg-east + left: 0 + top: 0.3125 + width: 0.0625 + height: 0.1875 + normal-curve-x: 90 + normal-curve-top: 45 + normal-radius-top: 0.3 +- name: right_pants-up + left: 0.0625 + top: 0.5 + width: 0.0625 + height: 0.0625 +- name: right_pants-down + left: 0.125 + top: 0.5 + width: 0.0625 + height: 0.0625 +- name: right_pants-north + left: 0.0625 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_pants-south + left: 0.1875 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_pants-west + left: 0.125 + top: 0.5625 + width: 0.0625 + height: 0.1875 +- name: right_pants-east + left: 0 + top: 0.5625 + width: 0.0625 + height: 0.1875 diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/normal.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/normal.png new file mode 100644 index 00000000..3a617969 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/normal.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/occlusion.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/occlusion.png new file mode 100644 index 00000000..9168e589 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/occlusion.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/opacity.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/opacity.png new file mode 100644 index 00000000..ec5062a6 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/opacity.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/smooth.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/smooth.png new file mode 100644 index 00000000..5c9938c3 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/smooth.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/sss.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/sss.png new file mode 100644 index 00000000..2ca79190 Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/sss.png differ diff --git a/src/assets/minecraft/textures/entity/piglin/zombified_piglin/zombified_piglin.png b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/zombified_piglin.png new file mode 100644 index 00000000..aea5eb5f Binary files /dev/null and b/src/assets/minecraft/textures/entity/piglin/zombified_piglin/zombified_piglin.png differ diff --git a/src/assets/minecraft/textures/entity/sheep/sheep/color.png b/src/assets/minecraft/textures/entity/sheep/sheep/color.png index d7429f6e..6efe0e52 100644 Binary files a/src/assets/minecraft/textures/entity/sheep/sheep/color.png and b/src/assets/minecraft/textures/entity/sheep/sheep/color.png differ diff --git a/src/assets/minecraft/textures/entity/sheep/sheep/mat.yml b/src/assets/minecraft/textures/entity/sheep/sheep/mat.yml index f016e762..b0e54095 100644 --- a/src/assets/minecraft/textures/entity/sheep/sheep/mat.yml +++ b/src/assets/minecraft/textures/entity/sheep/sheep/mat.yml @@ -1,5 +1,5 @@ -texture-width: 128 -texture-height: 64 +texture-width: 256 +texture-height: 128 wrap-x: false wrap-y: false smooth: diff --git a/src/assets/minecraft/textures/entity/sheep/sheep_fur/albedo.png b/src/assets/minecraft/textures/entity/sheep/sheep_fur/color.png similarity index 100% rename from src/assets/minecraft/textures/entity/sheep/sheep_fur/albedo.png rename to src/assets/minecraft/textures/entity/sheep/sheep_fur/color.png diff --git a/src/assets/minecraft/textures/entity/sheep/sheep_fur/mat.yml b/src/assets/minecraft/textures/entity/sheep/sheep_fur/mat.yml index 377853f7..14fa3b4b 100644 --- a/src/assets/minecraft/textures/entity/sheep/sheep_fur/mat.yml +++ b/src/assets/minecraft/textures/entity/sheep/sheep_fur/mat.yml @@ -1,5 +1,5 @@ -texture-width: 128 -texture-height: 64 +texture-width: 256 +texture-height: 128 wrap-x: false wrap-y: false normal: diff --git a/src/assets/minecraft/textures/entity/sheep/sheep_fur/alpha.png b/src/assets/minecraft/textures/entity/sheep/sheep_fur/opacity.png similarity index 100% rename from src/assets/minecraft/textures/entity/sheep/sheep_fur/alpha.png rename to src/assets/minecraft/textures/entity/sheep/sheep_fur/opacity.png diff --git a/src/assets/minecraft/textures/entity/skeleton/skeleton/height.png b/src/assets/minecraft/textures/entity/skeleton/skeleton/height.png index 0ca85153..350d129e 100644 Binary files a/src/assets/minecraft/textures/entity/skeleton/skeleton/height.png and b/src/assets/minecraft/textures/entity/skeleton/skeleton/height.png differ diff --git a/src/assets/minecraft/textures/entity/skeleton/wither_skeleton/mat.yml b/src/assets/minecraft/textures/entity/skeleton/wither_skeleton/mat.yml index 2bfa25e2..83639626 100644 --- a/src/assets/minecraft/textures/entity/skeleton/wither_skeleton/mat.yml +++ b/src/assets/minecraft/textures/entity/skeleton/wither_skeleton/mat.yml @@ -18,9 +18,6 @@ f0: value: 0.03 porosity: value: 0.71 -emissive: - scale: 0.5 -ctm: {} filters: - name: head-top left: 0.125 diff --git a/src/assets/minecraft/textures/entity/snow_golem/mat.yml b/src/assets/minecraft/textures/entity/snow_golem/mat.yml index f3c97145..7de04e51 100644 --- a/src/assets/minecraft/textures/entity/snow_golem/mat.yml +++ b/src/assets/minecraft/textures/entity/snow_golem/mat.yml @@ -13,6 +13,8 @@ occlusion: z-scale: 4 smooth: shift: -0.3613 +sss: + scale: 0.6 filters: - name: head-up left: 0.125 diff --git a/src/assets/minecraft/textures/entity/wolf/wolf/albedo.png b/src/assets/minecraft/textures/entity/wolf/wolf/color.png similarity index 100% rename from src/assets/minecraft/textures/entity/wolf/wolf/albedo.png rename to src/assets/minecraft/textures/entity/wolf/wolf/color.png diff --git a/src/assets/minecraft/textures/entity/wolf/wolf/opacity.png b/src/assets/minecraft/textures/entity/wolf/wolf/opacity.png new file mode 100644 index 00000000..c3a081a2 Binary files /dev/null and b/src/assets/minecraft/textures/entity/wolf/wolf/opacity.png differ diff --git a/src/assets/minecraft/textures/entity/wolf/wolf/wolf.png b/src/assets/minecraft/textures/entity/wolf/wolf/wolf.png new file mode 100644 index 00000000..85c73d31 Binary files /dev/null and b/src/assets/minecraft/textures/entity/wolf/wolf/wolf.png differ diff --git a/src/assets/minecraft/textures/entity/wolf/wolf_angry/opacity.png b/src/assets/minecraft/textures/entity/wolf/wolf_angry/opacity.png new file mode 100644 index 00000000..c3a081a2 Binary files /dev/null and b/src/assets/minecraft/textures/entity/wolf/wolf_angry/opacity.png differ diff --git a/src/assets/minecraft/textures/entity/wolf/wolf_tame/opacity.png b/src/assets/minecraft/textures/entity/wolf/wolf_tame/opacity.png new file mode 100644 index 00000000..c3a081a2 Binary files /dev/null and b/src/assets/minecraft/textures/entity/wolf/wolf_tame/opacity.png differ diff --git a/src/input.yml b/src/input.yml deleted file mode 100644 index 0e491bf0..00000000 --- a/src/input.yml +++ /dev/null @@ -1,20 +0,0 @@ -format: raw -auto-material: false -opacity: {} -color-red: {} -color-green: {} -color-blue: {} -height: {} -occlusion: {} -normal-x: {} -normal-y: {} -normal-z: {} -specular: {} -smooth: {} -rough: {} -metal: {} -f0: {} -hcm: {} -porosity: {} -sss: {} -emissive: {} diff --git a/src/project.yml b/src/project.yml new file mode 100644 index 00000000..d31db611 --- /dev/null +++ b/src/project.yml @@ -0,0 +1,285 @@ +name: Textureless +description: No Textures! PBR shader required. +author: Null [Joshua Miller] +input: + format: raw + auto-material: false +profiles: +- edition: java + format: 8 + name: Textureless-VPbr-32x + description: PBR for Vanilla Fabulous shaders + tags: AlphaPBR 32x + block-texture-size: 32 + item-texture-size: 32 + texture-scale: 1 + auto-generate-normal: false + auto-generate-occlusion: false + bake-occlusion-to-color: true + occlusion-quality: 0.14 + occlusion-power: 2 + publish-connected: false +- edition: bedrock + header-uuid: 0c4462be-f218-47ba-a698-b4f50ef15fea + module-uuid: fffaa7b3-22b0-4aca-a79c-d6a1243ce71a + format: 2 + name: Textureless-RTX-32x + description: No Textures! RTX required. + tags: '' + encoding: + format: rtx + height: + texture: height + color: red + invert: true + normal-x: + texture: none + normal-y: + texture: none + normal-z: + texture: none + block-texture-size: 32 + item-texture-size: 32 + texture-scale: 1 + auto-generate-occlusion: true + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2 + publish-inventory: false +- edition: bedrock + header-uuid: 0c4462be-f218-47ba-a698-b4f50ef15fea + module-uuid: fffaa7b3-22b0-4aca-a79c-d6a1243ce71a + format: 2 + name: Textureless-RTX-32x + description: No Textures! RTX required. + tags: '' + encoding: + format: rtx + height: + sampler: bilinear + block-texture-size: 32 + item-texture-size: 32 + texture-scale: 1 + auto-generate-occlusion: true + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2 + publish-inventory: false +- edition: java + format: 8 + name: Textureless-LabBakedAO-32x + description: No Textures! PBR shader required. + tags: 32x LabPBR BakedAO + encoding: + format: lab-1.3 + height: + sampler: bilinear + occlusion: + max-value: 0 + block-texture-size: 32 + item-texture-size: 32 + texture-scale: 1 + diffuse-occlusion-strength: 0.5 + auto-generate-occlusion: true + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2 +- edition: java + format: 8 + name: Textureless-LabBakedAO-64x + description: No Textures! PBR shader required. + tags: 64x LabPBR BakedAO + encoding: + format: lab-1.3 + height: + sampler: bilinear + occlusion: + max-value: 0 + normal-x: + sampler: bilinear + normal-y: + sampler: bilinear + normal-z: + sampler: bilinear + block-texture-size: 64 + item-texture-size: 64 + texture-scale: 2 + diffuse-occlusion-strength: 0.5 + auto-generate-occlusion: true + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 1 +- edition: java + format: 8 + name: Textureless-LabPbr-SMOOTH-128x + description: No Textures! PBR shader required. + tags: 128x LabPBR + encoding: + format: lab-1.3 + sampler: bicubic + metal: + sampler: nearest + f0: + sampler: nearest + block-texture-size: 1024 + item-texture-size: 1024 + texture-scale: 16 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 0.5 +- edition: java + format: 8 + name: Textureless-LabPbr-128x + description: No Textures! PBR shader required. + tags: 128x LabPBR + encoding: + format: lab-1.3 + sampler: nearest + metal: + sampler: nearest + f0: + sampler: nearest + block-texture-size: 128 + item-texture-size: 128 + texture-scale: 4 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 0.5 +- edition: java + format: 8 + name: Textureless-LabPbr-128x + description: No Textures! PBR shader required. + tags: 128x LabPBR + encoding: + format: lab-1.3 + sampler: bilinear + metal: + sampler: nearest + f0: + sampler: nearest + block-texture-size: 128 + item-texture-size: 128 + texture-scale: 4 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 0.5 +- edition: java + format: 8 + name: Textureless-LabPbr-16x + description: No Textures! PBR shader required. + tags: 16x LabPBR + encoding: + format: lab-1.3 + height: + sampler: average + occlusion: + sampler: average + normal-x: + sampler: average + normal-y: + sampler: average + normal-z: + sampler: average + block-texture-size: 16 + item-texture-size: 16 + texture-scale: 0.5 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 1 +- edition: java + format: 8 + name: Textureless-LabPbr-32x + description: No Textures! PBR shader required. + tags: 32x LabPBR + encoding: + format: lab-1.3 + sampler: nearest + height: + sampler: bilinear + block-texture-size: 32 + item-texture-size: 32 + texture-scale: 1 + auto-generate-occlusion: false + occlusion-quality: 0.2 + occlusion-power: 1 +- edition: java + format: 8 + name: Textureless-LabPbr-64x + description: No Textures! PBR shader required. + tags: 64x LabPBR + encoding: + format: lab-1.3 + sampler: bicubic + color-red: + sampler: nearest + color-green: + sampler: nearest + color-blue: + sampler: nearest + metal: + sampler: nearest + f0: + sampler: nearest + block-texture-size: 64 + item-texture-size: 64 + texture-scale: 2 + auto-generate-occlusion: false + occlusion-quality: 0.1 + occlusion-power: 1 +- edition: java + format: 8 + name: Textureless-Map-32x + description: For external map usage only. + tags: 32x + encoding: + format: color + sampler: nearest + height: + sampler: bilinear + block-texture-size: 32 + item-texture-size: 32 + texture-scale: 1 + auto-generate-occlusion: true + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2 +- edition: java + format: 8 + name: Textureless-OldPbr-32x + description: No Textures! PBR shader required. + tags: 32x OldPBR + encoding: + format: old-pbr + sampler: nearest + height: + sampler: bilinear + block-texture-size: 32 + item-texture-size: 32 + texture-scale: 1 + auto-generate-occlusion: true + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2 +- edition: java + format: 8 + name: Textureless-OldPbr-64x + description: No Textures! PBR shader required. + tags: 64x OldPBR + encoding: + format: old-pbr + sampler: nearest + height: + sampler: bilinear + normal-x: + sampler: bilinear + normal-y: + sampler: bilinear + normal-z: + sampler: bilinear + block-texture-size: 64 + item-texture-size: 64 + texture-scale: 2 + auto-generate-occlusion: false + bake-occlusion-to-color: true + occlusion-quality: 0.1 + occlusion-power: 2