Skip to content

Commit efebb69

Browse files
JuuxelJuuxel
committed
Add tuff, tuff brick and polished tuff block variants
1 parent 5cf2876 commit efebb69

File tree

75 files changed

+994
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+994
-1
lines changed

‎common/src/data/vanilla.xml

+3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<stone id="minecraft:polished_deepslate"/>
6565
<stone id="minecraft:polished_diorite"/>
6666
<stone id="minecraft:polished_granite"/>
67+
<stone id="minecraft:polished_tuff"/>
6768
<stone id="minecraft:prismarine"/>
6869
<stone id="minecraft:prismarine_brick" bricks="true"/>
6970
<stone id="minecraft:purpur">
@@ -95,4 +96,6 @@
9596
<stone id="minecraft:smooth_stone"/>
9697
<stone id="minecraft:stone_brick" bricks="true"/>
9798
<stone id="minecraft:stone"/>
99+
<stone id="minecraft:tuff"/>
100+
<stone id="minecraft:tuff_brick" bricks="true"/>
98101
</data_generators>

‎common/src/generated/resources/assets/adorn/blockstates/polished_tuff_platform.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "adorn:block/polished_tuff_platform"
5+
}
6+
}
7+
}

‎common/src/generated/resources/assets/adorn/blockstates/polished_tuff_post.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"variants": {
3+
"axis=z": {
4+
"model": "adorn:block/polished_tuff_post",
5+
"x": 90
6+
},
7+
"axis=x": {
8+
"model": "adorn:block/polished_tuff_post",
9+
"x": 90,
10+
"y": 90
11+
},
12+
"axis=y": {
13+
"model": "adorn:block/polished_tuff_post"
14+
}
15+
}
16+
}

‎common/src/generated/resources/assets/adorn/blockstates/polished_tuff_step.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "adorn:block/polished_tuff_step"
5+
}
6+
}
7+
}

‎common/src/generated/resources/assets/adorn/blockstates/tuff_brick_platform.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "adorn:block/tuff_brick_platform"
5+
}
6+
}
7+
}

‎common/src/generated/resources/assets/adorn/blockstates/tuff_brick_post.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"variants": {
3+
"axis=z": {
4+
"model": "adorn:block/tuff_brick_post",
5+
"x": 90
6+
},
7+
"axis=x": {
8+
"model": "adorn:block/tuff_brick_post",
9+
"x": 90,
10+
"y": 90
11+
},
12+
"axis=y": {
13+
"model": "adorn:block/tuff_brick_post"
14+
}
15+
}
16+
}

‎common/src/generated/resources/assets/adorn/blockstates/tuff_brick_step.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "adorn:block/tuff_brick_step"
5+
}
6+
}
7+
}

‎common/src/generated/resources/assets/adorn/blockstates/tuff_platform.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "adorn:block/tuff_platform"
5+
}
6+
}
7+
}

‎common/src/generated/resources/assets/adorn/blockstates/tuff_post.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"variants": {
3+
"axis=z": {
4+
"model": "adorn:block/tuff_post",
5+
"x": 90
6+
},
7+
"axis=x": {
8+
"model": "adorn:block/tuff_post",
9+
"x": 90,
10+
"y": 90
11+
},
12+
"axis=y": {
13+
"model": "adorn:block/tuff_post"
14+
}
15+
}
16+
}

‎common/src/generated/resources/assets/adorn/blockstates/tuff_step.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "adorn:block/tuff_step"
5+
}
6+
}
7+
}

‎common/src/generated/resources/assets/adorn/models/block/polished_tuff_platform.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/platform",
3+
"textures": {
4+
"texture": "minecraft:block/polished_tuff"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/block/polished_tuff_post.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/post",
3+
"textures": {
4+
"texture": "minecraft:block/polished_tuff"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/block/polished_tuff_step.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/step",
3+
"textures": {
4+
"texture": "minecraft:block/polished_tuff"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/block/tuff_brick_platform.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/platform",
3+
"textures": {
4+
"texture": "minecraft:block/tuff_bricks"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/block/tuff_brick_post.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/post",
3+
"textures": {
4+
"texture": "minecraft:block/tuff_bricks"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/block/tuff_brick_step.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/step",
3+
"textures": {
4+
"texture": "minecraft:block/tuff_bricks"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/block/tuff_platform.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/platform",
3+
"textures": {
4+
"texture": "minecraft:block/tuff"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/block/tuff_post.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/post",
3+
"textures": {
4+
"texture": "minecraft:block/tuff"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/block/tuff_step.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "adorn:block/templates/step",
3+
"textures": {
4+
"texture": "minecraft:block/tuff"
5+
}
6+
}

‎common/src/generated/resources/assets/adorn/models/item/polished_tuff_platform.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/polished_tuff_platform"
3+
}

‎common/src/generated/resources/assets/adorn/models/item/polished_tuff_post.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/polished_tuff_post"
3+
}

‎common/src/generated/resources/assets/adorn/models/item/polished_tuff_step.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/polished_tuff_step"
3+
}

‎common/src/generated/resources/assets/adorn/models/item/tuff_brick_platform.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/tuff_brick_platform"
3+
}

‎common/src/generated/resources/assets/adorn/models/item/tuff_brick_post.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/tuff_brick_post"
3+
}

‎common/src/generated/resources/assets/adorn/models/item/tuff_brick_step.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/tuff_brick_step"
3+
}

‎common/src/generated/resources/assets/adorn/models/item/tuff_platform.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/tuff_platform"
3+
}

‎common/src/generated/resources/assets/adorn/models/item/tuff_post.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/tuff_post"
3+
}

‎common/src/generated/resources/assets/adorn/models/item/tuff_step.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "adorn:block/tuff_step"
3+
}

‎common/src/generated/resources/data/adorn/advancement/recipes/polished_tuff_platform.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"adorn:polished_tuff_platform"
6+
]
7+
},
8+
"criteria": {
9+
"has_slab": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"minecraft:polished_tuff_slab"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "adorn:polished_tuff_platform"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_slab",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

‎common/src/generated/resources/data/adorn/advancement/recipes/polished_tuff_post.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"adorn:polished_tuff_post"
6+
]
7+
},
8+
"criteria": {
9+
"has_polished_tuff": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"minecraft:polished_tuff"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "adorn:polished_tuff_post"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_polished_tuff",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

‎common/src/generated/resources/data/adorn/advancement/recipes/polished_tuff_step.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"adorn:polished_tuff_step"
6+
]
7+
},
8+
"criteria": {
9+
"has_slab": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"minecraft:polished_tuff_slab"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "adorn:polished_tuff_step"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_slab",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

‎common/src/generated/resources/data/adorn/advancement/recipes/tuff_brick_platform.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"adorn:tuff_brick_platform"
6+
]
7+
},
8+
"criteria": {
9+
"has_slab": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"minecraft:tuff_brick_slab"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "adorn:tuff_brick_platform"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_slab",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

‎common/src/generated/resources/data/adorn/advancement/recipes/tuff_brick_post.json

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"adorn:tuff_brick_post"
6+
]
7+
},
8+
"criteria": {
9+
"has_tuff_bricks": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"minecraft:tuff_bricks"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "adorn:tuff_brick_post"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_tuff_bricks",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

0 commit comments

Comments
 (0)