Skip to content

Commit 3456559

Browse files
authored
Merge pull request #802 from Shibva/1.20.1-aria-for-painters
New year new minor fixes
2 parents 84f3cf3 + ee31070 commit 3456559

5 files changed

Lines changed: 46 additions & 23 deletions

File tree

‎src/main/resources/assets/spectrum/models/block/paltaeria_fragment_block.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,12 @@
88
"west": "spectrum:block/paltaeria_fragment_block_side",
99
"up": "spectrum:block/paltaeria_fragment_block_vertical",
1010
"down": "spectrum:block/paltaeria_fragment_block_vertical"
11-
}
11+
},
12+
"display": {
13+
"ground": {
14+
"rotation": [0, 0, -180],
15+
"translation": [0, -4.5, 0],
16+
"scale": [0.25, 0.25, 0.25]
17+
}
18+
}
1219
}

‎src/main/resources/assets/spectrum/models/block/paltaeria_ore.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "minecraft:block/cube_all",
33
"textures": {
44
"all": "spectrum:block/paltaeria_ore"
5-
}
5+
},
6+
"display": {
7+
"ground": {
8+
"rotation": [0, 0, -180],
9+
"translation": [0, -4.5, 0],
10+
"scale": [0.25, 0.25, 0.25]
11+
}
12+
}
613
}

‎src/main/resources/assets/spectrum/models/item/dreamflayer.json‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,18 @@
44
"layer0": "spectrum:item/dreamflayer"
55
},
66
"overrides": [
7+
8+
{
9+
"predicate": {
10+
"activated": 1.0
11+
},
12+
"model": "spectrum:item/dreamflayer_activated"
13+
},
714
{
815
"predicate": {
9-
"oversized": 0.0,
10-
"activated": 1.0
11-
},
12-
"model": "spectrum:item/dreamflayer_activated"
13-
},
14-
{
15-
"predicate": {
16-
"oversized": 1.0,
17-
"activated": 0.0
18-
},
19-
"model": "spectrum:item/dreamflayer_oversized"
20-
},
21-
{
22-
"predicate": {
23-
"activated": 1.0,
2416
"oversized": 1.0
2517
},
26-
"model": "spectrum:item/dreamflayer_activated_oversized"
18+
"model": "spectrum:item/dreamflayer_oversized"
2719
}
2820
]
2921
}

‎src/main/resources/assets/spectrum/models/item/dreamflayer_activated.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,13 @@
22
"parent": "spectrum:item/handheld_oversized",
33
"textures": {
44
"layer0": "spectrum:item/dreamflayer_activated"
5-
}
5+
},
6+
"overrides": [
7+
{
8+
"predicate": {
9+
"activated": 1.0
10+
},
11+
"model": "spectrum:item/dreamflayer_activated_oversized"
12+
}
13+
]
614
}
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
{
2-
"parent": "minecraft:item/generated",
3-
"textures": {
4-
"layer0": "spectrum:item/paltaeria_gem"
5-
}
2+
"format_version": "1.21.11",
3+
"credit": "Made with Blockbench",
4+
"parent": "minecraft:item/generated",
5+
"textures": {
6+
"layer0": "spectrum:item/paltaeria_gem"
7+
},
8+
"display": {
9+
"ground": {
10+
"rotation": [0, 0, 180],
11+
"translation": [0, -4.5, 0],
12+
"scale": [0.5, 0.5, 0.5]
13+
}
14+
}
615
}

0 commit comments

Comments
 (0)