Skip to content

Commit

Permalink
add netherrack gold & quartz ore models; improved crimson/warped nyli…
Browse files Browse the repository at this point in the history
…um sides, gilded blackstone
  • Loading branch information
null511 committed Mar 1, 2022
1 parent bb3afaa commit d8c570a
Show file tree
Hide file tree
Showing 131 changed files with 458 additions and 67 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ jobs:
- name: Upload LabPbr 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 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [9008,8857,8830,8516,8203,8152,8134,8056,8010,7892,7890,7675,7664,7469,7413,7361,7344,7318,7132,7107,7081]}' \
-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:
Expand All @@ -355,5 +355,5 @@ jobs:
- 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 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [9008,8857,8830,8516,8203,8152,8134,8056,8010,7892,7890,7675,7664,7469,7413,7361,7344,7318,7132,7107,7081]}' \
-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}}'
79 changes: 79 additions & 0 deletions src-models/assets/minecraft/blockstates/nether_gold_ore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"multipart": [
{
"apply": { "model": "block/nether_gold_ore" }
},
{
"apply": [
{ "model": "block/nether_gold_ore_end1", "weight": 1 },
{ "model": "block/nether_gold_ore_end1", "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end1", "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end1", "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end2", "weight": 1 },
{ "model": "block/nether_gold_ore_end2", "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end2", "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end2", "y": 270, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_gold_ore_end1", "x": 180, "weight": 1 },
{ "model": "block/nether_gold_ore_end1", "x": 180, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end1", "x": 180, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end1", "x": 180, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end2", "x": 180, "weight": 1 },
{ "model": "block/nether_gold_ore_end2", "x": 180, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end2", "x": 180, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_end2", "x": 180, "y": 270, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_gold_ore_side1", "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 270, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_gold_ore_side1", "y": 90, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 90, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 180, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 270, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "y": 90, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 90, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 180, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 270, "y": 90, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_gold_ore_side1", "y": 180, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 90, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 180, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 270, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "y": 180, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 90, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 180, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 270, "y": 180, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_gold_ore_side1", "y": 270, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 90, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 180, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side1", "x": 270, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "y": 270, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 90, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 180, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_gold_ore_side2", "x": 270, "y": 270, "uvlock": true, "weight": 1 }
]
}
]
}
79 changes: 79 additions & 0 deletions src-models/assets/minecraft/blockstates/nether_quartz_ore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"multipart": [
{
"apply": { "model": "block/nether_quartz_ore" }
},
{
"apply": [
{ "model": "block/nether_quartz_ore_end1", "weight": 1 },
{ "model": "block/nether_quartz_ore_end1", "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end1", "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end1", "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end2", "weight": 1 },
{ "model": "block/nether_quartz_ore_end2", "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end2", "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end2", "y": 270, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_quartz_ore_end1", "x": 180, "weight": 1 },
{ "model": "block/nether_quartz_ore_end1", "x": 180, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end1", "x": 180, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end1", "x": 180, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end2", "x": 180, "weight": 1 },
{ "model": "block/nether_quartz_ore_end2", "x": 180, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end2", "x": 180, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_end2", "x": 180, "y": 270, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_quartz_ore_side1", "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 270, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_quartz_ore_side1", "y": 90, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 90, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 180, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 270, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "y": 90, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 90, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 180, "y": 90, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 270, "y": 90, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_quartz_ore_side1", "y": 180, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 90, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 180, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 270, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "y": 180, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 90, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 180, "y": 180, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 270, "y": 180, "uvlock": true, "weight": 1 }
]
},
{
"apply": [
{ "model": "block/nether_quartz_ore_side1", "y": 270, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 90, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 180, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side1", "x": 270, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "y": 270, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 90, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 180, "y": 270, "uvlock": true, "weight": 1 },
{ "model": "block/nether_quartz_ore_side2", "x": 270, "y": 270, "uvlock": true, "weight": 1 }
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent":"block/ore_end1",
"textures": {
"ore":"block/raw_gold_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent":"block/ore_end2",
"textures": {
"ore":"block/raw_gold_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent":"block/ore_side1",
"textures": {
"ore":"block/raw_gold_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent":"block/ore_side2",
"textures": {
"ore":"block/raw_gold_block"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent":"block/ore_end1",
"textures": {
"ore":"block/quartz_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent":"block/ore_end2",
"textures": {
"ore":"block/quartz_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent":"block/ore_side1",
"textures": {
"ore":"block/quartz_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent":"block/ore_side2",
"textures": {
"ore":"block/quartz_ore"
}
}
31 changes: 31 additions & 0 deletions src-models/assets/minecraft/models/block/ore_end1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"ambientocclusion": false,
"elements": [
{
"from": [8, 13.8, 9],
"to": [12, 18.8, 13],
"shade": false,
"rotation": {"angle": 22.5, "axis": "x", "origin": [13, 16, 10]},
"faces": {
"north": {"uv": [4, 7, 8, 12], "texture": "#ore", "cullface": "up"},
"east": {"uv": [0, 7, 4, 12], "texture": "#ore", "cullface": "up"},
"south": {"uv": [12, 7, 16, 12], "texture": "#ore", "cullface": "up"},
"west": {"uv": [8, 7, 12, 12], "texture": "#ore", "cullface": "up"},
"up": {"uv": [4, 3, 8, 7], "texture": "#ore", "cullface": "up"}
}
},
{
"from": [3, 13.8, 3],
"to": [7, 17.8, 7],
"shade": false,
"rotation": {"angle": 22.5, "axis": "z", "origin": [2, 16, 5]},
"faces": {
"north": {"uv": [4, 7, 8, 11], "texture": "#ore", "cullface": "up"},
"east": {"uv": [0, 7, 4, 11], "texture": "#ore", "cullface": "up"},
"south": {"uv": [12, 7, 16, 11], "texture": "#ore", "cullface": "up"},
"west": {"uv": [8, 7, 12, 11], "texture": "#ore", "cullface": "up"},
"up": {"uv": [4, 3, 8, 7], "texture": "#ore", "cullface": "up"}
}
}
]
}
31 changes: 31 additions & 0 deletions src-models/assets/minecraft/models/block/ore_end2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"ambientocclusion": false,
"elements": [
{
"from": [8, 13.8, 9],
"to": [12, 18.8, 13],
"shade": false,
"rotation": {"angle": -22.5, "axis": "z", "origin": [13, 16, 10]},
"faces": {
"north": {"uv": [4, 7, 8, 12], "texture": "#ore", "cullface": "up"},
"east": {"uv": [0, 7, 4, 12], "texture": "#ore", "cullface": "up"},
"south": {"uv": [12, 7, 16, 12], "texture": "#ore", "cullface": "up"},
"west": {"uv": [8, 7, 12, 12], "texture": "#ore", "cullface": "up"},
"up": {"uv": [4, 3, 8, 7], "texture": "#ore", "cullface": "up"}
}
},
{
"from": [3, 13.8, 3],
"to": [7, 17.8, 7],
"shade": false,
"rotation": {"angle": 22.5, "axis": "x", "origin": [2, 16, 5]},
"faces": {
"north": {"uv": [4, 7, 8, 11], "texture": "#ore", "cullface": "up"},
"east": {"uv": [0, 7, 4, 11], "texture": "#ore", "cullface": "up"},
"south": {"uv": [12, 7, 16, 11], "texture": "#ore", "cullface": "up"},
"west": {"uv": [8, 7, 12, 11], "texture": "#ore", "cullface": "up"},
"up": {"uv": [4, 3, 8, 7], "texture": "#ore", "cullface": "up"}
}
}
]
}
31 changes: 31 additions & 0 deletions src-models/assets/minecraft/models/block/ore_side1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"ambientocclusion": false,
"elements": [
{
"from": [-2.8, 9, 9],
"to": [2.2, 13, 13],
"shade": false,
"rotation": {"angle": 22.5, "axis": "y", "origin": [0, 14, 10]},
"faces": {
"north": {"uv": [4, 7, 8, 12], "rotation": 90, "texture": "#ore", "cullface": "west"},
"south": {"uv": [12, 7, 16, 12], "rotation": 270, "texture": "#ore", "cullface": "west"},
"west": {"uv": [4, 3, 8, 7], "rotation": 270, "texture": "#ore", "cullface": "west"},
"up": {"uv": [0, 7, 4, 12], "rotation": 270, "texture": "#ore", "cullface": "west"},
"down": {"uv": [8, 7, 12, 12], "rotation": 270, "texture": "#ore", "cullface": "west"}
}
},
{
"from": [-1.8, 4, 3],
"to": [2.2, 8, 7],
"shade": false,
"rotation": {"angle": 22.5, "axis": "z", "origin": [0, 3, 5]},
"faces": {
"north": {"uv": [4, 7, 8, 11], "rotation": 90, "texture": "#ore", "cullface": "west"},
"south": {"uv": [12, 7, 16, 11], "rotation": 270, "texture": "#ore", "cullface": "west"},
"west": {"uv": [4, 3, 8, 7], "rotation": 270, "texture": "#ore", "cullface": "west"},
"up": {"uv": [0, 7, 4, 11], "rotation": 270, "texture": "#ore", "cullface": "west"},
"down": {"uv": [8, 7, 12, 11], "rotation": 270, "texture": "#ore", "cullface": "west"}
}
}
]
}
31 changes: 31 additions & 0 deletions src-models/assets/minecraft/models/block/ore_side2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"ambientocclusion": false,
"elements": [
{
"from": [-2.8, 8, 9],
"to": [2.2, 12, 13],
"shade": false,
"rotation": {"angle": -22.5, "axis": "z", "origin": [0, 13, 10]},
"faces": {
"north": {"uv": [4, 7, 8, 12], "rotation": 90, "texture": "#ore", "cullface": "west"},
"south": {"uv": [12, 7, 16, 12], "rotation": 270, "texture": "#ore", "cullface": "west"},
"west": {"uv": [4, 3, 8, 7], "rotation": 270, "texture": "#ore", "cullface": "west"},
"up": {"uv": [0, 7, 4, 12], "rotation": 270, "texture": "#ore", "cullface": "west"},
"down": {"uv": [8, 7, 12, 12], "rotation": 270, "texture": "#ore", "cullface": "west"}
}
},
{
"from": [-1.8, 3, 3],
"to": [2.2, 7, 7],
"shade": false,
"rotation": {"angle": 22.5, "axis": "y", "origin": [0, 2, 5]},
"faces": {
"north": {"uv": [4, 7, 8, 11], "rotation": 90, "texture": "#ore", "cullface": "west"},
"south": {"uv": [12, 7, 16, 11], "rotation": 270, "texture": "#ore", "cullface": "west"},
"west": {"uv": [4, 3, 8, 7], "rotation": 270, "texture": "#ore", "cullface": "west"},
"up": {"uv": [0, 7, 4, 11], "rotation": 270, "texture": "#ore", "cullface": "west"},
"down": {"uv": [8, 7, 12, 11], "rotation": 270, "texture": "#ore", "cullface": "west"}
}
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src-models/assets/minecraft/textures/block/quartz_ore/mat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
publish-item: false
height:
scale: 0.05
normal:
noise: 12
strength: 0.2
occlusion:
step-distance: 0.1
z-scale: 1
f0:
value: 0.035
porosity:
value: 0
sss:
value: 0.6
ctm: {}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d8c570a

Please sign in to comment.