add observer, vine, grass_snow_block; revise furnace; no oldPbr relea…

…se, add 64x

.github/workflows/Release.yml

@@ -12,22 +12,18 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: docker pull null511/pixelgraph
-      - name: Publish LAB13-16x
+      - name: Publish 16x
         run: |
           docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \
-            publish -p "//content/src/lab13-16x.pack.yml" -z "//content/Textureless-LabPBR-16x.zip"
-      - name: Publish LAB13-32x
+            publish -p "//content/src/lab13-16x.pack.yml" -z "//content/Textureless-16x.zip"
+      - name: Publish 32x
         run: |
           docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \
-            publish -p "//content/src/lab13-32x.pack.yml" -z "//content/Textureless-LabPBR-32x.zip"
-      - name: Publish LAB13-Overlay-16x
+            publish -p "//content/src/lab13-32x.pack.yml" -z "//content/Textureless-32x.zip"
+      - name: Publish 64x
         run: |
           docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \
-            publish -p "//content/src/lab13-overlay-16x.pack.yml" -z "//content/Textureless-LabPBR-Overlay-16x.zip"
-      - name: Publish OldPBR-16x
-        run: |
-          docker run --name pixelgraph --rm --mount src="$(pwd)",target=/content,type=bind null511/pixelgraph \
-            publish -p "//content/src/legacy-16x.pack.yml" -z "//content/Textureless-OldPBR-16x.zip"
+            publish -p "//content/src/lab13-64x.pack.yml" -z "//content/Textureless-64x.zip"
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -36,39 +32,30 @@ jobs:
         with:
           tag_name: v${{ github.event.inputs.version }}
           release_name: Release ${{ github.event.inputs.version }}
-      - name: Upload LabPBR-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 LabPBR-32x
+      - 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-32x.zip
-          asset_name: Textureless-LabPBR-32x.zip
+          asset_path: ./Textureless-16x.zip
+          asset_name: Textureless-16x.zip
           asset_content_type: application/zip
-      - name: Upload LabPBR-Overlay-16x
+      - name: Upload 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-LabPBR-Overlay-16x.zip
-          asset_name: Textureless-LabPBR-Overlay-16x.zip
+          asset_path: ./Textureless-32x.zip
+          asset_name: Textureless-32x.zip
           asset_content_type: application/zip
-      - name: Upload OldPBR-16x
+      - name: Upload 64x
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./Textureless-OldPBR-16x.zip
-          asset_name: Textureless-OldPBR-16x.zip
+          asset_path: ./Textureless-64x.zip
+          asset_name: Textureless-64x.zip
           asset_content_type: application/zip

src/assets/minecraft/blockstates/stone.json

@@ -1,9 +1,7 @@
 {
   "variants": {
-    "": [
-      {
-        "model": "block/stone"
-      }
-    ]
+    "": {
+      "model": "block/stone"
+    }
   }
 }

src/assets/minecraft/models/block/birch_button.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/button",
+  "textures": {
+    "texture": "block/stripped_birch_wood"
+  }
+}

src/assets/minecraft/models/block/birch_button_inventory.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/button_inventory",
+  "textures": {
+    "texture": "block/stripped_birch_wood_inventory"
+  }
+}

src/assets/minecraft/models/block/birch_button_pressed.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/button_pressed",
+  "textures": {
+    "texture": "block/stripped_birch_wood"
+  }
+}

src/assets/minecraft/models/block/birch_fence_gate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/template_fence_gate",
+  "textures": {
+    "texture": "block/stripped_birch_wood"
+  }
+}

src/assets/minecraft/models/block/birch_fence_gate_open.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/template_fence_gate_open",
+  "textures": {
+    "texture": "block/stripped_birch_wood"
+  }
+}

src/assets/minecraft/models/block/birch_fence_gate_wall.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/template_fence_gate_wall",
+  "textures": {
+    "texture": "block/stripped_birch_wood"
+  }
+}

src/assets/minecraft/models/block/birch_fence_gate_wall_open.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/template_fence_gate_wall_open",
+  "textures": {
+    "texture": "block/stripped_birch_wood"
+  }
+}

src/assets/minecraft/models/block/birch_fence_inventory.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/fence_inventory",
+  "textures": {
+    "texture": "block/stripped_birch_wood_inventory"
+  }
+}

src/assets/minecraft/models/block/birch_fence_post.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/fence_post",
+  "textures": {
+    "texture": "block/stripped_birch_wood"
+  }
+}

src/assets/minecraft/models/block/birch_fence_side.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/fence_side",
+  "textures": {
+    "texture": "block/stripped_birch_wood"
+  }
+}

src/assets/minecraft/models/block/grass_block_snow.json

@@ -0,0 +1,34 @@
+{
+    "parent": "block/cube_bottom_top",
+    "textures": {
+        "particle": "block/dirt_inventory",
+        "bottom": "block/dirt",
+        "top": "block/grass_block_snow_top",
+        "side": "block/dirt",
+        "overlay": "block/grass_block_snow_side_overlay"
+    },
+    "elements": [
+        {
+            "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 16 ],
+            "faces": {
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" },
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#top",    "cullface": "up" },
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side",   "cullface": "north" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side",   "cullface": "south" },
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side",   "cullface": "west" },
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side",   "cullface": "east" }
+            }
+        },
+        {
+            "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 16 ],
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "north" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "south" },
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "west" },
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "cullface": "east" }
+            }
+        }
+    ]
+}

src/assets/minecraft/models/item/chiseled_red_sandstone.json

@@ -0,0 +1,7 @@
+{
+  "parent": "block/chiseled_red_sandstone",
+  "textures": {
+    "end": "block/red_sandstone_top_inventory",
+    "side": "block/chiseled_red_sandstone_inventory"
+  }
+}

src/assets/minecraft/models/item/observer.json

@@ -0,0 +1,9 @@
+{
+    "parent": "block/observer",
+    "textures": {
+        "bottom": "block/observer_back_inventory",
+        "side": "block/observer_side_inventory",
+        "top": "block/observer_top_inventory",
+        "front": "block/observer_front_inventory"
+    }
+}

src/assets/minecraft/models/item/vine.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "block/vine_inventory"
+  }
+}

src/assets/minecraft/textures/block/blast_furnace_front/pbr.yml

@@ -2,14 +2,12 @@ alpha:
   value: 255
 height:
   scale: 0.5
-  edge-fade-size-x: 1
-  edge-fade-size-y: 1
 normal:
   strength: 0.8
   filter: sobel-low
 occlusion:
   quality: 0.1
-  z-bias: 0.1
-  z-scale: 3
-  steps: 8
+  z-bias: 0
+  z-scale: 4
+  step-distance: 0.1
 create-inventory: true

src/assets/minecraft/textures/block/blast_furnace_front_on/pbr.yml

@@ -2,13 +2,11 @@ alpha:
   value: 255
 height:
   scale: 0.5
-  edge-fade-size-x: 1
-  edge-fade-size-y: 1
 normal:
   strength: 0.8
   filter: sobel-low
 occlusion:
   quality: 0.1
-  z-bias: 0.1
-  z-scale: 3
-  steps: 8
+  z-bias: 0
+  z-scale: 4
+  step-distance: 0.1

src/assets/minecraft/textures/block/blast_furnace_side/pbr.yml

@@ -2,14 +2,12 @@ alpha:
   value: 255
 height:
   scale: 0.5
-  edge-fade-size-x: 1
-  edge-fade-size-y: 1
 normal:
   strength: 0.8
   filter: sobel-low
 occlusion:
   quality: 0.1
-  z-bias: 0.1
-  z-scale: 3
-  steps: 8
+  z-bias: 0
+  z-scale: 4
+  step-distance: 0.1
 create-inventory: true

src/assets/minecraft/textures/block/blast_furnace_top/pbr.yml

@@ -6,9 +6,9 @@ normal:
   filter: sobel-low
 occlusion:
   quality: 0.1
-  z-bias: 0.1
-  z-scale: 2.5
-  steps: 8
+  z-bias: 0
+  z-scale: 4
+  step-distance: 0.1
 f0:
   value: 0.07
 porosity:

src/assets/minecraft/textures/block/chiseled_red_sandstone/pbr.yml

@@ -0,0 +1,25 @@
+alpha:
+  value: 255
+albedo:
+  value-red: 186
+  value-green: 99
+  value-blue: 29
+height:
+  shift: -0.1
+  scale: 0.35
+normal:
+  noise: 3
+  filter: sobel-high
+occlusion:
+  quality: 0.1
+  z-bias: 0
+  z-scale: 6
+  step-distance: 0.1
+smooth: {}
+f0:
+  value: 0.07
+porosity:
+  value: 0.63
+create-inventory: true
+wrap-x: true
+wrap-y: false

src/assets/minecraft/textures/block/cracked_stone_bricks/pbr.yml

@@ -1,4 +1,3 @@
-create-inventory: true
 alpha:
   value: 255
 albedo:
@@ -13,12 +12,13 @@ normal:
   filter: sobel3
 occlusion:
   quality: 0.1
-  z-bias: 0.1
-  z-scale: 4
-  steps: 4
+  z-bias: 0
+  z-scale: 12
+  step-distance: 0.1
 smooth:
   value: 0.05
 f0:
   value: 0.07
 porosity:
   value: 0.8
+create-inventory: true

src/assets/minecraft/textures/block/furnace_front/pbr.yml

@@ -2,18 +2,15 @@ alpha:
   value: 255
 height: {}
 normal:
-  strength: 0.6
+  strength: 1.2
   noise: 1
   filter: sobel-high
 occlusion:
   quality: 0.1
-  z-bias: 0.1
-  z-scale: 8
-  steps: 12
-smooth:
-  value: 0.02
-f0:
-  value: 0.07
-porosity:
-  value: 0.3
+  z-bias: 0
+  z-scale: 6
+  step-distance: 0.1
+smooth: {}
+f0: {}
+porosity: {}
 create-inventory: true