Merge and fix

This commit is contained in:
paulevsGitch 2020-11-08 15:07:19 +03:00
parent b91c85529d
commit ce9f4add97
548 changed files with 17517 additions and 16862 deletions

View file

@ -1,22 +1,22 @@
{
"variants": {
"age=0": {
"model": "betterend:block/chorus_plant_flower"
},
"age=1": {
"model": "betterend:block/chorus_plant_flower"
},
"age=2": {
"model": "betterend:block/chorus_plant_flower"
},
"age=3": {
"model": "betterend:block/chorus_plant_flower"
},
"age=4": {
"model": "betterend:block/chorus_plant_flower"
},
"age=5": {
"model": "betterend:block/chorus_plant_flower_open"
}
}
{
"variants": {
"age=0": {
"model": "betterend:block/chorus_plant_flower"
},
"age=1": {
"model": "betterend:block/chorus_plant_flower"
},
"age=2": {
"model": "betterend:block/chorus_plant_flower"
},
"age=3": {
"model": "betterend:block/chorus_plant_flower"
},
"age=4": {
"model": "betterend:block/chorus_plant_flower"
},
"age=5": {
"model": "betterend:block/chorus_plant_flower_open"
}
}
}

View file

@ -1,69 +1,69 @@
{
"multipart": [
{
"when": { "OR": [
{"up": "false"},
{"down": "false"}
]},
"apply": { "model": "betterend:block/chorus_plant_center" }
},
{
"when": {"roots": "true"},
"apply": { "model": "betterend:block/chorus_plant_roots" }
},
{
"when": {"north": "true"},
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 180 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 180 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 180 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 180 }
]
},
{
"when": { "east": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 270 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 270 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 270 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 270 }
]
},
{
"when": { "south": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 90 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 90 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 90 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 90 }
]
},
{
"when": { "west": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 90 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 90 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 90 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 90 }
]
},
{
"when": { "up": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 180 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 180 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 180 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 180 }
]
},
{
"when": { "down": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem" },
{ "model": "betterend:block/chorus_plant_stem_2" },
{ "model": "betterend:block/chorus_plant_stem_3" },
{ "model": "betterend:block/chorus_plant_stem_4" }
]
}
]
{
"multipart": [
{
"when": { "OR": [
{"up": "false"},
{"down": "false"}
]},
"apply": { "model": "betterend:block/chorus_plant_center" }
},
{
"when": {"roots": "true"},
"apply": { "model": "betterend:block/chorus_plant_roots" }
},
{
"when": {"north": "true"},
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 180 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 180 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 180 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 180 }
]
},
{
"when": { "east": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 270 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 270 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 270 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 270 }
]
},
{
"when": { "south": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 90 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 90 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 90 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 90 }
]
},
{
"when": { "west": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 90, "y": 90 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 90, "y": 90 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 90, "y": 90 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 90, "y": 90 }
]
},
{
"when": { "up": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem", "x": 180 },
{ "model": "betterend:block/chorus_plant_stem_2", "x": 180 },
{ "model": "betterend:block/chorus_plant_stem_3", "x": 180 },
{ "model": "betterend:block/chorus_plant_stem_4", "x": 180 }
]
},
{
"when": { "down": "true" },
"apply": [
{ "model": "betterend:block/chorus_plant_stem" },
{ "model": "betterend:block/chorus_plant_stem_2" },
{ "model": "betterend:block/chorus_plant_stem_3" },
{ "model": "betterend:block/chorus_plant_stem_4" }
]
}
]
}