Skip to content

Commit b2901ff

Browse files
Alpha9nAlpha9n
authored
Merge pull request #116 from freeserverproject/develop
一部のテクスチャがmissingになっていた問題の修正
2 parents 6dba8f0 + 60a243a commit b2901ff

3 files changed

Lines changed: 50 additions & 215 deletions

File tree

‎pack/assets/minecraft/atlases/blocks.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"sources": [
3+
{
4+
"type": "single",
5+
"resource": "entity/fox/snow_fox_sleep"
6+
},
7+
{
8+
"type": "single",
9+
"resource": "entity/villager/profession/farmer"
10+
}
11+
]
12+
}

‎pack/assets/minecraft/models/item/mugiwara.json‎

Lines changed: 36 additions & 213 deletions
Original file line numberDiff line numberDiff line change
@@ -1,245 +1,68 @@
11
{
2-
"__name": "麦わら帽子",
3-
"__comment": "麦わらの〜",
42
"credit": "Made with Blockbench",
53
"textures": {
6-
"0": "item/skins/hat/farmer",
7-
"particle": "item/skins/hat/farmer"
4+
"0": "entity/villager/profession/farmer",
5+
"particle": "entity/villager/profession/farmer"
86
},
97
"elements": [
108
{
11-
"from": [
12-
0,
13-
0.5,
14-
0
15-
],
16-
"to": [
17-
16,
18-
0.502,
19-
16
20-
],
9+
"from": [0, 0.5, 0],
10+
"to": [16, 0.502, 16],
2111
"faces": {
22-
"north": {
23-
"uv": [
24-
0,
25-
0,
26-
2,
27-
1
28-
],
29-
"texture": "#0"
30-
},
31-
"east": {
32-
"uv": [
33-
0,
34-
0,
35-
2,
36-
1
37-
],
38-
"texture": "#0"
39-
},
40-
"south": {
41-
"uv": [
42-
0,
43-
0,
44-
2,
45-
1
46-
],
47-
"texture": "#0"
48-
},
49-
"west": {
50-
"uv": [
51-
0,
52-
0,
53-
2,
54-
1
55-
],
56-
"texture": "#0"
57-
},
58-
"up": {
59-
"uv": [
60-
7.75,
61-
12,
62-
11.75,
63-
16
64-
],
65-
"texture": "#0"
66-
},
67-
"down": {
68-
"uv": [
69-
7.75,
70-
12,
71-
11.75,
72-
16
73-
],
74-
"texture": "#0"
75-
}
12+
"north": {"uv": [0, 0, 2, 1], "texture": "#0"},
13+
"east": {"uv": [0, 0, 2, 1], "texture": "#0"},
14+
"south": {"uv": [0, 0, 2, 1], "texture": "#0"},
15+
"west": {"uv": [0, 0, 2, 1], "texture": "#0"},
16+
"up": {"uv": [7.75, 12, 11.75, 16], "texture": "#0"},
17+
"down": {"uv": [7.75, 12, 11.75, 16], "texture": "#0"}
7618
}
7719
},
7820
{
79-
"from": [
80-
3,
81-
0.4375,
82-
3
83-
],
84-
"to": [
85-
13,
86-
5,
87-
13
88-
],
21+
"from": [3, 0.4375, 3],
22+
"to": [13, 5, 13],
8923
"faces": {
90-
"north": {
91-
"uv": [
92-
8,
93-
2,
94-
10,
95-
3
96-
],
97-
"texture": "#0"
98-
},
99-
"east": {
100-
"uv": [
101-
14,
102-
2,
103-
16,
104-
3
105-
],
106-
"texture": "#0"
107-
},
108-
"south": {
109-
"uv": [
110-
12,
111-
2,
112-
14,
113-
3
114-
],
115-
"texture": "#0"
116-
},
117-
"west": {
118-
"uv": [
119-
10,
120-
2,
121-
12,
122-
3
123-
],
124-
"texture": "#0"
125-
},
126-
"up": {
127-
"uv": [
128-
10,
129-
0,
130-
12,
131-
2
132-
],
133-
"texture": "#0"
134-
},
135-
"down": {
136-
"uv": [
137-
10,
138-
0,
139-
12,
140-
2
141-
],
142-
"texture": "#0"
143-
}
24+
"north": {"uv": [8, 2, 10, 3], "texture": "#0"},
25+
"east": {"uv": [14, 2, 16, 3], "texture": "#0"},
26+
"south": {"uv": [12, 2, 14, 3], "texture": "#0"},
27+
"west": {"uv": [10, 2, 12, 3], "texture": "#0"},
28+
"up": {"uv": [10, 0, 12, 2], "texture": "#0"},
29+
"down": {"uv": [10, 0, 12, 2], "texture": "#0"}
14430
}
14531
}
14632
],
14733
"display": {
14834
"thirdperson_righthand": {
149-
"rotation": [
150-
68.25,
151-
0,
152-
0
153-
],
154-
"translation": [
155-
-0.25,
156-
4,
157-
3
158-
],
159-
"scale": [
160-
0.47,
161-
0.47,
162-
0.47
163-
]
35+
"rotation": [68.25, 0, 0],
36+
"translation": [-0.25, 4, 3],
37+
"scale": [0.47, 0.47, 0.47]
16438
},
16539
"thirdperson_lefthand": {
166-
"rotation": [
167-
68.25,
168-
0,
169-
0
170-
],
171-
"translation": [
172-
-0.25,
173-
4,
174-
3
175-
],
176-
"scale": [
177-
0.47,
178-
0.47,
179-
0.47
180-
]
40+
"rotation": [68.25, 0, 0],
41+
"translation": [-0.25, 4, 3],
42+
"scale": [0.47, 0.47, 0.47]
18143
},
18244
"firstperson_righthand": {
183-
"translation": [
184-
3.25,
185-
6.5,
186-
0
187-
]
45+
"translation": [3.25, 6.5, 0]
18846
},
18947
"firstperson_lefthand": {
190-
"translation": [
191-
3.25,
192-
6.5,
193-
0
194-
]
48+
"translation": [3.25, 6.5, 0]
19549
},
19650
"ground": {
197-
"translation": [
198-
0,
199-
8,
200-
0
201-
]
51+
"translation": [0, 8, 0]
20252
},
20353
"gui": {
204-
"rotation": [
205-
32,
206-
45,
207-
0
208-
],
209-
"translation": [
210-
0,
211-
3.75,
212-
-7.75
213-
],
214-
"scale": [
215-
0.77,
216-
0.77,
217-
0.77
218-
]
54+
"rotation": [32, 45, 0],
55+
"translation": [0, 3.75, -7.75],
56+
"scale": [0.77, 0.77, 0.77]
21957
},
22058
"head": {
221-
"translation": [
222-
0,
223-
12,
224-
0
225-
],
226-
"scale": [
227-
1.39,
228-
1.39,
229-
1.39
230-
]
59+
"translation": [0, 12, 0],
60+
"scale": [1.39, 1.39, 1.39]
23161
},
23262
"fixed": {
233-
"rotation": [
234-
-90,
235-
45,
236-
0
237-
],
238-
"translation": [
239-
0,
240-
0.25,
241-
-7.75
242-
]
63+
"rotation": [-90, 45, 0],
64+
"translation": [0, 0.25, -7.75]
24365
}
244-
}
66+
},
67+
"__name": "麦わら帽子"
24568
}

‎pack/pack.mcmeta‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"pack":{
33
"pack_format": 12,
4-
"pack_version": "v1.19.4",
5-
"description": "F-Tex %pack_version% #113 1.19.3で起こる不具合の修正"
4+
"pack_version": "v1.19.5",
5+
"description": "F-Tex %pack_version% 一部のテクスチャの再割当て"
66
}
77
}

0 commit comments

Comments
 (0)