Skip to content
This repository was archived by the owner on Dec 12, 2024. It is now read-only.

Commit 2ea8a61

Browse files
GodlanderGodlander
committed
1.3
1 parent 53c13db commit 2ea8a61

File tree

107 files changed

+587
-135
lines changed

Some content is hidden

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

107 files changed

+587
-135
lines changed

‎assets/minecraft/models/block/moss_carpet.json

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"credit": "Made with Blockbench",
3+
"parent": "minecraft:block/cube_all",
4+
"textures": {
5+
"1": "block/moss_block_1",
6+
"2": "block/moss_block_2",
7+
"particle": "block/moss_block_1",
8+
"all": "block/moss_block"
9+
},
10+
"elements": [
11+
{
12+
"from": [0, 0, 0],
13+
"to": [16, 1, 16],
14+
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]},
15+
"faces": {
16+
"north": {"uv": [0, 0, 16, 1], "texture": "#all"},
17+
"east": {"uv": [0, 0, 16, 1], "texture": "#all"},
18+
"south": {"uv": [0, 0, 16, 1], "texture": "#all"},
19+
"west": {"uv": [0, 0, 16, 1], "texture": "#all"},
20+
"up": {"uv": [0, 0, 16, 16], "texture": "#all"},
21+
"down": {"uv": [0, 0, 16, 16], "texture": "#all"}
22+
}
23+
},
24+
{
25+
"from": [-0.1, -14, -0.1],
26+
"to": [16.1, 0, 0],
27+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 7.9]},
28+
"faces": {
29+
"north": {"uv": [0, 0, 16, 14], "texture": "#1"},
30+
"east": {"uv": [0, 0, 0.1, 14], "texture": "#2"},
31+
"south": {"uv": [0, 0, 16, 14], "texture": "#2"},
32+
"west": {"uv": [0, 0, 0.1, 14], "texture": "#2"},
33+
"up": {"uv": [16, 0, 0, 1], "texture": "#2"},
34+
"down": {"uv": [0, 0, 16, 0.1], "texture": "#2"}
35+
}
36+
},
37+
{
38+
"from": [-0.1, -14, 16],
39+
"to": [16.1, 0, 16.1],
40+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 24.1]},
41+
"faces": {
42+
"north": {"uv": [0, 0, 16, 14], "texture": "#2"},
43+
"east": {"uv": [0, 0, 0.1, 14], "texture": "#2"},
44+
"south": {"uv": [0, 0, 16, 14], "texture": "#1"},
45+
"west": {"uv": [0, 0, 0.1, 14], "texture": "#2"},
46+
"up": {"uv": [0, 0, 16, 1], "texture": "#2"},
47+
"down": {"uv": [0, 0, 16, 0.1], "texture": "#2"}
48+
}
49+
},
50+
{
51+
"from": [16, -14, -0.1],
52+
"to": [16.1, 0, 16.1],
53+
"rotation": {"angle": 0, "axis": "y", "origin": [8.1, 7, 24]},
54+
"faces": {
55+
"north": {"uv": [0, 0, 0.1, 14], "texture": "#2"},
56+
"east": {"uv": [0, 0, 16, 14], "texture": "#1"},
57+
"south": {"uv": [0, 0, 0.1, 14], "texture": "#2"},
58+
"west": {"uv": [0, 0, 16, 14], "texture": "#2"},
59+
"up": {"uv": [16, 0, 0, 1], "rotation": 90, "texture": "#2"},
60+
"down": {"uv": [0, 0, 0.1, 16], "texture": "#2"}
61+
}
62+
},
63+
{
64+
"from": [-0.1, -14, -0.1],
65+
"to": [0, 0, 16.1],
66+
"rotation": {"angle": 0, "axis": "y", "origin": [-8.1, 7, 24]},
67+
"faces": {
68+
"north": {"uv": [0, 0, 0.1, 14], "texture": "#2"},
69+
"east": {"uv": [0, 0, 16, 14], "texture": "#2"},
70+
"south": {"uv": [0, 0, 0.1, 14], "texture": "#2"},
71+
"west": {"uv": [0, 0, 16, 14], "texture": "#1"},
72+
"up": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#2"},
73+
"down": {"uv": [0, 0, 0.1, 16], "texture": "#2"}
74+
}
75+
},
76+
{
77+
"from": [-0.1, -0.05, -0.1],
78+
"to": [16.1, -0.05, 16.1],
79+
"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 0]},
80+
"faces": {
81+
"north": {"uv": [0, 0, 16, 0], "texture": "#all"},
82+
"east": {"uv": [0, 0, 16, 0], "texture": "#all"},
83+
"south": {"uv": [0, 0, 16, 0], "texture": "#all"},
84+
"west": {"uv": [0, 0, 16, 0], "texture": "#all"},
85+
"up": {"uv": [0, 0, 16, 16], "texture": "#all"},
86+
"down": {"uv": [0, 16, 16, 0], "texture": "#all"}
87+
}
88+
}
89+
],
90+
"display": {
91+
"thirdperson_righthand": {
92+
"rotation": [75, 45, 0],
93+
"translation": [0, 2.5, 0],
94+
"scale": [0.375, 0.375, 0.375]
95+
},
96+
"thirdperson_lefthand": {
97+
"rotation": [75, 45, 0],
98+
"translation": [0, 2.5, 0],
99+
"scale": [0.375, 0.375, 0.375]
100+
},
101+
"firstperson_righthand": {
102+
"rotation": [0, 45, 0],
103+
"scale": [0.4, 0.4, 0.4]
104+
},
105+
"firstperson_lefthand": {
106+
"rotation": [0, 225, 0],
107+
"scale": [0.4, 0.4, 0.4]
108+
},
109+
"ground": {
110+
"translation": [0, 3, 0],
111+
"scale": [0.25, 0.25, 0.25]
112+
},
113+
"gui": {
114+
"rotation": [30, 225, 0],
115+
"scale": [0.625, 0.625, 0.625]
116+
},
117+
"fixed": {
118+
"scale": [0.5, 0.5, 0.5]
119+
}
120+
}
121+
}

‎assets/minecraft/models/block/piston_head.json

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"textures": {
3+
"3": "block/piston_side",
4+
"4": "block/piston_top",
5+
"5": "block/piston_arm",
6+
"particle": "block/piston_top"
7+
},
8+
"elements": [
9+
{
10+
"from": [0, 0, 0],
11+
"to": [16, 16, 4],
12+
"faces": {
13+
"north": {"uv": [0, 0, 16, 16], "texture": "#4", "cullface": "north"},
14+
"east": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#3", "cullface": "east"},
15+
"south": {"uv": [0, 0, 16, 16], "texture": "#4", "cullface": "north"},
16+
"west": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#3", "cullface": "west"},
17+
"up": {"uv": [0, 0, 16, 4], "texture": "#3", "cullface": "up"},
18+
"down": {"uv": [0, 0, 16, 4], "rotation": 180, "texture": "#3", "cullface": "down"}
19+
}
20+
},
21+
{
22+
"from": [6, 6, 4],
23+
"to": [10, 10, 12],
24+
"faces": {
25+
"east": {"uv": [4, 16, 0, 9], "rotation": 90, "texture": "#5"},
26+
"west": {"uv": [4, 16, 0, 9], "rotation": 90, "texture": "#5"},
27+
"up": {"uv": [4, 16, 0, 9], "texture": "#5"},
28+
"down": {"uv": [4, 16, 0, 9], "texture": "#5"}
29+
}
30+
},
31+
{
32+
"from": [5, 5, 12],
33+
"to": [11, 11, 20],
34+
"faces": {
35+
"north": {"uv": [0, 2, 6, 8], "texture": "#5"},
36+
"east": {"uv": [4, 8, 10, 16], "rotation": 90, "texture": "#5"},
37+
"west": {"uv": [4, 8, 10, 16], "rotation": 90, "texture": "#5"},
38+
"up": {"uv": [4, 8, 10, 16], "texture": "#5"},
39+
"down": {"uv": [4, 8, 10, 16], "texture": "#5"}
40+
}
41+
}
42+
],
43+
"display": {}
44+
}

‎assets/minecraft/models/block/piston_head_sticky.json

+20-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"credit": "Created by Stridey",
32
"textures": {
43
"3": "block/piston_side_sticky",
54
"4": "block/piston_bottom_sticky",
5+
"5": "block/piston_arm",
66
"particle": "block/piston_top_sticky",
7-
"platform": "block/piston_top_sticky",
8-
"side": "block/piston_side"
7+
"platform": "block/piston_top_sticky"
98
},
109
"elements": [
1110
{
@@ -22,13 +21,25 @@
2221
},
2322
{
2423
"from": [6, 6, 4],
25-
"to": [10, 10, 20],
24+
"to": [10, 10, 12],
2625
"faces": {
27-
"east": {"uv": [0, 0, 16, 4], "texture": "#side"},
28-
"west": {"uv": [16, 4, 0, 0], "texture": "#side"},
29-
"up": {"uv": [0, 0, 16, 4], "rotation": 270, "texture": "#side"},
30-
"down": {"uv": [0, 0, 16, 4], "rotation": 90, "texture": "#side"}
26+
"east": {"uv": [4, 16, 0, 9], "rotation": 90, "texture": "#5"},
27+
"west": {"uv": [4, 16, 0, 9], "rotation": 90, "texture": "#5"},
28+
"up": {"uv": [4, 16, 0, 9], "texture": "#5"},
29+
"down": {"uv": [4, 16, 0, 9], "texture": "#5"}
30+
}
31+
},
32+
{
33+
"from": [5, 5, 12],
34+
"to": [11, 11, 20],
35+
"faces": {
36+
"north": {"uv": [0, 2, 6, 8], "texture": "#5"},
37+
"east": {"uv": [4, 8, 10, 16], "rotation": 90, "texture": "#5"},
38+
"west": {"uv": [4, 8, 10, 16], "rotation": 90, "texture": "#5"},
39+
"up": {"uv": [4, 8, 10, 16], "texture": "#5"},
40+
"down": {"uv": [4, 8, 10, 16], "texture": "#5"}
3141
}
3242
}
33-
]
43+
],
44+
"display": {}
3445
}

‎assets/minecraft/models/item/bow.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -97,37 +97,37 @@
9797
{
9898
"predicate": {
9999
"damaged": 1,
100-
"damage": 0.85,
100+
"damage": 0.5,
101101
"pulling": 0
102102
},
103103
"model": "item/bow/bow_02"
104104
},
105105
{
106106
"predicate": {
107107
"damaged": 1,
108-
"damage": 0.9
108+
"damage": 0.8
109109
},
110110
"model": "item/bow/bow_03"
111111
},
112112
{
113113
"predicate": {
114114
"damaged": 1,
115-
"damage": 0.95
115+
"damage": 0.9
116116
},
117117
"model": "item/bow/bow_04"
118118
},
119119
{
120120
"predicate": {
121121
"damaged": 1,
122-
"damage": 0.85,
122+
"damage": 0.5,
123123
"pulling": 1
124124
},
125125
"model": "item/bow_pulling_0/bow_pulling_0_02"
126126
},
127127
{
128128
"predicate": {
129129
"damaged": 1,
130-
"damage": 0.85,
130+
"damage": 0.5,
131131
"pulling": 1,
132132
"pull": 0.65
133133
},
@@ -136,7 +136,7 @@
136136
{
137137
"predicate": {
138138
"damaged": 1,
139-
"damage": 0.85,
139+
"damage": 0.5,
140140
"pulling": 1,
141141
"pull": 0.9
142142
},
@@ -145,15 +145,15 @@
145145
{
146146
"predicate": {
147147
"damaged": 1,
148-
"damage": 0.9,
148+
"damage": 0.8,
149149
"pulling": 1
150150
},
151151
"model": "item/bow_pulling_0/bow_pulling_0_03"
152152
},
153153
{
154154
"predicate": {
155155
"damaged": 1,
156-
"damage": 0.9,
156+
"damage": 0.8,
157157
"pulling": 1,
158158
"pull": 0.65
159159
},
@@ -162,7 +162,7 @@
162162
{
163163
"predicate": {
164164
"damaged": 1,
165-
"damage": 0.9,
165+
"damage": 0.8,
166166
"pulling": 1,
167167
"pull": 0.9
168168
},
@@ -171,15 +171,15 @@
171171
{
172172
"predicate": {
173173
"damaged": 1,
174-
"damage": 0.95,
174+
"damage": 0.9,
175175
"pulling": 1
176176
},
177177
"model": "item/bow_pulling_0/bow_pulling_0_04"
178178
},
179179
{
180180
"predicate": {
181181
"damaged": 1,
182-
"damage": 0.95,
182+
"damage": 0.9,
183183
"pulling": 1,
184184
"pull": 0.65
185185
},
@@ -188,7 +188,7 @@
188188
{
189189
"predicate": {
190190
"damaged": 1,
191-
"damage": 0.95,
191+
"damage": 0.9,
192192
"pulling": 1,
193193
"pull": 0.9
194194
},

‎assets/minecraft/models/item/bow_pulling_0.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
{
88
"predicate": {
99
"damaged": 1,
10-
"damage": 0.85
10+
"damage": 0.5
1111
},
1212
"model": "item/bow_pulling_0/bow_pulling_0_02"
1313
},
1414
{
1515
"predicate": {
1616
"damaged": 1,
17-
"damage": 0.9
17+
"damage": 0.8
1818
},
1919
"model": "item/bow_pulling_0/bow_pulling_0_03"
2020
},
2121
{
2222
"predicate": {
2323
"damaged": 1,
24-
"damage": 0.95
24+
"damage": 0.9
2525
},
2626
"model": "item/bow_pulling_0/bow_pulling_0_04"
2727
}

‎assets/minecraft/models/item/bow_pulling_1.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
{
88
"predicate": {
99
"damaged": 1,
10-
"damage": 0.85
10+
"damage": 0.5
1111
},
1212
"model": "item/bow_pulling_1/bow_pulling_1_02"
1313
},
1414
{
1515
"predicate": {
1616
"damaged": 1,
17-
"damage": 0.9
17+
"damage": 0.8
1818
},
1919
"model": "item/bow_pulling_1/bow_pulling_1_03"
2020
},
2121
{
2222
"predicate": {
2323
"damaged": 1,
24-
"damage": 0.95
24+
"damage": 0.9
2525
},
2626
"model": "item/bow_pulling_1/bow_pulling_1_04"
2727
}

‎assets/minecraft/models/item/bow_pulling_2.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
{
88
"predicate": {
99
"damaged": 1,
10-
"damage": 0.85
10+
"damage": 0.5
1111
},
1212
"model": "item/bow_pulling_2/bow_pulling_2_02"
1313
},
1414
{
1515
"predicate": {
1616
"damaged": 1,
17-
"damage": 0.9
17+
"damage": 0.8
1818
},
1919
"model": "item/bow_pulling_2/bow_pulling_2_03"
2020
},
2121
{
2222
"predicate": {
2323
"damaged": 1,
24-
"damage": 0.95
24+
"damage": 0.9
2525
},
2626
"model": "item/bow_pulling_2/bow_pulling_2_04"
2727
}

0 commit comments

Comments
 (0)