Skip to content

Commit bc3c6dc

Browse files
barteldvnbarteldvn
authored
Merge pull request #375 from MCME/development
Merge pull request #374 from MCME/dev/wyatt/stumpupdate
2 parents e8d72b6 + f4b905e commit bc3c6dc

23 files changed

Lines changed: 177 additions & 9 deletions

‎assets/minecraft/blockstates/dead_fire_coral_fan.json‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
{
22
"variants": {
3-
"": {
4-
"model": "block/replace", "y": 90
5-
}
3+
"": [
4+
{ "model": "block/sack" },
5+
{ "model": "block/sack", "y": 180 },
6+
{ "model": "block/sack", "y": 90 },
7+
{ "model": "block/sack", "y": 270 },
8+
{ "model": "block/sack_2" },
9+
{ "model": "block/sack_2", "y": 180 },
10+
{ "model": "block/sack_2", "y": 90 },
11+
{ "model": "block/sack_2", "y": 270 },
12+
{ "model": "block/sack_3" },
13+
{ "model": "block/sack_3", "y": 180 },
14+
{ "model": "block/sack_3", "y": 90 },
15+
{ "model": "block/sack_3", "y": 270 },
16+
{ "model": "block/sack_4" },
17+
{ "model": "block/sack_4", "y": 180 },
18+
{ "model": "block/sack_4", "y": 90 },
19+
{ "model": "block/sack_4", "y": 270 }
20+
]
621
}
722
}

‎assets/minecraft/blockstates/jungle_button.json‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,20 @@
3838
"y": 90,
3939
"x": 180
4040
},
41-
"face=floor,facing=east,powered=false": {
42-
"model": "minecraft:block/jungle_button",
43-
"y": 90
44-
},
41+
"face=floor,facing=east,powered=false": [
42+
{ "model": "minecraft:block/tree_stump_rings" },
43+
{ "model": "minecraft:block/tree_stump_rings", "y": 90 },
44+
{ "model": "minecraft:block/tree_stump_rings", "y": 180 },
45+
{ "model": "minecraft:block/tree_stump_rings", "y": 270 },
46+
{ "model": "minecraft:block/tree_stump_rings_2" },
47+
{ "model": "minecraft:block/tree_stump_rings_2", "y": 90 },
48+
{ "model": "minecraft:block/tree_stump_rings_2", "y": 180 },
49+
{ "model": "minecraft:block/tree_stump_rings_2", "y": 270 },
50+
{ "model": "minecraft:block/tree_stump_rings_3" },
51+
{ "model": "minecraft:block/tree_stump_rings_3", "y": 90 },
52+
{ "model": "minecraft:block/tree_stump_rings_3", "y": 180 },
53+
{ "model": "minecraft:block/tree_stump_rings_3", "y": 270 }
54+
],
4555
"face=floor,facing=east,powered=true": {
4656
"model": "minecraft:block/jungle_button_pressed",
4757
"y": 90

‎assets/minecraft/blockstates/sandstone_wall.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
{ "model": "block/sandstone_bricks_side_stairs_5", "y": 180 }
2323
],
2424
"up=false,north=none,east=tall,south=tall,west=none": [
25-
{ "model": "block/sandstone_bricks_side_stairs" },
25+
{ "model": "block/sandstone_bricks_side_stairs", "y": 270 },
2626
{ "model": "block/sandstone_bricks_side_stairs_2", "y": 270 },
2727
{ "model": "block/sandstone_bricks_side_stairs_3", "y": 270 },
2828
{ "model": "block/sandstone_bricks_side_stairs_4", "y": 270 },

‎assets/minecraft/items/clay_ball.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7387,6 +7387,20 @@
73877387
"type": "model",
73887388
"model": "block/xmas/xmas_green_present"
73897389
}
7390+
},
7391+
{
7392+
"threshold": 1056,
7393+
"model": {
7394+
"type": "model",
7395+
"model": "block/tree_stump_rings"
7396+
}
7397+
},
7398+
{
7399+
"threshold": 1057,
7400+
"model": {
7401+
"type": "model",
7402+
"model": "block/sack"
7403+
}
73907404
}
73917405
]
73927406
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "block/cross",
3+
"textures": {
4+
"cross": "block/sack",
5+
"particle": "block/sack"
6+
}
7+
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "block/cross",
3+
"textures": {
4+
"cross": "block/sack_2",
5+
"particle": "block/sack"
6+
}
7+
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "block/cross",
3+
"textures": {
4+
"cross": "block/sack_3",
5+
"particle": "block/sack"
6+
}
7+
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "block/cross",
3+
"textures": {
4+
"cross": "block/sack_4",
5+
"particle": "block/sack"
6+
}
7+
}

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"format_version": "1.9.0",
3+
"credit": "Made with Blockbench",
4+
"textures": {
5+
"1": "block/cut_oak_log",
6+
"particle": "block/cut_oak_log"
7+
},
8+
"elements": [
9+
{
10+
"from": [4.25, 0.25, 4.25],
11+
"to": [11.75, 0.25, 11.75],
12+
"rotation": {"angle": 0, "axis": "y", "origin": [7.25, 0.25, 6.25]},
13+
"faces": {
14+
"north": {"uv": [4, 5, 11, 5], "texture": "#missing"},
15+
"east": {"uv": [4, 5, 11, 5], "texture": "#missing"},
16+
"south": {"uv": [4, 5, 11, 5], "texture": "#missing"},
17+
"west": {"uv": [4, 5, 11, 5], "texture": "#missing"},
18+
"up": {"uv": [5, 4, 12, 11], "texture": "#1"},
19+
"down": {"uv": [5, 4, 12, 11], "texture": "#1"}
20+
}
21+
}
22+
],
23+
"display": {
24+
"thirdperson_righthand": {
25+
"rotation": [75, 45, 0],
26+
"translation": [0, 2.5, 3.25],
27+
"scale": [0.375, 0.375, 0.375]
28+
},
29+
"thirdperson_lefthand": {
30+
"rotation": [75, 45, 0],
31+
"translation": [0, 2.5, 0],
32+
"scale": [0.375, 0.375, 0.375]
33+
},
34+
"firstperson_righthand": {
35+
"rotation": [0, 45, 0],
36+
"scale": [0.4, 0.4, 0.4]
37+
},
38+
"firstperson_lefthand": {
39+
"rotation": [0, -135, 0],
40+
"scale": [0.4, 0.4, 0.4]
41+
},
42+
"ground": {
43+
"translation": [0, 3, 0],
44+
"scale": [0.25, 0.25, 0.25]
45+
},
46+
"gui": {
47+
"rotation": [30, -135, 0],
48+
"translation": [0, 1.75, 0],
49+
"scale": [0.79, 0.79, 0.79]
50+
},
51+
"fixed": {
52+
"scale": [0.5, 0.5, 0.5]
53+
}
54+
}
55+
}

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"format_version": "1.9.0",
3+
"credit": "Made with Blockbench",
4+
"textures": {
5+
"1": "block/cut_elm_log_3",
6+
"particle": "block/cut_elm_log_3"
7+
},
8+
"elements": [
9+
{
10+
"from": [4.25, 0.25, 4.25],
11+
"to": [11.75, 0.25, 11.75],
12+
"rotation": {"angle": 0, "axis": "y", "origin": [7.25, 0.25, 6.25]},
13+
"faces": {
14+
"north": {"uv": [4, 5, 11, 5], "texture": "#missing"},
15+
"east": {"uv": [4, 5, 11, 5], "texture": "#missing"},
16+
"south": {"uv": [4, 5, 11, 5], "texture": "#missing"},
17+
"west": {"uv": [4, 5, 11, 5], "texture": "#missing"},
18+
"up": {"uv": [7, 8, 14, 15], "texture": "#1"},
19+
"down": {"uv": [7, 8, 14, 15], "texture": "#1"}
20+
}
21+
}
22+
]
23+
}

0 commit comments

Comments
 (0)