Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 2250c2a

Browse files
TrinsdarTrinsdar
committed
fixed models of huge pipes
1 parent 58b1fc5 commit 2250c2a

File tree

10 files changed

+254
-44
lines changed

10 files changed

+254
-44
lines changed

‎common/src/main/resources/assets/antimatter/models/block/pipe/huge/all.json‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"from": [2, 2, 0],
99
"to": [14, 14, 16],
1010
"faces": {
11-
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
11+
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1212
"east": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
13-
"south": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
13+
"south": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1414
"west": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
1515
"up": {"uv": [2, 0, 14, 16], "texture": "#all", "tintindex": 0},
1616
"down": {"uv": [2, 0, 14, 16], "texture": "#all", "tintindex": 0}
@@ -21,7 +21,7 @@
2121
"to": [16, 14, 14],
2222
"faces": {
2323
"north": {"uv": [0, 2, 2, 14], "texture": "#all", "tintindex": 0},
24-
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
24+
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
2525
"south": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2626
"up": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2727
"down": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0}
@@ -33,7 +33,7 @@
3333
"faces": {
3434
"north": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
3535
"south": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
36-
"west": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
36+
"west": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
3737
"up": {"uv": [0, 2, 2, 14], "texture": "#all", "tintindex": 0},
3838
"down": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0}
3939
}
@@ -46,7 +46,7 @@
4646
"east": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
4747
"south": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
4848
"west": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
49-
"up": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1}
49+
"up": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0}
5050
}
5151
},
5252
{
@@ -57,8 +57,50 @@
5757
"east": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
5858
"south": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
5959
"west": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
60-
"down": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1}
60+
"down": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0}
6161
}
62-
}
62+
},
63+
{
64+
"from": [3, -0.01, 3],
65+
"to": [13, -0.01, 13],
66+
"faces": {
67+
"down": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
68+
}
69+
},
70+
{
71+
"from": [3, 16.01, 3],
72+
"to": [13, 16.01, 13],
73+
"faces": {
74+
"up": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
75+
}
76+
},
77+
{
78+
"from": [3, 3, -0.01],
79+
"to": [13, 13, -0.01],
80+
"faces": {
81+
"north": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
82+
}
83+
},
84+
{
85+
"from": [3, 3, 16.01],
86+
"to": [13, 13, 16.01],
87+
"faces": {
88+
"south": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
89+
}
90+
},
91+
{
92+
"from": [16.01, 3, 3],
93+
"to": [16.01, 13, 13],
94+
"faces": {
95+
"east": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
96+
}
97+
},
98+
{
99+
"from": [-0.01, 3, 3],
100+
"to": [-0.01, 13, 13],
101+
"faces": {
102+
"west": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
103+
}
104+
}
63105
]
64106
}

‎common/src/main/resources/assets/antimatter/models/block/pipe/huge/arrow.json‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"color": 7,
1111
"faces": {
1212
"north": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
13-
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
13+
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1414
"south": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
15-
"west": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
15+
"west": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1616
"up": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
1717
"down": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0}
1818
}
@@ -21,7 +21,7 @@
2121
"from": [2, 2, 0],
2222
"to": [14, 14, 2],
2323
"faces": {
24-
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
24+
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
2525
"east": {"uv": [2, 2, 4, 14], "texture": "#all", "tintindex": 0},
2626
"west": {"uv": [12, 2, 14, 14], "texture": "#all", "tintindex": 0},
2727
"up": {"uv": [2, 2, 14, 4], "texture": "#all", "tintindex": 0},
@@ -36,8 +36,36 @@
3636
"east": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
3737
"south": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
3838
"west": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
39-
"up": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1}
39+
"up": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0}
4040
}
41-
}
41+
},
42+
{
43+
"from": [3, 16.01, 3],
44+
"to": [13, 16.01, 13],
45+
"faces": {
46+
"up": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
47+
}
48+
},
49+
{
50+
"from": [3, 3, -0.01],
51+
"to": [13, 13, -0.01],
52+
"faces": {
53+
"north": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
54+
}
55+
},
56+
{
57+
"from": [16.01, 3, 3],
58+
"to": [16.01, 13, 13],
59+
"faces": {
60+
"east": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
61+
}
62+
},
63+
{
64+
"from": [-0.01, 3, 3],
65+
"to": [-0.01, 13, 13],
66+
"faces": {
67+
"west": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
68+
}
69+
}
4270
]
4371
}

‎common/src/main/resources/assets/antimatter/models/block/pipe/huge/corner.json‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"from": [2, 2, 0],
99
"to": [14, 14, 14],
1010
"faces": {
11-
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
11+
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1212
"east": {"uv": [2, 2, 16, 14], "texture": "#all", "tintindex": 0},
1313
"south": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1414
"west": {"uv": [0, 2, 14, 14], "texture": "#all", "tintindex": 0},
@@ -21,7 +21,7 @@
2121
"to": [16, 14, 14],
2222
"faces": {
2323
"north": {"uv": [0, 2, 2, 14], "texture": "#all", "tintindex": 0},
24-
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
24+
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
2525
"south": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2626
"up": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2727
"down": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0}
@@ -35,8 +35,29 @@
3535
"east": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
3636
"south": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
3737
"west": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
38-
"up": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1}
38+
"up": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0}
3939
}
40-
}
41-
]
40+
},
41+
{
42+
"from": [3, 16.01, 3],
43+
"to": [13, 16.01, 13],
44+
"faces": {
45+
"up": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
46+
}
47+
},
48+
{
49+
"from": [3, 3, -0.01],
50+
"to": [13, 13, -0.01],
51+
"faces": {
52+
"north": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
53+
}
54+
},
55+
{
56+
"from": [16.01, 3, 3],
57+
"to": [16.01, 13, 13],
58+
"faces": {
59+
"east": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
60+
}
61+
}
62+
]
4263
}

‎common/src/main/resources/assets/antimatter/models/block/pipe/huge/cross.json‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"from": [2, 2, 0],
99
"to": [14, 14, 16],
1010
"faces": {
11-
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
11+
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1212
"east": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
13-
"south": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
13+
"south": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1414
"west": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
1515
"up": {"uv": [2, 0, 14, 16], "texture": "#all", "tintindex": 0},
1616
"down": {"uv": [2, 0, 14, 16], "texture": "#all", "tintindex": 0}
@@ -21,7 +21,7 @@
2121
"to": [16, 14, 14],
2222
"faces": {
2323
"north": {"uv": [0, 2, 2, 14], "texture": "#all", "tintindex": 0},
24-
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
24+
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
2525
"south": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2626
"up": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2727
"down": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0}
@@ -33,10 +33,38 @@
3333
"faces": {
3434
"north": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
3535
"south": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
36-
"west": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
36+
"west": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
3737
"up": {"uv": [0, 2, 2, 14], "texture": "#all", "tintindex": 0},
3838
"down": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0}
3939
}
40-
}
40+
},
41+
{
42+
"from": [3, 3, -0.01],
43+
"to": [13, 13, -0.01],
44+
"faces": {
45+
"north": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
46+
}
47+
},
48+
{
49+
"from": [3, 3, 16.01],
50+
"to": [13, 13, 16.01],
51+
"faces": {
52+
"south": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
53+
}
54+
},
55+
{
56+
"from": [16.01, 3, 3],
57+
"to": [16.01, 13, 13],
58+
"faces": {
59+
"east": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
60+
}
61+
},
62+
{
63+
"from": [-0.01, 3, 3],
64+
"to": [-0.01, 13, 13],
65+
"faces": {
66+
"west": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
67+
}
68+
}
4169
]
4270
}

‎common/src/main/resources/assets/antimatter/models/block/pipe/huge/elbow.json‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"from": [2, 2, 0],
99
"to": [14, 14, 14],
1010
"faces": {
11-
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
11+
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1212
"east": {"uv": [2, 2, 16, 14], "texture": "#all", "tintindex": 0},
1313
"south": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1414
"west": {"uv": [0, 2, 14, 14], "texture": "#all", "tintindex": 0},
@@ -21,11 +21,25 @@
2121
"to": [16, 14, 14],
2222
"faces": {
2323
"north": {"uv": [0, 2, 2, 14], "texture": "#all", "tintindex": 0},
24-
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
24+
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
2525
"south": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2626
"up": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2727
"down": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0}
2828
}
29-
}
29+
},
30+
{
31+
"from": [3, 3, -0.01],
32+
"to": [13, 13, -0.01],
33+
"faces": {
34+
"north": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
35+
}
36+
},
37+
{
38+
"from": [16.01, 3, 3],
39+
"to": [16.01, 13, 13],
40+
"faces": {
41+
"east": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
42+
}
43+
}
3044
]
3145
}

‎common/src/main/resources/assets/antimatter/models/block/pipe/huge/five.json‎

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"from": [2, 2, 0],
99
"to": [14, 14, 16],
1010
"faces": {
11-
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
11+
"north": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1212
"east": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
13-
"south": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
13+
"south": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
1414
"west": {"uv": [0, 2, 16, 14], "texture": "#all", "tintindex": 0},
1515
"up": {"uv": [2, 0, 14, 16], "texture": "#all", "tintindex": 0},
1616
"down": {"uv": [2, 0, 14, 16], "texture": "#all", "tintindex": 0}
@@ -21,7 +21,7 @@
2121
"to": [16, 14, 14],
2222
"faces": {
2323
"north": {"uv": [0, 2, 2, 14], "texture": "#all", "tintindex": 0},
24-
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
24+
"east": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
2525
"south": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2626
"up": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
2727
"down": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0}
@@ -33,7 +33,7 @@
3333
"faces": {
3434
"north": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
3535
"south": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0},
36-
"west": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1},
36+
"west": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0},
3737
"up": {"uv": [0, 2, 2, 14], "texture": "#all", "tintindex": 0},
3838
"down": {"uv": [14, 2, 16, 14], "texture": "#all", "tintindex": 0}
3939
}
@@ -46,8 +46,43 @@
4646
"east": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
4747
"south": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
4848
"west": {"uv": [2, 0, 14, 2], "texture": "#all", "tintindex": 0},
49-
"up": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 1}
49+
"up": {"uv": [2, 2, 14, 14], "texture": "#all", "tintindex": 0}
5050
}
51-
}
51+
},
52+
{
53+
"from": [3, 16.01, 3],
54+
"to": [13, 16.01, 13],
55+
"faces": {
56+
"up": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
57+
}
58+
},
59+
{
60+
"from": [3, 3, -0.01],
61+
"to": [13, 13, -0.01],
62+
"faces": {
63+
"north": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
64+
}
65+
},
66+
{
67+
"from": [3, 3, 16.01],
68+
"to": [13, 13, 16.01],
69+
"faces": {
70+
"south": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
71+
}
72+
},
73+
{
74+
"from": [16.01, 3, 3],
75+
"to": [16.01, 13, 13],
76+
"faces": {
77+
"east": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
78+
}
79+
},
80+
{
81+
"from": [-0.01, 3, 3],
82+
"to": [-0.01, 13, 13],
83+
"faces": {
84+
"west": {"uv": [3, 3, 13, 13], "texture": "#overlay", "tintindex": 1}
85+
}
86+
}
5287
]
5388
}

0 commit comments

Comments
 (0)