Skip to content

Commit ce912df

Browse files
authored
Merge pull request #131 from serenibyss/texture-updates
Update textures for ae2uel changes
2 parents 83e8b7c + 69d0f0c commit ce912df

File tree

5 files changed

+31
-91
lines changed

5 files changed

+31
-91
lines changed

src/main/resources/assets/ae2fc/models/item/part_dual_interface.json

Lines changed: 27 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,45 @@
11
{
22
"parent": "appliedenergistics2:item/part/part",
33
"textures": {
4-
"sides": "appliedenergistics2:parts/monitor_sides",
5-
"back": "appliedenergistics2:parts/monitor_back",
6-
"front": "ae2fc:blocks/interface"
4+
"sides": "ae2fc:blocks/interface_sides",
5+
"back": "ae2fc:blocks/interface_back",
6+
"front": "ae2fc:blocks/interface_part"
77
},
88
"elements": [
99
{
10-
"from": [
11-
2,
12-
2,
13-
7
14-
],
15-
"to": [
16-
14,
17-
14,
18-
9
19-
],
10+
"from": [2, 2, 7],
11+
"to": [14, 14, 9],
2012
"faces": {
21-
"north": {
22-
"texture": "#front"
23-
},
24-
"south": {
25-
"texture": "#back"
26-
},
27-
"east": {
28-
"texture": "#sides"
29-
},
30-
"west": {
31-
"texture": "#sides"
32-
},
33-
"up": {
34-
"texture": "#sides"
35-
},
36-
"down": {
37-
"texture": "#sides"
38-
}
13+
"north": { "uv": [2, 2, 14, 14], "texture": "#front" },
14+
"east": { "uv": [14, 2, 16, 14], "texture": "#sides" },
15+
"south": { "uv": [2, 2, 14, 14], "texture": "#back" },
16+
"west": { "uv": [0, 2, 2, 14], "texture": "#sides" },
17+
"up": { "uv": [2, 0, 14, 2], "texture": "#sides" },
18+
"down": { "uv": [2, 14, 14, 16], "texture": "#sides" }
3919
}
4020
},
4121
{
42-
"from": [
43-
5,
44-
5,
45-
10
46-
],
47-
"to": [
48-
11,
49-
11,
50-
11
51-
],
22+
"from": [5, 5, 10],
23+
"to": [11, 11, 11],
5224
"faces": {
53-
"north": {
54-
"texture": "#front"
55-
},
56-
"south": {
57-
"texture": "#back"
58-
},
59-
"east": {
60-
"texture": "#sides"
61-
},
62-
"west": {
63-
"texture": "#sides"
64-
},
65-
"up": {
66-
"texture": "#sides"
67-
},
68-
"down": {
69-
"texture": "#sides"
70-
}
25+
"north": { "uv": [5, 5, 11, 11], "texture": "#front" },
26+
"east": { "uv": [5, 5, 6, 11], "texture": "#sides" },
27+
"south": { "uv": [5, 5, 11, 11], "texture": "#back" },
28+
"west": { "uv": [10, 5, 11, 11], "texture": "#sides" },
29+
"up": { "uv": [5, 10, 11, 11], "texture": "#sides" },
30+
"down": { "uv": [5, 5, 11, 6], "texture": "#sides" }
7131
}
7232
},
7333
{
74-
"from": [
75-
5,
76-
5,
77-
9
78-
],
79-
"to": [
80-
11,
81-
11,
82-
10
83-
],
34+
"from": [5, 5, 9],
35+
"to": [11, 11, 10],
8436
"faces": {
85-
"north": {
86-
"texture": "#front"
87-
},
88-
"south": {
89-
"texture": "#back"
90-
},
91-
"east": {
92-
"texture": "#sides"
93-
},
94-
"west": {
95-
"texture": "#sides"
96-
},
97-
"up": {
98-
"texture": "#sides"
99-
},
100-
"down": {
101-
"texture": "#sides"
102-
}
37+
"north": { "uv": [5, 5, 11, 11], "texture": "#front" },
38+
"east": { "uv": [6, 5, 7, 11], "texture": "#sides" },
39+
"south": { "uv": [5, 5, 11, 11], "texture": "#back" },
40+
"west": { "uv": [9, 5, 10, 11], "texture": "#sides" },
41+
"up": { "uv": [5, 9, 11, 10], "texture": "#sides" },
42+
"down": { "uv": [5, 6, 11, 7], "texture": "#sides" }
10343
}
10444
}
10545
]

src/main/resources/assets/ae2fc/models/part/interface_base.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"textures": {
3-
"sides": "appliedenergistics2:parts/export_bus_sides",
3+
"sides": "ae2fc:blocks/interface_sides",
44
"sidesStatus": "appliedenergistics2:parts/monitor_sides_status",
5-
"back": "appliedenergistics2:parts/monitor_back",
6-
"front": "ae2fc:blocks/interface",
7-
"particle": "appliedenergistics2:parts/monitor_back"
5+
"back": "ae2fc:blocks/interface_back",
6+
"front": "ae2fc:blocks/interface_part",
7+
"particle": "ae2fc:blocks/interface_back"
88
},
99
"elements": [
1010
{
4.46 KB
Loading
1.98 KB
Loading
4.65 KB
Loading

0 commit comments

Comments
 (0)