Skip to content

Commit 830b757

Browse files
barteldvnbarteldvn
authored
Merge pull request #384 from MCME/development
Development
2 parents 63e81b5 + 1b90614 commit 830b757

269 files changed

Lines changed: 7781 additions & 62 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.

‎assets/minecraft/blockstates/bamboo_fence_gate.json‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,16 @@
263263
"open": "false",
264264
"powered": "false"
265265
},
266-
"apply": {
267-
"model": "block/replace",
268-
"uvlock": true
269-
}
266+
"apply": [
267+
{ "model": "block/vertical_slab_stripped_pale_oak_log", "y":0, "uvlock": true },
268+
{ "model": "block/vertical_slab_stripped_pale_oak_log_2", "y":0, "uvlock": true },
269+
{ "model": "block/vertical_slab_stripped_pale_oak_log_3", "y":0, "uvlock": true },
270+
{ "model": "block/vertical_slab_stripped_pale_oak_log_4", "y":0, "uvlock": true },
271+
{ "model": "block/vertical_slab_stripped_pale_oak_log_5", "y":0, "uvlock": true },
272+
{ "model": "block/vertical_slab_stripped_pale_oak_log_6", "y":0, "uvlock": true },
273+
{ "model": "block/vertical_slab_stripped_pale_oak_log_7", "y":0, "uvlock": true },
274+
{ "model": "block/vertical_slab_stripped_pale_oak_log_8", "y":0, "uvlock": true }
275+
]
270276
},
271277
{
272278
"when": {
@@ -275,10 +281,16 @@
275281
"open": "false",
276282
"powered": "false"
277283
},
278-
"apply": {
279-
"model": "block/replace",
280-
"uvlock": true
281-
}
284+
"apply": [
285+
{ "model": "block/vertical_slab_stripped_pale_oak_log", "y":90, "uvlock": true },
286+
{ "model": "block/vertical_slab_stripped_pale_oak_log_2", "y":90, "uvlock": true },
287+
{ "model": "block/vertical_slab_stripped_pale_oak_log_3", "y":90, "uvlock": true },
288+
{ "model": "block/vertical_slab_stripped_pale_oak_log_4", "y":90, "uvlock": true },
289+
{ "model": "block/vertical_slab_stripped_pale_oak_log_5", "y":90, "uvlock": true },
290+
{ "model": "block/vertical_slab_stripped_pale_oak_log_6", "y":90, "uvlock": true },
291+
{ "model": "block/vertical_slab_stripped_pale_oak_log_7", "y":90, "uvlock": true },
292+
{ "model": "block/vertical_slab_stripped_pale_oak_log_8", "y":90, "uvlock": true }
293+
]
282294
},
283295
{
284296
"when": {
@@ -287,10 +299,16 @@
287299
"open": "false",
288300
"powered": "false"
289301
},
290-
"apply": {
291-
"model": "block/replace",
292-
"uvlock": true
293-
}
302+
"apply": [
303+
{ "model": "block/vertical_slab_stripped_pale_oak_log", "y":180, "uvlock": true },
304+
{ "model": "block/vertical_slab_stripped_pale_oak_log_2", "y":180, "uvlock": true },
305+
{ "model": "block/vertical_slab_stripped_pale_oak_log_3", "y":180, "uvlock": true },
306+
{ "model": "block/vertical_slab_stripped_pale_oak_log_4", "y":180, "uvlock": true },
307+
{ "model": "block/vertical_slab_stripped_pale_oak_log_5", "y":180, "uvlock": true },
308+
{ "model": "block/vertical_slab_stripped_pale_oak_log_6", "y":180, "uvlock": true },
309+
{ "model": "block/vertical_slab_stripped_pale_oak_log_7", "y":180, "uvlock": true },
310+
{ "model": "block/vertical_slab_stripped_pale_oak_log_8", "y":180, "uvlock": true }
311+
]
294312
},
295313
{
296314
"when": {
@@ -299,10 +317,16 @@
299317
"open": "false",
300318
"powered": "false"
301319
},
302-
"apply": {
303-
"model": "block/replace",
304-
"uvlock": true
305-
}
320+
"apply": [
321+
{ "model": "block/vertical_slab_stripped_pale_oak_log", "y":270, "uvlock": true },
322+
{ "model": "block/vertical_slab_stripped_pale_oak_log_2", "y":270, "uvlock": true },
323+
{ "model": "block/vertical_slab_stripped_pale_oak_log_3", "y":270, "uvlock": true },
324+
{ "model": "block/vertical_slab_stripped_pale_oak_log_4", "y":270, "uvlock": true },
325+
{ "model": "block/vertical_slab_stripped_pale_oak_log_5", "y":270, "uvlock": true },
326+
{ "model": "block/vertical_slab_stripped_pale_oak_log_6", "y":270, "uvlock": true },
327+
{ "model": "block/vertical_slab_stripped_pale_oak_log_7", "y":270, "uvlock": true },
328+
{ "model": "block/vertical_slab_stripped_pale_oak_log_8", "y":270, "uvlock": true }
329+
]
306330
},
307331
{
308332
"when": {

‎assets/minecraft/blockstates/bamboo_trapdoor.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,34 @@
8686
{ "model": "minecraft:block/trapdoor_prismarine_bricks_bottom_4"},
8787
{ "model": "minecraft:block/trapdoor_prismarine_bricks_bottom_5"}
8888
],
89+
"facing\u003dsouth,half\u003dbottom,open\u003dtrue,powered=true": [
90+
{"model": "block/pale_oak_trapdoor_side", "y":180},
91+
{"model": "block/pale_oak_trapdoor_side_2", "y":180},
92+
{"model": "block/pale_oak_trapdoor_side_3", "y":180},
93+
{"model": "block/pale_oak_trapdoor_side_4", "y":180},
94+
{"model": "block/pale_oak_trapdoor_side_5", "y":180}
95+
],
96+
"facing\u003dwest,half\u003dbottom,open\u003dtrue,powered=true": [
97+
{"model": "block/pale_oak_trapdoor_side", "y":270},
98+
{"model": "block/pale_oak_trapdoor_side_2", "y":270},
99+
{"model": "block/pale_oak_trapdoor_side_3", "y":270},
100+
{"model": "block/pale_oak_trapdoor_side_4", "y":270},
101+
{"model": "block/pale_oak_trapdoor_side_5", "y":270}
102+
],
103+
"facing\u003deast,half\u003dbottom,open\u003dtrue,powered=true": [
104+
{"model": "block/pale_oak_trapdoor_side", "y":90},
105+
{"model": "block/pale_oak_trapdoor_side_2", "y":90},
106+
{"model": "block/pale_oak_trapdoor_side_3", "y":90},
107+
{"model": "block/pale_oak_trapdoor_side_4", "y":90},
108+
{"model": "block/pale_oak_trapdoor_side_5", "y":90}
109+
],
110+
"facing\u003dnorth,half\u003dbottom,open\u003dtrue,powered=true": [
111+
{"model": "block/pale_oak_trapdoor_side"},
112+
{"model": "block/pale_oak_trapdoor_side_2"},
113+
{"model": "block/pale_oak_trapdoor_side_3"},
114+
{"model": "block/pale_oak_trapdoor_side_4"},
115+
{"model": "block/pale_oak_trapdoor_side_5"}
116+
],
89117
"facing=north,half=bottom,open=true,powered=false": [
90118
{ "model": "minecraft:block/purpur_block_trapdoor_open"},
91119
{ "model": "minecraft:block/purpur_block_trapdoor_open_2"},

‎assets/minecraft/blockstates/brown_mushroom_block.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@
211211
{ "when": {"north": true, "west": false, "south": true, "east": false, "up": false, "down": false },
212212
"apply": {
213213
"model": "block/pink_concrete_0"
214+
}},
215+
{ "when": {"north": false, "west": true, "south": false, "east": false, "up": true, "down": true },
216+
"apply": {
217+
"model": "block/brown_mushroom_block_wud"
214218
}},
215219
{ "when": {"north": true, "west": true, "south": false, "east": false, "up": false, "down": false },
216220
"apply": [

‎assets/minecraft/blockstates/copper_trapdoor.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"variants": {
3+
"facing\u003dwest,half\u003dtop,open\u003dfalse,powered=false": [
4+
{"model": "block/green_wool_slab", "x":180}
5+
],
6+
"facing\u003dwest,half\u003dbottom,open\u003dfalse,powered=false": [
7+
{"model": "block/green_wool_slab"}
8+
],
9+
"facing\u003dsouth,half\u003dtop,open\u003dfalse,powered=false": [
10+
{"model": "block/pale_oak_trapdoor_bottom", "x":180},
11+
{"model": "block/pale_oak_trapdoor_bottom_2", "x":180},
12+
{"model": "block/pale_oak_trapdoor_bottom_3", "x":180},
13+
{"model": "block/pale_oak_trapdoor_bottom_4", "x":180},
14+
{"model": "block/pale_oak_trapdoor_bottom_5", "x":180}
15+
],
16+
"facing\u003dsouth,half\u003dbottom,open\u003dfalse,powered=false": [
17+
{"model": "block/pale_oak_trapdoor_bottom"},
18+
{"model": "block/pale_oak_trapdoor_bottom_2"},
19+
{"model": "block/pale_oak_trapdoor_bottom_3"},
20+
{"model": "block/pale_oak_trapdoor_bottom_4"},
21+
{"model": "block/pale_oak_trapdoor_bottom_5"}
22+
],
323
"facing\u003dnorth,half\u003dtop,open\u003dtrue,powered=true": [
424
{"model": "block/thin_rough_red_brick_open"},
525
{"model": "block/thin_rough_red_brick_open_2"},

‎assets/minecraft/blockstates/crimson_button.json‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,25 @@
8484
"face=wall,facing=west,powered=true": { "model": "block/tools", "y": 270 },
8585
"face=wall,facing=south,powered=true": { "model": "block/tools", "y": 180 },
8686
"face=wall,facing=north,powered=true": { "model": "block/tools"},
87-
"face=ceiling,facing=south,powered=true": { "model": "block/dark_oak_button_pressed", "x": 180 },
88-
"face=ceiling,facing=north,powered=true": { "model": "block/dark_oak_button_pressed", "x": 180, "y": 180 }
87+
"face=ceiling,facing=south,powered=true": [
88+
{ "model": "block/lemon", "y": 0 },
89+
{ "model": "block/lemon", "y": 90 },
90+
{ "model": "block/lemon", "y": 180 },
91+
{ "model": "block/lemon", "y": 270 },
92+
{ "model": "block/lemon_2", "y": 0 },
93+
{ "model": "block/lemon_2", "y": 90 },
94+
{ "model": "block/lemon_2", "y": 180 },
95+
{ "model": "block/lemon_2", "y": 270 }
96+
],
97+
"face=ceiling,facing=north,powered=true": [
98+
{ "model": "block/orange", "y": 0 },
99+
{ "model": "block/orange", "y": 90 },
100+
{ "model": "block/orange", "y": 180 },
101+
{ "model": "block/orange", "y": 270 },
102+
{ "model": "block/orange_2", "y": 0 },
103+
{ "model": "block/orange_2", "y": 90 },
104+
{ "model": "block/orange_2", "y": 180 },
105+
{ "model": "block/orange_2", "y": 270 }
106+
]
89107
}
90108
}

‎assets/minecraft/blockstates/dead_horn_coral_wall_fan.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"variants": {
3+
"facing=north,waterlogged=false": [
4+
{ "model": "minecraft:block/beam_horizontal_pale", "y": 270},
5+
{ "model": "minecraft:block/beam_horizontal_pale_2", "y": 270},
6+
{ "model": "minecraft:block/beam_horizontal_pale_3", "y": 270}
7+
],
8+
"facing=east,waterlogged=false": [
9+
{ "model": "minecraft:block/beam_horizontal_pale" },
10+
{ "model": "minecraft:block/beam_horizontal_pale_2" },
11+
{"model": "minecraft:block/beam_horizontal_pale_3" }
12+
],
13+
"facing=west,waterlogged=false": [
14+
{ "model": "minecraft:block/beam_horizontal_pale", "y": 180},
15+
{ "model": "minecraft:block/beam_horizontal_pale_2", "y": 180},
16+
{ "model": "minecraft:block/beam_horizontal_pale_3", "y": 180}
17+
],
18+
"facing=south,waterlogged=false": [
19+
{ "model": "minecraft:block/beam_horizontal_pale", "y": 90},
20+
{ "model": "minecraft:block/beam_horizontal_pale_2", "y": 90},
21+
{ "model": "minecraft:block/beam_horizontal_pale_3", "y": 90}
22+
]
23+
}
24+
}

‎assets/minecraft/blockstates/dead_tube_coral_wall_fan.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"variants": {
3+
"facing=north,waterlogged=false": [
4+
{ "model": "minecraft:block/beam_horizontal_pale_down", "y": 270},
5+
{ "model": "minecraft:block/beam_horizontal_pale_down_2", "y": 270},
6+
{ "model": "minecraft:block/beam_horizontal_pale_down_3", "y": 270}
7+
],
8+
"facing=east,waterlogged=false": [
9+
{ "model": "minecraft:block/beam_horizontal_pale_down" },
10+
{ "model": "minecraft:block/beam_horizontal_pale_down_2" },
11+
{"model": "minecraft:block/beam_horizontal_pale_down_3" }
12+
],
13+
"facing=west,waterlogged=false": [
14+
{ "model": "minecraft:block/beam_horizontal_pale_down", "y": 180},
15+
{ "model": "minecraft:block/beam_horizontal_pale_down_2", "y": 180},
16+
{ "model": "minecraft:block/beam_horizontal_pale_down_3", "y": 180}
17+
],
18+
"facing=south,waterlogged=false": [
19+
{ "model": "minecraft:block/beam_horizontal_pale_down", "y": 90},
20+
{ "model": "minecraft:block/beam_horizontal_pale_down_2", "y": 90},
21+
{ "model": "minecraft:block/beam_horizontal_pale_down_3", "y": 90}
22+
]
23+
}
24+
}

‎assets/minecraft/blockstates/mangrove_trapdoor.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
22
"variants": {
3+
"facing\u003deast,half\u003dtop,open\u003dfalse,powered=true": [
4+
{"model": "block/brown_wool_slab", "x":180}
5+
],
6+
"facing\u003deast,half\u003dbottom,open\u003dfalse,powered=true": [
7+
{"model": "block/brown_wool_slab"}
8+
],
39
"facing=north,half=bottom,open=false,powered=false": [
410
{"model": "mcme:block/ash_leaves_yellowish_slab"},
511
{"model": "mcme:block/ash_leaves_yellowish_slab_2"},

‎assets/minecraft/blockstates/mossy_stone_brick_wall.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"variants": {
3+
"up=false,north=none,east=none,south=tall,west=tall": [
4+
{ "model": "block/bee_skep", "y": 0 },
5+
{ "model": "block/bee_skep", "y": 90 },
6+
{ "model": "block/bee_skep", "y": 180 },
7+
{ "model": "block/bee_skep", "y": 270 },
8+
{ "model": "block/bee_skep_2", "y": 0 },
9+
{ "model": "block/bee_skep_2", "y": 90 },
10+
{ "model": "block/bee_skep_2", "y": 180 },
11+
{ "model": "block/bee_skep_2", "y": 270 },
12+
{ "model": "block/bee_skep_3", "y": 0 },
13+
{ "model": "block/bee_skep_3", "y": 90 },
14+
{ "model": "block/bee_skep_3", "y": 180 },
15+
{ "model": "block/bee_skep_3", "y": 270 }
16+
],
17+
"up=false,north=tall,east=none,south=none,west=tall": [
18+
{ "model": "block/roof_hive", "y": 90 },
19+
{ "model": "block/roof_hive_2", "y": 90 },
20+
{ "model": "block/roof_hive_3", "y": 90 },
21+
{ "model": "block/roof_hive_4", "y": 90 },
22+
{ "model": "block/roof_hive_5", "y": 90 },
23+
{ "model": "block/roof_hive_6", "y": 90 }
24+
25+
],
26+
"up=false,north=none,east=tall,south=tall,west=none": [
27+
{ "model": "block/roof_hive", "y": 270 },
28+
{ "model": "block/roof_hive_2", "y": 270 },
29+
{ "model": "block/roof_hive_3", "y": 270 },
30+
{ "model": "block/roof_hive_4", "y": 270 },
31+
{ "model": "block/roof_hive_5", "y": 270 },
32+
{ "model": "block/roof_hive_6", "y": 270 }
33+
34+
]
35+
}
36+
}

0 commit comments

Comments
 (0)