Skip to content
This repository was archived by the owner on Aug 24, 2021. It is now read-only.

Commit 9e8b918

Browse files
SoSeDiKSoSeDiK
committed
2+2=4
1 parent 8489357 commit 9e8b918

234 files changed

Lines changed: 2505 additions & 1316 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ASurvival/assets/asurvival/models/block/enhanced_crafting_table.json‎

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
{
2+
"parent": "block/block",
3+
"textures": {
4+
"side": "block/crafting_table_front",
5+
"top": "asurvival:block/enhanced_crafting_table_top",
6+
"down": "asurvival:block/enhanced_crafting_table_down",
7+
"ring": "asurvival:block/enhanced_crafting_table_ring"
8+
},
9+
"elements": [
10+
{
11+
"name": "Base",
12+
"from": [ 0.0, 0.0, 0.0 ],
13+
"to": [ 16.0, 16.0, 16.0 ],
14+
"faces": {
15+
"north": { "texture": "#side", "uv": [ 0.0, 16.0, 16.0, 0.0 ], "rotation": 180 },
16+
"east": { "texture": "#side", "uv": [ 0.0, 0.0, 15.9, 16.0 ] },
17+
"south": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
18+
"west": { "texture": "#side", "uv": [ 0.0, 0.0, 15.9, 16.0 ] },
19+
"up": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 15.9 ] },
20+
"down": { "texture": "#down", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
21+
}
22+
},
23+
{
24+
"name": "Ring 1",
25+
"from": [ -0.5, -0.5, -0.5 ],
26+
"to": [ 0.5, 16.5, 0.5 ],
27+
"faces": {
28+
"north": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
29+
"east": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
30+
"south": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
31+
"west": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
32+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
33+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
34+
}
35+
},
36+
{
37+
"name": "Ring 2",
38+
"from": [ 15.5, -0.5, -0.5 ],
39+
"to": [ 16.5, 16.5, 0.5 ],
40+
"faces": {
41+
"north": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
42+
"east": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
43+
"south": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
44+
"west": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
45+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
46+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
47+
}
48+
},
49+
{
50+
"name": "Ring 3",
51+
"from": [ 15.5, -0.5, 15.5 ],
52+
"to": [ 16.5, 16.5, 16.5 ],
53+
"faces": {
54+
"north": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
55+
"east": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
56+
"south": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
57+
"west": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
58+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
59+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
60+
}
61+
},
62+
{
63+
"name": "Ring 4",
64+
"from": [ -0.5, -0.5, 15.5 ],
65+
"to": [ 0.5, 16.5, 16.5 ],
66+
"faces": {
67+
"north": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
68+
"east": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
69+
"south": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
70+
"west": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
71+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
72+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }
73+
}
74+
},
75+
{
76+
"name": "Ring 5",
77+
"from": [ 0.5, -0.5, -0.5 ],
78+
"to": [ 15.5, 0.5, 0.5 ],
79+
"faces": {
80+
"north": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
81+
"south": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
82+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
83+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }
84+
}
85+
},
86+
{
87+
"name": "Ring 6",
88+
"from": [ 0.5, 15.5, -0.5 ],
89+
"to": [ 15.5, 16.5, 0.5 ],
90+
"faces": {
91+
"north": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
92+
"south": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
93+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
94+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }
95+
}
96+
},
97+
{
98+
"name": "Ring 7",
99+
"from": [ 0.5, 15.5, 15.5 ],
100+
"to": [ 15.5, 16.5, 16.5 ],
101+
"faces": {
102+
"north": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
103+
"south": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
104+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
105+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }
106+
}
107+
},
108+
{
109+
"name": "Ring 8",
110+
"from": [ 0.5, -0.5, 15.5 ],
111+
"to": [ 15.5, 0.5, 16.5 ],
112+
"faces": {
113+
"north": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
114+
"south": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
115+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
116+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] }
117+
}
118+
},
119+
{
120+
"name": "Ring 9",
121+
"from": [ -0.5, -0.5, 0.5 ],
122+
"to": [ 0.5, 0.5, 15.5 ],
123+
"faces": {
124+
"east": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
125+
"west": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
126+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
127+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 15.0 ] }
128+
}
129+
},
130+
{
131+
"name": "Ring 10",
132+
"from": [ -0.5, 15.5, 0.5 ],
133+
"to": [ 0.5, 16.5, 15.5 ],
134+
"faces": {
135+
"east": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
136+
"west": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
137+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
138+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 15.0 ] }
139+
}
140+
},
141+
{
142+
"name": "Ring 11",
143+
"from": [ 15.5, 15.5, 0.5 ],
144+
"to": [ 16.5, 16.5, 15.5 ],
145+
"faces": {
146+
"east": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
147+
"west": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
148+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
149+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 15.0 ] }
150+
}
151+
},
152+
{
153+
"name": "Ring 12",
154+
"from": [ 15.5, -0.5, 0.5 ],
155+
"to": [ 16.5, 0.5, 15.5 ],
156+
"faces": {
157+
"east": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
158+
"west": { "texture": "#ring", "uv": [ 0.0, 0.0, 15.0, 1.0 ] },
159+
"up": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 15.0 ] },
160+
"down": { "texture": "#ring", "uv": [ 0.0, 0.0, 1.0, 15.0 ] }
161+
}
162+
}
163+
]
164+
}

‎ASurvival/assets/asurvival/models/block/reed_block.json‎

Lines changed: 17 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,19 @@
1-
{ "parent": "block/block",
2-
"textures": {
3-
"top": "asurvival:block/reed_block_top",
4-
"side": "asurvival:block/reed_block_side"
5-
},
6-
"display": {
7-
"thirdperson_righthand": {
8-
"rotation": [ 70, 30, 0 ],
9-
"translation": [ 0, 2.0, 0 ],
10-
"scale": [ 0.38, 0.38, 0.38 ]
11-
},
12-
"firstperson_righthand": {
13-
"rotation": [ 0, 0, 0 ],
14-
"translation": [ 0, 0, 0 ],
15-
"scale": [ 0.38, 0.38, 0.38 ]
16-
},
17-
"thirdperson_lefthand": {
18-
"rotation": [ 70, 30, 0 ],
19-
"translation": [ 0, 2.0, 0 ],
20-
"scale": [ 0.38, 0.38, 0.38 ]
21-
},
22-
"firstperson_lefthand": {
23-
"rotation": [ 0, 0, 0 ],
24-
"translation": [ 0, 0, 0 ],
25-
"scale": [ 0.38, 0.38, 0.38 ]
26-
},
27-
"ground": {
28-
"rotation": [ 0, 0, 0 ],
29-
"translation": [ 0, 3, 0 ],
30-
"scale": [ 0.25, 0.25, 0.25 ]
31-
},
32-
"gui": {
33-
"rotation": [ 30, -135, 0 ],
34-
"translation": [ 0, 0, 0 ],
35-
"scale": [ 0.65, 0.65, 0.65 ]
36-
},
37-
"head": {
38-
"rotation": [ 0, 0, 0 ],
39-
"translation": [ 0, -14.667, 0 ],
40-
"scale": [ 2.3, 2.3, 2.3 ]
41-
}
1+
{
2+
"parent": "block/block",
3+
"textures": {
4+
"top": "asurvival:block/reed_block_top",
5+
"side": "asurvival:block/reed_block_side"
426
},
43-
"elements": [
44-
{
45-
"name": "Cube",
46-
"from": [ 0.0, 0.0, 0.0 ],
47-
"to": [ 16.0, 16.0, 16.0 ],
48-
"faces": {
49-
"north": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
50-
"east": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
51-
"south": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
52-
"west": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
53-
"up": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
54-
"down": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
55-
}
56-
}
57-
]
7+
"elements": [{
8+
"from": [ 0.0, 0.0, 0.0 ],
9+
"to": [ 16.0, 16.0, 16.0 ],
10+
"faces": {
11+
"north": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
12+
"east": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
13+
"south": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
14+
"west": { "texture": "#side", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
15+
"up": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] },
16+
"down": { "texture": "#top", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }
17+
}
18+
}]
5819
}

‎ASurvival/assets/asurvival/models/gui/enhanced_crafting_table.json‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎ASurvival/assets/asurvival/models/gui/menu/enhanced_crafting_table.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"textures":{"gui":"asurvival:gui/menu/enhanced_crafting_table"},"elements":[{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,1.2824855787277993],"faces":{"south":{"uv":[2.5,2.1875,5.234375,5.0625],"texture":"#gui"}},"rotation":{"origin":[-12.286137154150163,7.802865143003912,1.2824855787277993],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-6.849242404917499],"faces":{"south":{"uv":[2.5,5.0625,5.234375,7.9375],"texture":"#gui"}},"rotation":{"origin":[8.154341461552288,11.86872913482656,-6.849242404917499],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-14.980970388562795],"faces":{"south":{"uv":[2.5,7.9375,5.234375,10.8125],"texture":"#gui"}},"rotation":{"origin":[28.59482007725473,15.934593126649208,-14.980970388562795],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-15.999999999999998],"faces":{"south":{"uv":[2.5,10.8125,5.234375,13.6875],"texture":"#gui"}},"rotation":{"origin":[66.91427340404766,23.5568063045759,-15.999999999999998],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,1.2824855787277993],"faces":{"south":{"uv":[5.234375,2.1875,7.96875,5.0625],"texture":"#gui"}},"rotation":{"origin":[-17.754887154150165,35.29612799056714,1.2824855787277993],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-6.849242404917499],"faces":{"south":{"uv":[5.234375,5.0625,7.96875,7.9375],"texture":"#gui"}},"rotation":{"origin":[2.685591461552286,39.36199198238979,-6.849242404917499],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-14.980970388562795],"faces":{"south":{"uv":[5.234375,7.9375,7.96875,10.8125],"texture":"#gui"}},"rotation":{"origin":[23.12607007725473,43.42785597421244,-14.980970388562795],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-15.999999999999998],"faces":{"south":{"uv":[5.234375,10.8125,7.96875,13.6875],"texture":"#gui"}},"rotation":{"origin":[61.44552340404766,51.05006915213913,-15.999999999999998],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,1.2824855787277993],"faces":{"south":{"uv":[7.96875,2.1875,10.703125,5.0625],"texture":"#gui"}},"rotation":{"origin":[-23.22363715415016,62.78939083813038,1.2824855787277993],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-6.849242404917499],"faces":{"south":{"uv":[7.96875,5.0625,10.703125,7.9375],"texture":"#gui"}},"rotation":{"origin":[-2.783158538447717,66.85525482995301,-6.849242404917499],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-14.980970388562795],"faces":{"south":{"uv":[7.96875,7.9375,10.703125,10.8125],"texture":"#gui"}},"rotation":{"origin":[17.657320077254735,70.92111882177568,-14.980970388562795],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-15.999999999999998],"faces":{"south":{"uv":[7.96875,10.8125,10.703125,13.6875],"texture":"#gui"}},"rotation":{"origin":[55.97677340404766,78.54333199970236,-15.999999999999998],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,1.2824855787277993],"faces":{"south":{"uv":[10.703125,2.1875,13.4375,5.0625],"texture":"#gui"}},"rotation":{"origin":[-28.692387154150172,90.28265368569362,1.2824855787277993],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-6.849242404917499],"faces":{"south":{"uv":[10.703125,5.0625,13.4375,7.9375],"texture":"#gui"}},"rotation":{"origin":[-8.251908538447708,94.34851767751626,-6.849242404917499],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-14.980970388562795],"faces":{"south":{"uv":[10.703125,7.9375,13.4375,10.8125],"texture":"#gui"}},"rotation":{"origin":[12.188570077254731,98.4143816693389,-14.980970388562795],"axis":"z","angle":22.5}},{"from":[2.53125,-0.13172798364529648,8],"to":[13.46875,16.1317279836453,-15.999999999999998],"faces":{"south":{"uv":[10.703125,10.8125,13.4375,13.6875],"texture":"#gui"}},"rotation":{"origin":[50.50802340404768,106.03659484726562,-15.999999999999998],"axis":"z","angle":22.5}}],"display":{"gui":{"rotation":[-45,0,-22.5],"scale":[4,4,4],"translation":[0,0,-80]}}}

‎ASurvival/assets/asurvival/models/item/armor/ice_helmet.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "asurvival:item/armor/ice_helmet"
5+
}
6+
}

‎ASurvival/assets/asurvival/models/item/armor/magma_chestplate.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "asurvival:item/armor/magma_chestplate"
5+
}
6+
}

‎ASurvival/assets/asurvival/models/item/infernal_bone_meal.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "asurvival:item/infernal_bone_meal"
5+
}
6+
}

‎ASurvival/assets/asurvival/models/item/mob_drop/bat/bat_meat.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "asurvival:item/mob_drop/bat/bat_meat"
5+
}
6+
}

‎ASurvival/assets/asurvival/models/item/mob_drop/bat/bat_wing.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "asurvival:item/mob_drop/bat/bat_wing"
5+
}
6+
}

‎ASurvival/assets/asurvival/models/item/mob_drop/bat/bat_wool.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "asurvival:item/mob_drop/bat/bat_wool"
5+
}
6+
}

0 commit comments

Comments
 (0)