Skip to content

Commit feb0c14

Browse files
committed
New textures for vacant and ancient pigment
1 parent 87bdc4e commit feb0c14

File tree

8 files changed

+171
-5
lines changed

8 files changed

+171
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "minecraft:item/generated",
33
"textures": {
4-
"layer0": "hexcasting:item/colorizer/uuid"
4+
"layer0": "hexcasting:item/colorizer/ancient"
55
}
66
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "minecraft:item/generated",
33
"textures": {
4-
"layer0": "hexcasting:item/colorizer/uuid"
4+
"layer0": "hexcasting:item/colorizer/default"
55
}
66
}

Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@
15641564

15651565
ancient_cyphers: {
15661566
"1": "While adventuring, I've come across what appear to be $(l:items/hexcasting)$(item)Cyphers/$ created by the Hexcasters of the ancient past. These $(item)Ancient Cyphers/$ work just like the ones I can craft: they can't be recharged, and will break when their reserve of _Media runs out. However, unlike my own $(l:items/hexcasting)$(item)Cyphers/$, their decayed structure allows me to glimpse the _Hex stored within.",
1567-
"2": "These may be useful for learning new techniques - who better to teach me than ancient masters of the art?$(br2)Alternatively, I could erase the contents of one and store my own _Hex inside, creating a casting item that clearly displays its own function."
1567+
"2": "These may be useful for learning new techniques - who better to teach me than ancient masters of the art?$(br2)Alternatively, I could erase the contents of one and store my own _Hex inside, creating a casting item that clearly displays its own function.",
15681568
"3": "The $(l:items/pigments)$(item)Pigment/$ baked into these relics is a unique blend of purple and orange, matching their copper-and-amethyst appearance. I can replicate it using the above recipe.",
15691569
},
15701570

2.9 KB
Loading
Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
{
2+
"animation": {
3+
"interpolate": false,
4+
"frames": [
5+
{
6+
"index": 0,
7+
"time": 10
8+
},
9+
{
10+
"index": 1,
11+
"time": 2
12+
},
13+
{
14+
"index": 2,
15+
"time": 2
16+
},
17+
{
18+
"index": 3,
19+
"time": 2
20+
},
21+
{
22+
"index": 4,
23+
"time": 2
24+
},
25+
{
26+
"index": 5,
27+
"time": 2
28+
},
29+
{
30+
"index": 6,
31+
"time": 2
32+
},
33+
{
34+
"index": 7,
35+
"time": 2
36+
},
37+
{
38+
"index": 8,
39+
"time": 1
40+
},
41+
{
42+
"index": 9,
43+
"time": 1
44+
},
45+
{
46+
"index": 10,
47+
"time": 1
48+
},
49+
{
50+
"index": 11,
51+
"time": 1
52+
},
53+
{
54+
"index": 12,
55+
"time": 1
56+
},
57+
{
58+
"index": 13,
59+
"time": 10
60+
},
61+
{
62+
"index": 14,
63+
"time": 1
64+
},
65+
{
66+
"index": 15,
67+
"time": 4
68+
},
69+
{
70+
"index": 16,
71+
"time": 1
72+
},
73+
{
74+
"index": 17,
75+
"time": 1
76+
},
77+
{
78+
"index": 18,
79+
"time": 1
80+
},
81+
{
82+
"index": 19,
83+
"time": 1
84+
},
85+
{
86+
"index": 20,
87+
"time": 1
88+
},
89+
{
90+
"index": 21,
91+
"time": 1
92+
},
93+
{
94+
"index": 22,
95+
"time": 1
96+
},
97+
{
98+
"index": 23,
99+
"time": 1
100+
},
101+
{
102+
"index": 24,
103+
"time": 1
104+
},
105+
{
106+
"index": 25,
107+
"time": 1
108+
},
109+
{
110+
"index": 26,
111+
"time": 1
112+
},
113+
{
114+
"index": 27,
115+
"time": 1
116+
},
117+
{
118+
"index": 28,
119+
"time": 1
120+
},
121+
{
122+
"index": 29,
123+
"time": 1
124+
}
125+
]
126+
}
127+
}
1022 Bytes
Loading
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"animation": {
3+
"interpolate": false,
4+
"frames": [
5+
{
6+
"index": 0,
7+
"time": 20
8+
},
9+
{
10+
"index": 1,
11+
"time": 4
12+
},
13+
{
14+
"index": 2,
15+
"time": 2
16+
},
17+
{
18+
"index": 3,
19+
"time": 2
20+
},
21+
{
22+
"index": 4,
23+
"time": 2
24+
},
25+
{
26+
"index": 5,
27+
"time": 1
28+
},
29+
{
30+
"index": 6,
31+
"time": 1
32+
},
33+
{
34+
"index": 7,
35+
"time": 1
36+
}
37+
]
38+
}
39+
}

Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ protected void registerModels() {
155155
singleTexture(getPath(HexItems.UUID_PIGMENT), new ResourceLocation("item/generated"),
156156
"layer0", modLoc("item/colorizer/uuid"));
157157
singleTexture(getPath(HexItems.DEFAULT_PIGMENT), new ResourceLocation("item/generated"),
158-
"layer0", modLoc("item/colorizer/uuid"));
158+
"layer0", modLoc("item/colorizer/default"));
159159
singleTexture(getPath(HexItems.ANCIENT_PIGMENT), new ResourceLocation("item/generated"),
160-
"layer0", modLoc("item/colorizer/uuid"));
160+
"layer0", modLoc("item/colorizer/ancient"));
161161

162162
simpleItem(modLoc("slate_blank"));
163163
simpleItem(modLoc("slate_written"));

0 commit comments

Comments
 (0)