Skip to content

Commit

Permalink
Finish 1.18.2 port
Browse files Browse the repository at this point in the history
  • Loading branch information
@a0a7
a0a7 committed Oct 27, 2023
1 parent 03d92e1 commit 8abb41f
Show file tree
Hide file tree
Showing 499 changed files with 3,979 additions and 6,798 deletions.
618 changes: 0 additions & 618 deletions src/generated/resources/.cache/60a03fe496bf6ea7de10fb84452b89234f6f6b84
View file

This file was deleted.

142 changes: 71 additions & 71 deletions src/generated/resources/assets/interiors/blockstates/black_chair.json
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,124 @@
{
"variants": {
"armrests=both,cropped_back=false,facing=east": {
"model": "interiors:block/chair/black_chair_both",
"y": 90
},
"armrests=both,cropped_back=false,facing=north": {
"model": "interiors:block/chair/black_chair_both"
},
"armrests=both,cropped_back=false,facing=south": {
"model": "interiors:block/chair/black_chair_both",
"y": 180
"armrests=none,cropped_back=false,facing=north": {
"model": "interiors:block/chair/black_chair_none"
},
"armrests=both,cropped_back=false,facing=west": {
"model": "interiors:block/chair/black_chair_both",
"y": 270
"armrests=left,cropped_back=false,facing=north": {
"model": "interiors:block/chair/black_chair_left"
},
"armrests=both,cropped_back=true,facing=east": {
"model": "interiors:block/chair/black_chair_both_cropped",
"y": 90
"armrests=right,cropped_back=false,facing=north": {
"model": "interiors:block/chair/black_chair_right"
},
"armrests=both,cropped_back=true,facing=north": {
"model": "interiors:block/chair/black_chair_both_cropped"
},
"armrests=both,cropped_back=true,facing=south": {
"model": "interiors:block/chair/black_chair_both_cropped",
"y": 180
"armrests=none,cropped_back=true,facing=north": {
"model": "interiors:block/chair/black_chair_none_cropped"
},
"armrests=both,cropped_back=true,facing=west": {
"model": "interiors:block/chair/black_chair_both_cropped",
"y": 270
"armrests=left,cropped_back=true,facing=north": {
"model": "interiors:block/chair/black_chair_left_cropped"
},
"armrests=left,cropped_back=false,facing=east": {
"model": "interiors:block/chair/black_chair_left",
"y": 90
"armrests=right,cropped_back=true,facing=north": {
"model": "interiors:block/chair/black_chair_right_cropped"
},
"armrests=left,cropped_back=false,facing=north": {
"model": "interiors:block/chair/black_chair_left"
"armrests=both,cropped_back=false,facing=south": {
"model": "interiors:block/chair/black_chair_both",
"y": 180
},
"armrests=none,cropped_back=false,facing=south": {
"model": "interiors:block/chair/black_chair_none",
"y": 180
},
"armrests=left,cropped_back=false,facing=south": {
"model": "interiors:block/chair/black_chair_left",
"y": 180
},
"armrests=left,cropped_back=false,facing=west": {
"model": "interiors:block/chair/black_chair_left",
"y": 270
"armrests=right,cropped_back=false,facing=south": {
"model": "interiors:block/chair/black_chair_right",
"y": 180
},
"armrests=left,cropped_back=true,facing=east": {
"model": "interiors:block/chair/black_chair_left_cropped",
"y": 90
"armrests=both,cropped_back=true,facing=south": {
"model": "interiors:block/chair/black_chair_both_cropped",
"y": 180
},
"armrests=left,cropped_back=true,facing=north": {
"model": "interiors:block/chair/black_chair_left_cropped"
"armrests=none,cropped_back=true,facing=south": {
"model": "interiors:block/chair/black_chair_none_cropped",
"y": 180
},
"armrests=left,cropped_back=true,facing=south": {
"model": "interiors:block/chair/black_chair_left_cropped",
"y": 180
},
"armrests=left,cropped_back=true,facing=west": {
"model": "interiors:block/chair/black_chair_left_cropped",
"y": 270
},
"armrests=none,cropped_back=false,facing=east": {
"model": "interiors:block/chair/black_chair_none",
"y": 90
},
"armrests=none,cropped_back=false,facing=north": {
"model": "interiors:block/chair/black_chair_none"
},
"armrests=none,cropped_back=false,facing=south": {
"model": "interiors:block/chair/black_chair_none",
"armrests=right,cropped_back=true,facing=south": {
"model": "interiors:block/chair/black_chair_right_cropped",
"y": 180
},
"armrests=both,cropped_back=false,facing=west": {
"model": "interiors:block/chair/black_chair_both",
"y": 270
},
"armrests=none,cropped_back=false,facing=west": {
"model": "interiors:block/chair/black_chair_none",
"y": 270
},
"armrests=none,cropped_back=true,facing=east": {
"model": "interiors:block/chair/black_chair_none_cropped",
"y": 90
"armrests=left,cropped_back=false,facing=west": {
"model": "interiors:block/chair/black_chair_left",
"y": 270
},
"armrests=none,cropped_back=true,facing=north": {
"model": "interiors:block/chair/black_chair_none_cropped"
"armrests=right,cropped_back=false,facing=west": {
"model": "interiors:block/chair/black_chair_right",
"y": 270
},
"armrests=none,cropped_back=true,facing=south": {
"model": "interiors:block/chair/black_chair_none_cropped",
"y": 180
"armrests=both,cropped_back=true,facing=west": {
"model": "interiors:block/chair/black_chair_both_cropped",
"y": 270
},
"armrests=none,cropped_back=true,facing=west": {
"model": "interiors:block/chair/black_chair_none_cropped",
"y": 270
},
"armrests=right,cropped_back=false,facing=east": {
"model": "interiors:block/chair/black_chair_right",
"armrests=left,cropped_back=true,facing=west": {
"model": "interiors:block/chair/black_chair_left_cropped",
"y": 270
},
"armrests=right,cropped_back=true,facing=west": {
"model": "interiors:block/chair/black_chair_right_cropped",
"y": 270
},
"armrests=both,cropped_back=false,facing=east": {
"model": "interiors:block/chair/black_chair_both",
"y": 90
},
"armrests=right,cropped_back=false,facing=north": {
"model": "interiors:block/chair/black_chair_right"
"armrests=none,cropped_back=false,facing=east": {
"model": "interiors:block/chair/black_chair_none",
"y": 90
},
"armrests=right,cropped_back=false,facing=south": {
"model": "interiors:block/chair/black_chair_right",
"y": 180
"armrests=left,cropped_back=false,facing=east": {
"model": "interiors:block/chair/black_chair_left",
"y": 90
},
"armrests=right,cropped_back=false,facing=west": {
"armrests=right,cropped_back=false,facing=east": {
"model": "interiors:block/chair/black_chair_right",
"y": 270
"y": 90
},
"armrests=right,cropped_back=true,facing=east": {
"model": "interiors:block/chair/black_chair_right_cropped",
"armrests=both,cropped_back=true,facing=east": {
"model": "interiors:block/chair/black_chair_both_cropped",
"y": 90
},
"armrests=right,cropped_back=true,facing=north": {
"model": "interiors:block/chair/black_chair_right_cropped"
"armrests=none,cropped_back=true,facing=east": {
"model": "interiors:block/chair/black_chair_none_cropped",
"y": 90
},
"armrests=right,cropped_back=true,facing=south": {
"model": "interiors:block/chair/black_chair_right_cropped",
"y": 180
"armrests=left,cropped_back=true,facing=east": {
"model": "interiors:block/chair/black_chair_left_cropped",
"y": 90
},
"armrests=right,cropped_back=true,facing=west": {
"armrests=right,cropped_back=true,facing=east": {
"model": "interiors:block/chair/black_chair_right_cropped",
"y": 270
"y": 90
}
}
}
142 changes: 71 additions & 71 deletions src/generated/resources/assets/interiors/blockstates/black_floor_chair.json
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,124 @@
{
"variants": {
"armrests=both,cropped_back=false,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_both",
"y": 90
},
"armrests=both,cropped_back=false,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_both"
},
"armrests=both,cropped_back=false,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_both",
"y": 180
"armrests=none,cropped_back=false,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_none"
},
"armrests=both,cropped_back=false,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_both",
"y": 270
"armrests=left,cropped_back=false,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_left"
},
"armrests=both,cropped_back=true,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_both_cropped",
"y": 90
"armrests=right,cropped_back=false,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_right"
},
"armrests=both,cropped_back=true,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_both_cropped"
},
"armrests=both,cropped_back=true,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_both_cropped",
"y": 180
"armrests=none,cropped_back=true,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_none_cropped"
},
"armrests=both,cropped_back=true,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_both_cropped",
"y": 270
"armrests=left,cropped_back=true,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_left_cropped"
},
"armrests=left,cropped_back=false,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_left",
"y": 90
"armrests=right,cropped_back=true,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_right_cropped"
},
"armrests=left,cropped_back=false,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_left"
"armrests=both,cropped_back=false,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_both",
"y": 180
},
"armrests=none,cropped_back=false,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_none",
"y": 180
},
"armrests=left,cropped_back=false,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_left",
"y": 180
},
"armrests=left,cropped_back=false,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_left",
"y": 270
"armrests=right,cropped_back=false,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_right",
"y": 180
},
"armrests=left,cropped_back=true,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_left_cropped",
"y": 90
"armrests=both,cropped_back=true,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_both_cropped",
"y": 180
},
"armrests=left,cropped_back=true,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_left_cropped"
"armrests=none,cropped_back=true,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_none_cropped",
"y": 180
},
"armrests=left,cropped_back=true,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_left_cropped",
"y": 180
},
"armrests=left,cropped_back=true,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_left_cropped",
"y": 270
},
"armrests=none,cropped_back=false,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_none",
"y": 90
},
"armrests=none,cropped_back=false,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_none"
},
"armrests=none,cropped_back=false,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_none",
"armrests=right,cropped_back=true,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_right_cropped",
"y": 180
},
"armrests=both,cropped_back=false,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_both",
"y": 270
},
"armrests=none,cropped_back=false,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_none",
"y": 270
},
"armrests=none,cropped_back=true,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_none_cropped",
"y": 90
"armrests=left,cropped_back=false,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_left",
"y": 270
},
"armrests=none,cropped_back=true,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_none_cropped"
"armrests=right,cropped_back=false,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_right",
"y": 270
},
"armrests=none,cropped_back=true,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_none_cropped",
"y": 180
"armrests=both,cropped_back=true,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_both_cropped",
"y": 270
},
"armrests=none,cropped_back=true,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_none_cropped",
"y": 270
},
"armrests=right,cropped_back=false,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_right",
"armrests=left,cropped_back=true,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_left_cropped",
"y": 270
},
"armrests=right,cropped_back=true,facing=west": {
"model": "interiors:block/floor_chair/black_floor_chair_right_cropped",
"y": 270
},
"armrests=both,cropped_back=false,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_both",
"y": 90
},
"armrests=right,cropped_back=false,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_right"
"armrests=none,cropped_back=false,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_none",
"y": 90
},
"armrests=right,cropped_back=false,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_right",
"y": 180
"armrests=left,cropped_back=false,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_left",
"y": 90
},
"armrests=right,cropped_back=false,facing=west": {
"armrests=right,cropped_back=false,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_right",
"y": 270
"y": 90
},
"armrests=right,cropped_back=true,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_right_cropped",
"armrests=both,cropped_back=true,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_both_cropped",
"y": 90
},
"armrests=right,cropped_back=true,facing=north": {
"model": "interiors:block/floor_chair/black_floor_chair_right_cropped"
"armrests=none,cropped_back=true,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_none_cropped",
"y": 90
},
"armrests=right,cropped_back=true,facing=south": {
"model": "interiors:block/floor_chair/black_floor_chair_right_cropped",
"y": 180
"armrests=left,cropped_back=true,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_left_cropped",
"y": 90
},
"armrests=right,cropped_back=true,facing=west": {
"armrests=right,cropped_back=true,facing=east": {
"model": "interiors:block/floor_chair/black_floor_chair_right_cropped",
"y": 270
"y": 90
}
}
}
Loading

0 comments on commit 8abb41f

Please sign in to comment.