Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.19/dev' into 1.20/dev
Browse files Browse the repository at this point in the history 
# Conflicts:
#	common/src/generated/resources/.cache/751457ce789dd6b8b7567cd82d35b9752aafe975
#	common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
#	common/src/generated/resources/.cache/c3c688c4efe8f57272b43a9a4840c55a7086f208
#	common/src/generated/resources/.cache/d7e494d5d0e99c7bbf8df1e22c97c22b5c6944c1
#	common/src/main/java/com/railwayteam/railways/registry/CRBlocks.java
#	forge/src/main/java/com/railwayteam/railways/content/buffer/forge/BufferModel.java
  • Loading branch information
@techno-sam
techno-sam committed Aug 7, 2024
2 parents bd4f776 + 02b2224 commit ff236d4
Show file tree
Hide file tree
Showing 11 changed files with 398 additions and 127 deletions.
46 changes: 38 additions & 8 deletions common/src/generated/resources/assets/railways/blockstates/buffer.json
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,62 @@
{
"variants": {
"facing=east,style=short": {
"diagonal=false,facing=east,style=short": {
"model": "railways:block/buffer/buffer_stop_short_support",
"y": 90
},
"facing=east,style=standard": {
"diagonal=false,facing=east,style=standard": {
"model": "railways:block/buffer/buffer_stop",
"y": 90
},
"facing=north,style=short": {
"diagonal=false,facing=north,style=short": {
"model": "railways:block/buffer/buffer_stop_short_support"
},
"facing=north,style=standard": {
"diagonal=false,facing=north,style=standard": {
"model": "railways:block/buffer/buffer_stop"
},
"facing=south,style=short": {
"diagonal=false,facing=south,style=short": {
"model": "railways:block/buffer/buffer_stop_short_support",
"y": 180
},
"facing=south,style=standard": {
"diagonal=false,facing=south,style=standard": {
"model": "railways:block/buffer/buffer_stop",
"y": 180
},
"facing=west,style=short": {
"diagonal=false,facing=west,style=short": {
"model": "railways:block/buffer/buffer_stop_short_support",
"y": 270
},
"facing=west,style=standard": {
"diagonal=false,facing=west,style=standard": {
"model": "railways:block/buffer/buffer_stop",
"y": 270
},
"diagonal=true,facing=east,style=short": {
"model": "railways:block/buffer/buffer_stop_short_support",
"y": 90
},
"diagonal=true,facing=east,style=standard": {
"model": "railways:block/buffer/buffer_stop",
"y": 90
},
"diagonal=true,facing=north,style=short": {
"model": "railways:block/buffer/buffer_stop_short_support"
},
"diagonal=true,facing=north,style=standard": {
"model": "railways:block/buffer/buffer_stop"
},
"diagonal=true,facing=south,style=short": {
"model": "railways:block/buffer/buffer_stop_short_support",
"y": 180
},
"diagonal=true,facing=south,style=standard": {
"model": "railways:block/buffer/buffer_stop",
"y": 180
},
"diagonal=true,facing=west,style=short": {
"model": "railways:block/buffer/buffer_stop_short_support",
"y": 270
},
"diagonal=true,facing=west,style=standard": {
"model": "railways:block/buffer/buffer_stop",
"y": 270
}
Expand Down
172 changes: 137 additions & 35 deletions common/src/generated/resources/assets/railways/blockstates/buffer_mono.json
View file
Original file line number Diff line number Diff line change
@@ -1,106 +1,208 @@
{
"variants": {
"facing=east,style=mono,upside_down=false": {
"diagonal=false,facing=east,style=mono,upside_down=false": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"y": 90
"y": 270
},
"facing=east,style=mono,upside_down=true": {
"diagonal=false,facing=east,style=mono,upside_down=true": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"x": 180,
"y": 270
"y": 90
},
"facing=east,style=side,upside_down=false": {
"diagonal=false,facing=east,style=side,upside_down=false": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"y": 90
"y": 270
},
"facing=east,style=side,upside_down=true": {
"diagonal=false,facing=east,style=side,upside_down=true": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"x": 180,
"y": 90
},
"diagonal=false,facing=east,style=standard,upside_down=false": {
"model": "railways:block/buffer/monorail_buffer_stop",
"y": 270
},
"facing=east,style=standard,upside_down=false": {
"diagonal=false,facing=east,style=standard,upside_down=true": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180,
"y": 90
},
"facing=east,style=standard,upside_down=true": {
"diagonal=false,facing=north,style=mono,upside_down=false": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"y": 180
},
"diagonal=false,facing=north,style=mono,upside_down=true": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"x": 180
},
"diagonal=false,facing=north,style=side,upside_down=false": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"y": 180
},
"diagonal=false,facing=north,style=side,upside_down=true": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"x": 180
},
"diagonal=false,facing=north,style=standard,upside_down=false": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180,
"y": 270
"y": 180
},
"facing=north,style=mono,upside_down=false": {
"diagonal=false,facing=north,style=standard,upside_down=true": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180
},
"diagonal=false,facing=south,style=mono,upside_down=false": {
"model": "railways:block/buffer/monorail_mono_buffer_stop"
},
"facing=north,style=mono,upside_down=true": {
"diagonal=false,facing=south,style=mono,upside_down=true": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"x": 180,
"y": 180
},
"facing=north,style=side,upside_down=false": {
"diagonal=false,facing=south,style=side,upside_down=false": {
"model": "railways:block/buffer/monorail_side_buffer_stop"
},
"facing=north,style=side,upside_down=true": {
"diagonal=false,facing=south,style=side,upside_down=true": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"x": 180,
"y": 180
},
"facing=north,style=standard,upside_down=false": {
"diagonal=false,facing=south,style=standard,upside_down=false": {
"model": "railways:block/buffer/monorail_buffer_stop"
},
"facing=north,style=standard,upside_down=true": {
"diagonal=false,facing=south,style=standard,upside_down=true": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180,
"y": 180
},
"facing=south,style=mono,upside_down=false": {
"diagonal=false,facing=west,style=mono,upside_down=false": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"y": 180
"y": 90
},
"facing=south,style=mono,upside_down=true": {
"diagonal=false,facing=west,style=mono,upside_down=true": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"x": 180
"x": 180,
"y": 270
},
"facing=south,style=side,upside_down=false": {
"diagonal=false,facing=west,style=side,upside_down=false": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"y": 180
"y": 90
},
"facing=south,style=side,upside_down=true": {
"diagonal=false,facing=west,style=side,upside_down=true": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"x": 180
"x": 180,
"y": 270
},
"facing=south,style=standard,upside_down=false": {
"diagonal=false,facing=west,style=standard,upside_down=false": {
"model": "railways:block/buffer/monorail_buffer_stop",
"y": 180
"y": 90
},
"facing=south,style=standard,upside_down=true": {
"diagonal=false,facing=west,style=standard,upside_down=true": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180
"x": 180,
"y": 270
},
"facing=west,style=mono,upside_down=false": {
"diagonal=true,facing=east,style=mono,upside_down=false": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"y": 270
},
"facing=west,style=mono,upside_down=true": {
"diagonal=true,facing=east,style=mono,upside_down=true": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"x": 180,
"y": 90
},
"facing=west,style=side,upside_down=false": {
"diagonal=true,facing=east,style=side,upside_down=false": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"y": 270
},
"facing=west,style=side,upside_down=true": {
"diagonal=true,facing=east,style=side,upside_down=true": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"x": 180,
"y": 90
},
"facing=west,style=standard,upside_down=false": {
"diagonal=true,facing=east,style=standard,upside_down=false": {
"model": "railways:block/buffer/monorail_buffer_stop",
"y": 270
},
"facing=west,style=standard,upside_down=true": {
"diagonal=true,facing=east,style=standard,upside_down=true": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180,
"y": 90
},
"diagonal=true,facing=north,style=mono,upside_down=false": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"y": 180
},
"diagonal=true,facing=north,style=mono,upside_down=true": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"x": 180
},
"diagonal=true,facing=north,style=side,upside_down=false": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"y": 180
},
"diagonal=true,facing=north,style=side,upside_down=true": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"x": 180
},
"diagonal=true,facing=north,style=standard,upside_down=false": {
"model": "railways:block/buffer/monorail_buffer_stop",
"y": 180
},
"diagonal=true,facing=north,style=standard,upside_down=true": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180
},
"diagonal=true,facing=south,style=mono,upside_down=false": {
"model": "railways:block/buffer/monorail_mono_buffer_stop"
},
"diagonal=true,facing=south,style=mono,upside_down=true": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"x": 180,
"y": 180
},
"diagonal=true,facing=south,style=side,upside_down=false": {
"model": "railways:block/buffer/monorail_side_buffer_stop"
},
"diagonal=true,facing=south,style=side,upside_down=true": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"x": 180,
"y": 180
},
"diagonal=true,facing=south,style=standard,upside_down=false": {
"model": "railways:block/buffer/monorail_buffer_stop"
},
"diagonal=true,facing=south,style=standard,upside_down=true": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180,
"y": 180
},
"diagonal=true,facing=west,style=mono,upside_down=false": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"y": 90
},
"diagonal=true,facing=west,style=mono,upside_down=true": {
"model": "railways:block/buffer/monorail_mono_buffer_stop",
"x": 180,
"y": 270
},
"diagonal=true,facing=west,style=side,upside_down=false": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"y": 90
},
"diagonal=true,facing=west,style=side,upside_down=true": {
"model": "railways:block/buffer/monorail_side_buffer_stop",
"x": 180,
"y": 270
},
"diagonal=true,facing=west,style=standard,upside_down=false": {
"model": "railways:block/buffer/monorail_buffer_stop",
"y": 90
},
"diagonal=true,facing=west,style=standard,upside_down=true": {
"model": "railways:block/buffer/monorail_buffer_stop",
"x": 180,
"y": 270
}
}
}
46 changes: 38 additions & 8 deletions common/src/generated/resources/assets/railways/blockstates/buffer_narrow.json
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,62 @@
{
"variants": {
"facing=east,style=mono": {
"diagonal=false,facing=east,style=mono": {
"model": "railways:block/buffer/narrow_mono_buffer_stop",
"y": 90
},
"facing=east,style=standard": {
"diagonal=false,facing=east,style=standard": {
"model": "railways:block/buffer/narrow_buffer_stop",
"y": 90
},
"facing=north,style=mono": {
"diagonal=false,facing=north,style=mono": {
"model": "railways:block/buffer/narrow_mono_buffer_stop"
},
"facing=north,style=standard": {
"diagonal=false,facing=north,style=standard": {
"model": "railways:block/buffer/narrow_buffer_stop"
},
"facing=south,style=mono": {
"diagonal=false,facing=south,style=mono": {
"model": "railways:block/buffer/narrow_mono_buffer_stop",
"y": 180
},
"facing=south,style=standard": {
"diagonal=false,facing=south,style=standard": {
"model": "railways:block/buffer/narrow_buffer_stop",
"y": 180
},
"facing=west,style=mono": {
"diagonal=false,facing=west,style=mono": {
"model": "railways:block/buffer/narrow_mono_buffer_stop",
"y": 270
},
"facing=west,style=standard": {
"diagonal=false,facing=west,style=standard": {
"model": "railways:block/buffer/narrow_buffer_stop",
"y": 270
},
"diagonal=true,facing=east,style=mono": {
"model": "railways:block/buffer/narrow_mono_buffer_stop",
"y": 90
},
"diagonal=true,facing=east,style=standard": {
"model": "railways:block/buffer/narrow_buffer_stop",
"y": 90
},
"diagonal=true,facing=north,style=mono": {
"model": "railways:block/buffer/narrow_mono_buffer_stop"
},
"diagonal=true,facing=north,style=standard": {
"model": "railways:block/buffer/narrow_buffer_stop"
},
"diagonal=true,facing=south,style=mono": {
"model": "railways:block/buffer/narrow_mono_buffer_stop",
"y": 180
},
"diagonal=true,facing=south,style=standard": {
"model": "railways:block/buffer/narrow_buffer_stop",
"y": 180
},
"diagonal=true,facing=west,style=mono": {
"model": "railways:block/buffer/narrow_mono_buffer_stop",
"y": 270
},
"diagonal=true,facing=west,style=standard": {
"model": "railways:block/buffer/narrow_buffer_stop",
"y": 270
}
Expand Down
Loading

0 comments on commit ff236d4

Please sign in to comment.