improved nether_portal, crimson/warped stem +hyphae, crimson/warped n…

…ylium, clay, barrel, iron_block, gold_block; added crimson_roots, big_dripleaf

.github/workflows/Release.yml

@@ -336,8 +336,24 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: Textureless-LabPbr-32x
+      - run: mv 'Textureless-LabPbr-32x.zip' 'Textureless-LabPbr-32x-v${{ github.event.inputs.version }}.zip'
       - name: Upload LabPbr 32x
         run: |
           curl -X POST \
-            -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x", gameVersions: [8203]}' \
-            -F '[email protected]' 'https://minecraft.curseforge.com/api/projects/469686/upload-file?token=${{secrets.CF_API_TOKEN}}'
+            -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [8203]}' \
+            -F 'file=@Textureless-LabPbr-32x-v${{ github.event.inputs.version }}.zip' 'https://minecraft.curseforge.com/api/projects/469686/upload-file?token=${{secrets.CF_API_TOKEN}}'
+
+  Upload-Models-CurseForge:
+    runs-on: ubuntu-latest
+    needs: Create-Release
+    steps:
+      - name: Download LabPbr Models 32x
+        uses: actions/download-artifact@v2
+        with:
+          name: Textureless-Models-LabPbr-32x
+      - run: mv 'Textureless-Models-LabPbr-32x.zip' 'Textureless-Models-LabPbr-32x-v${{ github.event.inputs.version }}.zip'
+      - name: Upload LabPbr Models 32x
+        run: |
+          curl -X POST \
+            -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [8203]}' \
+            -F 'file=@Textureless-Models-LabPbr-32x-v${{ github.event.inputs.version }}.zip' 'https://minecraft.curseforge.com/api/projects/582743/upload-file?token=${{secrets.CF_API_TOKEN}}'

src-models/assets/minecraft/blockstates/crimson_roots.json

@@ -0,0 +1,36 @@
+{
+  "variants": {
+    "": [
+    	{
+	      "model": "block/crimson_roots"
+	    },
+    	{
+	      "model": "block/crimson_roots",
+	      "y": 90
+	    },
+    	{
+	      "model": "block/crimson_roots",
+	      "y": 180
+	    },
+    	{
+	      "model": "block/crimson_roots",
+	      "y": 270
+	    },
+    	{
+	      "model": "block/crimson_roots2"
+	    },
+    	{
+	      "model": "block/crimson_roots2",
+	      "y": 90
+	    },
+    	{
+	      "model": "block/crimson_roots2",
+	      "y": 180
+	    },
+    	{
+	      "model": "block/crimson_roots2",
+	      "y": 270
+	    }
+    ]
+  }
+}

src-models/assets/minecraft/models/block/crimson_roots.json

@@ -0,0 +1,7 @@
+{
+	"parent": "block/template_grass1",
+	"textures": {
+		"grass": "block/crimson_roots",
+		"particle": "block/crimson_roots_inventory"
+	}
+}

src-models/assets/minecraft/models/block/crimson_roots2.json

@@ -0,0 +1,7 @@
+{
+	"parent": "block/template_grass2",
+	"textures": {
+		"grass": "block/crimson_roots",
+		"particle": "block/crimson_roots_inventory"
+	}
+}

src/assets/minecraft/optifine/ctm/clay/mat.yml

@@ -0,0 +1,20 @@
+publish-item: true
+height:
+  scale: 0.4
+  edge-fade-x: 1
+  edge-fade-y: 1
+normal:
+  method: sobel-low
+  strength: 1
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 4
+f0:
+  value: 0.053
+ctm:
+  method: of-repeat
+  width: 6
+  height: 6
+  match-tiles: clay
+  placeholder: true

src/assets/minecraft/optifine/ctm/concrete/mat.yml

@@ -4,17 +4,19 @@ color:
   value-green: 148
   value-blue: 148
 height:
-  scale: 0.05
+  texture: bump.png
+  shift: -0.02
+  scale: 0.06
   auto-level: true
 normal:
-  noise: 2
+  noise: 3
   method: sobel-high
-  strength: 3
+  strength: 2
 occlusion:
-  scale: 0.2
-  step-distance: 0.15
-  z-bias: 0.6
-  z-scale: 3
+  scale: 0.6
+  step-distance: 0.1
+  z-bias: 2
+  z-scale: 20
 smooth:
   scale: 0.35
 f0:

src/assets/minecraft/optifine/ctm/crimson_nylium/mat.yml

@@ -0,0 +1,23 @@
+publish-item: true
+height:
+  shift: -0.14
+  scale: 0.4
+  edge-fade-x: 2
+  edge-fade-y: 2
+normal:
+  noise: 5
+  method: sobel3
+  strength: 0.6
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 5
+smooth:
+  shift: 0.15
+  scale: 0.7
+ctm:
+  method: of-repeat
+  width: 8
+  height: 8
+  match-tiles: crimson_nylium
+  placeholder: true

src/assets/minecraft/optifine/ctm/crimson_roots/2/mat.yml

@@ -0,0 +1,19 @@
+wrap-x: false
+wrap-y: false
+model: cross_mirrored
+blend-mode: cutout
+height:
+  texture: opacity.png
+  scale: 0.05
+  edge-fade-x: 0.01
+  edge-fade-y: 0.01
+normal:
+  noise: 3
+  method: sobel5
+occlusion:
+  scale: 0.6
+  step-distance: 0.15
+  z-bias: 0.2
+f0:
+  value: 0.03
+ctm: {}

src/assets/minecraft/optifine/ctm/crimson_roots/3/mat.yml

@@ -0,0 +1,19 @@
+wrap-x: false
+wrap-y: false
+model: cross_mirrored
+blend-mode: cutout
+height:
+  texture: opacity.png
+  scale: 0.05
+  edge-fade-x: 0.01
+  edge-fade-y: 0.01
+normal:
+  noise: 3
+  method: sobel5
+occlusion:
+  scale: 0.6
+  step-distance: 0.15
+  z-bias: 0.2
+f0:
+  value: 0.03
+ctm: {}

src/assets/minecraft/optifine/ctm/crimson_roots/crimson_roots.properties

@@ -0,0 +1,4 @@
+matchTiles=crimson_roots
+method=random
+symmetry=opposite
+tiles=textures/block/crimson_roots 2-3

src/assets/minecraft/optifine/ctm/gold_block/mat.yml

@@ -10,8 +10,8 @@ occlusion:
   z-bias: 2
   z-scale: 1
 smooth:
-  shift: 0.7
-  scale: 0.5
+  shift: 2.6
+  scale: 0.2
 metal:
   value: 231
 porosity:

src/assets/minecraft/optifine/ctm/iron_block/mat.yml

@@ -9,8 +9,8 @@ normal:
 occlusion:
   z-scale: 0.2
 smooth:
-  shift: 0.6
-  scale: 0.6
+  shift: 4
+  scale: 0.2
 metal:
   value: 230
 porosity:

src/assets/minecraft/optifine/ctm/red_sand/mat.yml

@@ -1,3 +1,4 @@
+publish-item: true
 height:
   shift: -0.25
   scale: 0.16

src/assets/minecraft/optifine/ctm/sand/mat.yml

@@ -1,3 +1,4 @@
+publish-item: true
 height:
   shift: -0.25
   scale: 0.16

src/assets/minecraft/optifine/ctm/warped_nylium/mat.yml

@@ -0,0 +1,24 @@
+publish-item: true
+blend-mode: cutout
+height:
+  shift: -0.14
+  scale: 0.4
+  edge-fade-x: 2
+  edge-fade-y: 2
+normal:
+  noise: 5
+  method: sobel3
+  strength: 0.6
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 5
+smooth:
+  shift: 0.15
+  scale: 0.7
+ctm:
+  method: of-repeat
+  width: 8
+  height: 8
+  match-tiles: warped_nylium
+  placeholder: true

src/assets/minecraft/textures/block/barrel_bottom/mat.yml

@@ -1,25 +1,26 @@
-alpha:
+publish-item: true
+wrap-x: true
+wrap-y: true
+opacity:
   value: 255
-albedo:
-  value-red: 138
-  value-green: 102
-  value-blue: 58
 height:
   scale: 0.8
 normal:
-  strength: 0.5
-  curve-x: 20
-  curve-y: 20
-  filter: sobel-high
+  noise: 4
+  curve-x: 90
+  curve-y: 90
+  radius-x: 0.16
+  radius-y: 0.16
+  method: sobel-low
+  strength: 4
 occlusion:
-  z-bias: 1
-  z-scale: 2
-  step-distance: 0.2
+  step-distance: 0.1
+  z-bias: 0.6
+  z-scale: 6
 smooth:
-  value: 0.08
+  value: 0.043
 f0:
   value: 0.04
 porosity:
-  value: 0.59
-create-inventory: true
-wrap-x: false
+  value: 0.9
+ctm: {}

src/assets/minecraft/textures/block/barrel_side/mat.yml

@@ -1,17 +1,23 @@
-publish-inventory: true
+publish-item: true
 wrap-x: false
 wrap-y: false
 opacity:
   value: 255
 height:
-  shift: -0.08
-  edge-fade-x: 0.4
-  edge-fade-y: 0.4
+  shift: -0.12
+  scale: 0.5
+  edge-fade-x: 0.5
+  edge-fade-y: 0.5
 normal:
+  noise: 1
   curve-x: 90
+  curve-y: 90
   radius-x: 0.4
+  radius-y: 0.16
   method: sobel-low
+  strength: 4
 occlusion:
-  step-distance: 0.2
+  step-distance: 0.1
   z-bias: 1
-  z-scale: 3
+  z-scale: 6
+ctm: {}

src/assets/minecraft/textures/block/barrel_top/mat.yml

@@ -1,15 +1,20 @@
-publish-inventory: true
-wrap-x: false
-wrap-y: false
-alpha:
+publish-item: true
+wrap-x: true
+wrap-y: true
+opacity:
   value: 255
 height:
-  scale: 0.6
+  scale: 0.8
 normal:
+  noise: 4
+  curve-x: 90
+  curve-y: 90
+  radius-x: 0.16
+  radius-y: 0.16
   method: sobel-low
-  curve-x: 20
-  curve-y: 20
+  strength: 4
 occlusion:
-  step-distance: 0.2
-  z-bias: 1
-  z-scale: 3
+  step-distance: 0.1
+  z-bias: 0.6
+  z-scale: 6
+ctm: {}

src/assets/minecraft/textures/block/barrel_top_open/mat.yml

@@ -1,21 +1,24 @@
-wrap-x: false
+publish-item: true
+wrap-x: true
+wrap-y: true
 opacity:
   value: 255
-color:
-  value-red: 138
-  value-green: 102
-  value-blue: 58
+height:
+  scale: 0.8
 normal:
-  curve-x: 20
-  curve-y: 20
-  method: sobel-high
-  strength: 0.5
+  noise: 4
+  curve-x: 90
+  curve-y: 90
+  radius-x: 0.16
+  radius-y: 0.16
+  method: sobel-low
+  strength: 4
 occlusion:
-  step-distance: 0.25
-  z-bias: 1
-  z-scale: 3
+  step-distance: 0.1
+  z-bias: 0.6
+  z-scale: 6
 smooth:
-  value: 0.08
+  value: 0.043
 f0:
   value: 0.04
 porosity: