diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 9a3ec511..fc14ff8c 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -7,20 +7,6 @@ on: required: true jobs: - Publish-LabPbr-16x: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: docker pull null511/pixelgraph - - run: | - docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \ - publish -p "//content/src/Textureless-LabPbr-16x.pack.yml" -z "//content/Textureless-LabPbr-16x.zip" - - name: Upload LabPbr 16x - uses: actions/upload-artifact@v2 - with: - name: Textureless-LabPbr-16x - path: Textureless-LabPbr-16x.zip - Publish-LabPbr-32x: runs-on: ubuntu-latest steps: @@ -28,7 +14,7 @@ jobs: - run: docker pull null511/pixelgraph - run: | docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \ - publish -p "//content/src/Textureless-LabPbr-32x.pack.yml" -z "//content/Textureless-LabPbr-32x.zip" + publish -p "//content/src/LabPbr-32x.pack.yml" -z "//content/Textureless-LabPbr-32x.zip" - name: Upload LabPbr 32x uses: actions/upload-artifact@v2 with: @@ -42,7 +28,7 @@ jobs: - run: docker pull null511/pixelgraph - run: | docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \ - publish -p "//content/src/Textureless-LabBakedAO-32x.pack.yml" -z "//content/Textureless-LabBakedAO-32x.zip" + publish -p "//content/src/LabBakedAO-32x.pack.yml" -z "//content/Textureless-LabBakedAO-32x.zip" - name: Upload LabBakedAO 32x uses: actions/upload-artifact@v2 with: @@ -56,21 +42,59 @@ jobs: - run: docker pull null511/pixelgraph - run: | docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \ - publish -p "//content/src/Textureless-OldBakedAO-32x.pack.yml" -z "//content/Textureless-OldBakedAO-32x.zip" + publish -p "//content/src/OldBakedAO-32x.pack.yml" -z "//content/Textureless-OldBakedAO-32x.zip" - name: Upload OldBakedAO 32x uses: actions/upload-artifact@v2 with: name: Textureless-OldBakedAO-32x path: Textureless-OldBakedAO-32x.zip + Publish-Models-LabPbr-32x: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: docker pull null511/pixelgraph + - run: | + docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \ + publish -p "//content/src-models/LabPbr-32x.pack.yml" -z "//content/Textureless-Models-LabPbr-32x.zip" + - name: Upload Models LabPbr 32x + uses: actions/upload-artifact@v2 + with: + name: Textureless-Models-LabPbr-32x + path: Textureless-Models-LabPbr-32x.zip + + Publish-Models-LabBakedAO-32x: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: docker pull null511/pixelgraph + - run: | + docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \ + publish -p "//content/src-models/LabBakedAO-32x.pack.yml" -z "//content/Textureless-Models-LabBakedAO-32x.zip" + - name: Upload Models LabBakedAO 32x + uses: actions/upload-artifact@v2 + with: + name: Textureless-Models-LabBakedAO-32x + path: Textureless-Models-LabBakedAO-32x.zip + + Publish-Models-OldBakedAO-32x: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: docker pull null511/pixelgraph + - run: | + docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \ + publish -p "//content/src-models/OldBakedAO-32x.pack.yml" -z "//content/Textureless-Models-OldBakedAO-32x.zip" + - name: Upload Models OldBakedAO 32x + uses: actions/upload-artifact@v2 + with: + name: Textureless-Models-OldBakedAO-32x + path: Textureless-Models-OldBakedAO-32x.zip + Create-Release: runs-on: ubuntu-latest needs: [Publish-LabPbr-16x, Publish-LabPbr-32x, Publish-LabBakedAO-32x, Publish-OldBakedAO-32x] steps: - - name: Download LabPbr 16x - uses: actions/download-artifact@v2 - with: - name: Textureless-LabPbr-16x - name: Download LabPbr 32x uses: actions/download-artifact@v2 with: @@ -83,6 +107,18 @@ jobs: uses: actions/download-artifact@v2 with: name: Textureless-OldBakedAO-32x + - name: Download Models LabPbr 32x + uses: actions/download-artifact@v2 + with: + name: Textureless-Models-LabPbr-32x + - name: Download Models LabBakedAO 32x + uses: actions/download-artifact@v2 + with: + name: Textureless-Models-LabBakedAO-32x + - name: Download Models OldBakedAO 32x + uses: actions/download-artifact@v2 + with: + name: Textureless-Models-OldBakedAO-32x - name: Create Release id: create_release uses: actions/create-release@v1 @@ -91,15 +127,6 @@ jobs: with: tag_name: v${{ github.event.inputs.version }} release_name: Release ${{ github.event.inputs.version }} - - name: Upload 16x - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./Textureless-LabPbr-16x.zip - asset_name: Textureless-LabPbr-16x.zip - asset_content_type: application/zip - name: Upload 32x uses: actions/upload-release-asset@v1 env: @@ -128,6 +155,34 @@ jobs: asset_name: Textureless-OldBakedAO-32x.zip asset_content_type: application/zip + - name: Upload Models 32x + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./Textureless-Models-LabPbr-32x.zip + asset_name: Textureless-Models-LabPbr-32x.zip + asset_content_type: application/zip + - name: Upload Models LabBakedAO 32x + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./Textureless-Models-LabBakedAO-32x.zip + asset_name: Textureless-Models-LabBakedAO-32x.zip + asset_content_type: application/zip + - name: Upload Models OldBakedAO 32x + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./Textureless-Models-OldBakedAO-32x.zip + asset_name: Textureless-Models-OldBakedAO-32x.zip + asset_content_type: application/zip + Upload-CurseForge: runs-on: ubuntu-latest needs: Create-Release diff --git a/src-models/assets/minecraft/blockstates/birch_leaves.json b/src-models/assets/minecraft/blockstates/birch_leaves.json new file mode 100644 index 00000000..e90cbce7 --- /dev/null +++ b/src-models/assets/minecraft/blockstates/birch_leaves.json @@ -0,0 +1,29 @@ +{ + "variants": { + "": [ + { + "model": "block/birch_leaves" + }, + { + "model": "block/birch_leaves", + "y": 90 + }, + { + "model": "block/birch_leaves", + "y": 180 + }, + { + "model": "block/birch_leaves", + "y": 270 + }, + { + "model": "block/birch_leaves", + "z": 90 + }, + { + "model": "block/birch_leaves", + "x": 90 + } + ] + } +} \ No newline at end of file diff --git a/src-models/assets/minecraft/models/block/birch_leaves.json b/src-models/assets/minecraft/models/block/birch_leaves.json new file mode 100644 index 00000000..85ac2ade --- /dev/null +++ b/src-models/assets/minecraft/models/block/birch_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "block/leaves_alt_MQ", + "textures": { + "all": "block/birch_leaves" + } +} diff --git a/src-models/assets/minecraft/textures/block/birch_leaves/alpha.png b/src-models/assets/minecraft/textures/block/birch_leaves/alpha.png new file mode 100644 index 00000000..e258f532 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/birch_leaves/alpha.png differ diff --git a/src-models/assets/minecraft/textures/block/birch_leaves/height.png b/src-models/assets/minecraft/textures/block/birch_leaves/height.png new file mode 100644 index 00000000..ab7c68dc Binary files /dev/null and b/src-models/assets/minecraft/textures/block/birch_leaves/height.png differ diff --git a/src-models/assets/minecraft/textures/block/birch_leaves/occlusion.png b/src-models/assets/minecraft/textures/block/birch_leaves/occlusion.png new file mode 100644 index 00000000..4111714b Binary files /dev/null and b/src-models/assets/minecraft/textures/block/birch_leaves/occlusion.png differ diff --git a/src-models/assets/minecraft/textures/block/birch_leaves/pbr.yml b/src-models/assets/minecraft/textures/block/birch_leaves/pbr.yml new file mode 100644 index 00000000..ad9a0650 --- /dev/null +++ b/src-models/assets/minecraft/textures/block/birch_leaves/pbr.yml @@ -0,0 +1,18 @@ +publish-inventory: true +color-tint: '#80a755' +color: + value-red: 200 + value-green: 200 + value-blue: 200 +height: + value: 0 +normal: + method: sobel-low +occlusion: + step-distance: 0.2 + z-bias: 0 + z-scale: 6 +f0: + value: 0.017 +sss: + value: 0.4 diff --git a/src-models/assets/minecraft/textures/block/birch_leaves/smooth.png b/src-models/assets/minecraft/textures/block/birch_leaves/smooth.png new file mode 100644 index 00000000..cfdb7bf5 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/birch_leaves/smooth.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/.ignore/albedo.png b/src/assets/minecraft/textures/block/birch_planks/.ignore/albedo.png new file mode 100644 index 00000000..fd1e02f8 Binary files /dev/null and b/src/assets/minecraft/textures/block/birch_planks/.ignore/albedo.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/.ignore/height.png b/src/assets/minecraft/textures/block/birch_planks/.ignore/height.png new file mode 100644 index 00000000..4b373618 Binary files /dev/null and b/src/assets/minecraft/textures/block/birch_planks/.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/.ignore/occlusion.png b/src/assets/minecraft/textures/block/birch_planks/.ignore/occlusion.png new file mode 100644 index 00000000..4fffce93 Binary files /dev/null and b/src/assets/minecraft/textures/block/birch_planks/.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/.ignore/pbr.yml b/src/assets/minecraft/textures/block/birch_planks/.ignore/pbr.yml new file mode 100644 index 00000000..a794aebd --- /dev/null +++ b/src/assets/minecraft/textures/block/birch_planks/.ignore/pbr.yml @@ -0,0 +1,19 @@ +publish-inventory: true +alpha: + value: 255 +height: + scale: 0.3 +normal: + strength: 0.5 + filter: sobel-high +occlusion: + z-bias: 0 + z-scale: 3 + step-distance: 0.15 +smooth: + scale: 0.6 +metal: {} +f0: + value: 0.044 +porosity: {} +create-inventory: true diff --git a/src/assets/minecraft/textures/block/birch_planks/.ignore/porosity.png b/src/assets/minecraft/textures/block/birch_planks/.ignore/porosity.png new file mode 100644 index 00000000..e15065a8 Binary files /dev/null and b/src/assets/minecraft/textures/block/birch_planks/.ignore/porosity.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/.ignore/smooth.png b/src/assets/minecraft/textures/block/birch_planks/.ignore/smooth.png new file mode 100644 index 00000000..71f7449c Binary files /dev/null and b/src/assets/minecraft/textures/block/birch_planks/.ignore/smooth.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/albedo.png b/src/assets/minecraft/textures/block/birch_planks/albedo.png index fd1e02f8..3c4161cd 100644 Binary files a/src/assets/minecraft/textures/block/birch_planks/albedo.png and b/src/assets/minecraft/textures/block/birch_planks/albedo.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/height.png b/src/assets/minecraft/textures/block/birch_planks/height.png index 4b373618..cd286d08 100644 Binary files a/src/assets/minecraft/textures/block/birch_planks/height.png and b/src/assets/minecraft/textures/block/birch_planks/height.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/occlusion.png b/src/assets/minecraft/textures/block/birch_planks/occlusion.png index 4fffce93..6268bb09 100644 Binary files a/src/assets/minecraft/textures/block/birch_planks/occlusion.png and b/src/assets/minecraft/textures/block/birch_planks/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/pbr.yml b/src/assets/minecraft/textures/block/birch_planks/pbr.yml index a794aebd..f35b53c2 100644 --- a/src/assets/minecraft/textures/block/birch_planks/pbr.yml +++ b/src/assets/minecraft/textures/block/birch_planks/pbr.yml @@ -1,19 +1,16 @@ publish-inventory: true -alpha: +opacity: value: 255 height: scale: 0.3 normal: - strength: 0.5 - filter: sobel-high + method: sobel-low + strength: 0.3 occlusion: + step-distance: 0.15 z-bias: 0 z-scale: 3 - step-distance: 0.15 -smooth: - scale: 0.6 -metal: {} f0: value: 0.044 -porosity: {} -create-inventory: true +porosity: + scale: 0.6 diff --git a/src/assets/minecraft/textures/block/birch_planks/porosity.png b/src/assets/minecraft/textures/block/birch_planks/porosity.png index e15065a8..572cf385 100644 Binary files a/src/assets/minecraft/textures/block/birch_planks/porosity.png and b/src/assets/minecraft/textures/block/birch_planks/porosity.png differ diff --git a/src/assets/minecraft/textures/block/birch_planks/smooth.png b/src/assets/minecraft/textures/block/birch_planks/smooth.png index 71f7449c..7a9492c6 100644 Binary files a/src/assets/minecraft/textures/block/birch_planks/smooth.png and b/src/assets/minecraft/textures/block/birch_planks/smooth.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front/albedo.png b/src/assets/minecraft/textures/block/furnace_front/albedo.png index 114c4208..a557e24a 100644 Binary files a/src/assets/minecraft/textures/block/furnace_front/albedo.png and b/src/assets/minecraft/textures/block/furnace_front/albedo.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front/height.png b/src/assets/minecraft/textures/block/furnace_front/height.png index 43f83e9e..5e710c3e 100644 Binary files a/src/assets/minecraft/textures/block/furnace_front/height.png and b/src/assets/minecraft/textures/block/furnace_front/height.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front/occlusion.png b/src/assets/minecraft/textures/block/furnace_front/occlusion.png index d5aa29d3..878229d6 100644 Binary files a/src/assets/minecraft/textures/block/furnace_front/occlusion.png and b/src/assets/minecraft/textures/block/furnace_front/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front/pbr.yml b/src/assets/minecraft/textures/block/furnace_front/pbr.yml index 8d98f2b4..ad457396 100644 --- a/src/assets/minecraft/textures/block/furnace_front/pbr.yml +++ b/src/assets/minecraft/textures/block/furnace_front/pbr.yml @@ -1,15 +1,11 @@ -alpha: +publish-inventory: true +opacity: value: 255 -height: {} normal: + method: sobel-high strength: 1.2 noise: 1 - filter: sobel-high occlusion: + step-distance: 0.5 z-bias: 0 z-scale: 5 - step-distance: 0.15 -smooth: {} -f0: {} -porosity: {} -create-inventory: true diff --git a/src/assets/minecraft/textures/block/furnace_front_on/.ignore/albedo.png b/src/assets/minecraft/textures/block/furnace_front_on/.ignore/albedo.png new file mode 100644 index 00000000..5b8fbdc3 Binary files /dev/null and b/src/assets/minecraft/textures/block/furnace_front_on/.ignore/albedo.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front_on/.ignore/height.png b/src/assets/minecraft/textures/block/furnace_front_on/.ignore/height.png new file mode 100644 index 00000000..480e0f34 Binary files /dev/null and b/src/assets/minecraft/textures/block/furnace_front_on/.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front_on/.ignore/occlusion.png b/src/assets/minecraft/textures/block/furnace_front_on/.ignore/occlusion.png new file mode 100644 index 00000000..3fff1c72 Binary files /dev/null and b/src/assets/minecraft/textures/block/furnace_front_on/.ignore/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front_on/albedo.png b/src/assets/minecraft/textures/block/furnace_front_on/albedo.png index 5b8fbdc3..fca2502d 100644 Binary files a/src/assets/minecraft/textures/block/furnace_front_on/albedo.png and b/src/assets/minecraft/textures/block/furnace_front_on/albedo.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front_on/emissive.png b/src/assets/minecraft/textures/block/furnace_front_on/emissive.png index d232b1bb..51f54d49 100644 Binary files a/src/assets/minecraft/textures/block/furnace_front_on/emissive.png and b/src/assets/minecraft/textures/block/furnace_front_on/emissive.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front_on/height.png b/src/assets/minecraft/textures/block/furnace_front_on/height.png index 480e0f34..6dc4fb54 100644 Binary files a/src/assets/minecraft/textures/block/furnace_front_on/height.png and b/src/assets/minecraft/textures/block/furnace_front_on/height.png differ diff --git a/src/assets/minecraft/textures/block/furnace_front_on/occlusion.png b/src/assets/minecraft/textures/block/furnace_front_on/occlusion.png index 3fff1c72..dd41d6ea 100644 Binary files a/src/assets/minecraft/textures/block/furnace_front_on/occlusion.png and b/src/assets/minecraft/textures/block/furnace_front_on/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/oak_planks/albedo.png b/src/assets/minecraft/textures/block/oak_planks/albedo.png index b09dc591..ff0a5423 100644 Binary files a/src/assets/minecraft/textures/block/oak_planks/albedo.png and b/src/assets/minecraft/textures/block/oak_planks/albedo.png differ diff --git a/src/assets/minecraft/textures/block/oak_planks/height.png b/src/assets/minecraft/textures/block/oak_planks/height.png index 914e29c1..cd286d08 100644 Binary files a/src/assets/minecraft/textures/block/oak_planks/height.png and b/src/assets/minecraft/textures/block/oak_planks/height.png differ diff --git a/src/assets/minecraft/textures/block/oak_planks/occlusion.png b/src/assets/minecraft/textures/block/oak_planks/occlusion.png index 4fffce93..6268bb09 100644 Binary files a/src/assets/minecraft/textures/block/oak_planks/occlusion.png and b/src/assets/minecraft/textures/block/oak_planks/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/oak_planks/porosity.png b/src/assets/minecraft/textures/block/oak_planks/porosity.png index 2c3b42df..572cf385 100644 Binary files a/src/assets/minecraft/textures/block/oak_planks/porosity.png and b/src/assets/minecraft/textures/block/oak_planks/porosity.png differ diff --git a/src/assets/minecraft/textures/block/oak_planks/smooth.png b/src/assets/minecraft/textures/block/oak_planks/smooth.png index 71f7449c..7a9492c6 100644 Binary files a/src/assets/minecraft/textures/block/oak_planks/smooth.png and b/src/assets/minecraft/textures/block/oak_planks/smooth.png differ