mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-26 06:57:51 +01:00
Underwater Transport II
- Depots and Ejectors can now be Waterlogged - Chutes and Funnels can now be Waterlogged
This commit is contained in:
simibubi
parent
c2c37da442
commit
9cd992eed7
14 changed files with 775 additions and 157 deletions
|
|
@ -4,12 +4,12 @@ f0d6baaabda94151134f569246d61a6e710c35a9 assets/create/blockstates/acacia_window
|
|||
9dd79bf5430f674e7d3e3fc7d59edee3d66e241e assets/create/blockstates/analog_lever.json
|
||||
a891d5abbc133288a9ad377b3ea9adad8ee92972 assets/create/blockstates/andesite_alloy_block.json
|
||||
951d67fc41af364e333babf649e1a04beea6226a assets/create/blockstates/andesite_bars.json
|
||||
47cb4f4629277b467263bd54a44dec45837eb719 assets/create/blockstates/andesite_belt_funnel.json
|
||||
f08653e3772bee4a5b280caa9dabf6d56f7cabad assets/create/blockstates/andesite_belt_funnel.json
|
||||
9999a75c7766781eadb12510a09264600bc846e4 assets/create/blockstates/andesite_casing.json
|
||||
96bd534d3d84336927fb6512f9848d837d557084 assets/create/blockstates/andesite_encased_cogwheel.json
|
||||
1673172100317477ca559c32fd91d16b165e0085 assets/create/blockstates/andesite_encased_large_cogwheel.json
|
||||
9639b901ffdd2ecccab5575c5c9e6c7b5c901e02 assets/create/blockstates/andesite_encased_shaft.json
|
||||
7c5ac6149a991dfe125be3ae3c27c0c841e11f6c assets/create/blockstates/andesite_funnel.json
|
||||
d5aa58fd926fce36180eb198fa9bb515b69b7715 assets/create/blockstates/andesite_funnel.json
|
||||
73154ab9fe5463116d06d0732f9a1c2fa817dc3f assets/create/blockstates/andesite_ladder.json
|
||||
3adca59d03198c273f13c21c6058348c9fa71735 assets/create/blockstates/andesite_pillar.json
|
||||
a07a73251d26e8b38bce295838c2fef246f9885d assets/create/blockstates/andesite_scaffolding.json
|
||||
|
|
@ -32,13 +32,13 @@ ec2ab87734acc209e6be3bc4898b1199f819bfd3 assets/create/blockstates/blue_sail.jso
|
|||
dea175335c5db0abe758cd208dc984c22506a176 assets/create/blockstates/blue_toolbox.json
|
||||
f3697a7d105e5d271f5999b86df071fe5893457c assets/create/blockstates/blue_valve_handle.json
|
||||
73648bfbc15c536613ca92fb675c17243d9f4f44 assets/create/blockstates/brass_bars.json
|
||||
4b436e4afa3b1734567010788064fee73f69c92e assets/create/blockstates/brass_belt_funnel.json
|
||||
e7368157defc81f6fd72831f3464ec666cf885f8 assets/create/blockstates/brass_belt_funnel.json
|
||||
8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets/create/blockstates/brass_block.json
|
||||
b8dd6e505943e06706d0718ece620ab3cf943650 assets/create/blockstates/brass_casing.json
|
||||
577adb030af119fb980ededaa7fc2a3d3ed14220 assets/create/blockstates/brass_encased_cogwheel.json
|
||||
e69a71fdeb5855b2a59a31598f25eaea589c1748 assets/create/blockstates/brass_encased_large_cogwheel.json
|
||||
288bad07593a8a2c8efaf44bba0ffb0011d36cd3 assets/create/blockstates/brass_encased_shaft.json
|
||||
bd8f3073f3208d0116719a25044a91dd46fc11ac assets/create/blockstates/brass_funnel.json
|
||||
b8b33c0992ad6398d1dd70ecb88d311946fc9971 assets/create/blockstates/brass_funnel.json
|
||||
f9234ab4324892587c4b0bf38523ee7770072f6b assets/create/blockstates/brass_ladder.json
|
||||
1424ae41182927e71613a6495530c1ec346e8f50 assets/create/blockstates/brass_scaffolding.json
|
||||
769e12a65262f79b57df9e3300df20d3fca6c3bb assets/create/blockstates/brass_tunnel.json
|
||||
|
|
@ -50,7 +50,7 @@ bd73bfdbe88c58883cc15fe31a9dac7860482ca3 assets/create/blockstates/brown_toolbox
|
|||
ff1073a5451691c492102243084d92de42abfc26 assets/create/blockstates/calcite_pillar.json
|
||||
d01a750e6e8214ca8481e40aa69cedeb5c7210f8 assets/create/blockstates/cart_assembler.json
|
||||
470e8c6a9c37b91fa745bc4f6e9d3740bd72467e assets/create/blockstates/chocolate.json
|
||||
ab6053177b215a1714aa8ffd77b466f5fa840fdc assets/create/blockstates/chute.json
|
||||
816c17d1f546d09bc4d7f2eac17a9d26d4a8f9ca assets/create/blockstates/chute.json
|
||||
4947c261310445fa55b92038326ac82967d192dd assets/create/blockstates/clockwork_bearing.json
|
||||
1f33834c685e3243882acfe20183fe64dfa872be assets/create/blockstates/clutch.json
|
||||
e5e3757e99c139d67b2a70288466d8a74d818841 assets/create/blockstates/cogwheel.json
|
||||
|
|
@ -562,7 +562,7 @@ f2a261f2f2daeab2a6ac403497c469364d2bfaaa assets/create/blockstates/weathered_cop
|
|||
266c4035d82db747411592faebaf425ecb759672 assets/create/blockstates/weathered_copper_tile_slab.json
|
||||
d7588ea4a82633c38c7a33f17d4c1c2876d7f6a9 assets/create/blockstates/weathered_copper_tile_stairs.json
|
||||
3d4fec3f32782c7158b10baf768ce85b3232d8fe assets/create/blockstates/weathered_copper_tiles.json
|
||||
c838c0792511ca2e14493b40032bb1370fac588a assets/create/blockstates/weighted_ejector.json
|
||||
5c2c65512f0c4107c0f1eecc8e7513b92aed9c6c assets/create/blockstates/weighted_ejector.json
|
||||
1ed177e00c30ab8ca44ad4041cd95084a86b810c assets/create/blockstates/white_nixie_tube.json
|
||||
512bf17c9ea309b1f7da54440f923530d25e467c assets/create/blockstates/white_sail.json
|
||||
4647010162eb4c350fad236d860317eaa1884c77 assets/create/blockstates/white_seat.json
|
||||
|
|
|
|||
|
|
@ -1,122 +1,242 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north,powered=false,shape=retracted": {
|
||||
"facing=north,powered=false,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=retracted": {
|
||||
"facing=south,powered=false,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=retracted": {
|
||||
"facing=west,powered=false,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=retracted": {
|
||||
"facing=east,powered=false,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=retracted": {
|
||||
"facing=north,powered=true,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=retracted": {
|
||||
"facing=south,powered=true,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=retracted": {
|
||||
"facing=west,powered=true,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=retracted": {
|
||||
"facing=east,powered=true,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=extended": {
|
||||
"facing=north,powered=false,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=extended": {
|
||||
"facing=south,powered=false,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=extended": {
|
||||
"facing=west,powered=false,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=extended": {
|
||||
"facing=east,powered=false,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=extended": {
|
||||
"facing=north,powered=true,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=extended": {
|
||||
"facing=south,powered=true,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=extended": {
|
||||
"facing=west,powered=true,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=extended": {
|
||||
"facing=east,powered=true,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=pushing": {
|
||||
"facing=north,powered=false,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=pushing": {
|
||||
"facing=south,powered=false,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=pushing": {
|
||||
"facing=west,powered=false,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=pushing": {
|
||||
"facing=east,powered=false,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=pushing": {
|
||||
"facing=north,powered=true,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=pushing": {
|
||||
"facing=south,powered=true,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=pushing": {
|
||||
"facing=west,powered=true,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=pushing": {
|
||||
"facing=east,powered=true,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=pulling": {
|
||||
"facing=north,powered=false,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=pulling": {
|
||||
"facing=south,powered=false,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=pulling": {
|
||||
"facing=west,powered=false,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=pulling": {
|
||||
"facing=east,powered=false,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=pulling": {
|
||||
"facing=north,powered=true,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=pulling": {
|
||||
"facing=south,powered=true,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=pulling": {
|
||||
"facing=west,powered=true,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=pulling": {
|
||||
"facing=east,powered=true,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_retracted_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_extended_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pushing_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/andesite_belt_funnel_pulling_powered",
|
||||
"y": 90
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,98 +1,194 @@
|
|||
{
|
||||
"variants": {
|
||||
"extracting=false,facing=down,powered=false": {
|
||||
"extracting=false,facing=down,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_pull_unpowered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=down,powered=false": {
|
||||
"extracting=true,facing=down,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_push_unpowered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=up,powered=false": {
|
||||
"extracting=false,facing=up,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_pull_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=up,powered=false": {
|
||||
"extracting=true,facing=up,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_push_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=north,powered=false": {
|
||||
"extracting=false,facing=north,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_unpowered"
|
||||
},
|
||||
"extracting=true,facing=north,powered=false": {
|
||||
"extracting=true,facing=north,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_unpowered"
|
||||
},
|
||||
"extracting=false,facing=south,powered=false": {
|
||||
"extracting=false,facing=south,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=south,powered=false": {
|
||||
"extracting=true,facing=south,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=west,powered=false": {
|
||||
"extracting=false,facing=west,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=true,facing=west,powered=false": {
|
||||
"extracting=true,facing=west,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=false,facing=east,powered=false": {
|
||||
"extracting=false,facing=east,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=true,facing=east,powered=false": {
|
||||
"extracting=true,facing=east,powered=false,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=false,facing=down,powered=true": {
|
||||
"extracting=false,facing=down,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_pull_powered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=down,powered=true": {
|
||||
"extracting=true,facing=down,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_push_powered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=up,powered=true": {
|
||||
"extracting=false,facing=up,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_pull_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=up,powered=true": {
|
||||
"extracting=true,facing=up,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_push_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=north,powered=true": {
|
||||
"extracting=false,facing=north,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_powered"
|
||||
},
|
||||
"extracting=true,facing=north,powered=true": {
|
||||
"extracting=true,facing=north,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_powered"
|
||||
},
|
||||
"extracting=false,facing=south,powered=true": {
|
||||
"extracting=false,facing=south,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=south,powered=true": {
|
||||
"extracting=true,facing=south,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=west,powered=true": {
|
||||
"extracting=false,facing=west,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_powered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=true,facing=west,powered=true": {
|
||||
"extracting=true,facing=west,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_powered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=false,facing=east,powered=true": {
|
||||
"extracting=false,facing=east,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_powered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=true,facing=east,powered=true": {
|
||||
"extracting=true,facing=east,powered=true,waterlogged=false": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_powered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=false,facing=down,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_pull_unpowered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=down,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_push_unpowered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=up,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_pull_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=up,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_push_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=north,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_unpowered"
|
||||
},
|
||||
"extracting=true,facing=north,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_unpowered"
|
||||
},
|
||||
"extracting=false,facing=south,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=south,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=west,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=true,facing=west,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=false,facing=east,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=true,facing=east,powered=false,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=false,facing=down,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_pull_powered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=down,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_push_powered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=up,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_pull_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=up,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_vertical_filterless_push_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=north,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_powered"
|
||||
},
|
||||
"extracting=true,facing=north,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_powered"
|
||||
},
|
||||
"extracting=false,facing=south,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=south,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=west,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_powered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=true,facing=west,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_powered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=false,facing=east,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_pull_powered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=true,facing=east,powered=true,waterlogged=true": {
|
||||
"model": "create:block/andesite_funnel_horizontal_push_powered",
|
||||
"y": 90
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,122 +1,242 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north,powered=false,shape=retracted": {
|
||||
"facing=north,powered=false,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=retracted": {
|
||||
"facing=south,powered=false,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=retracted": {
|
||||
"facing=west,powered=false,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=retracted": {
|
||||
"facing=east,powered=false,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=retracted": {
|
||||
"facing=north,powered=true,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=retracted": {
|
||||
"facing=south,powered=true,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=retracted": {
|
||||
"facing=west,powered=true,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=retracted": {
|
||||
"facing=east,powered=true,shape=retracted,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=extended": {
|
||||
"facing=north,powered=false,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_extended_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=extended": {
|
||||
"facing=south,powered=false,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_extended_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=extended": {
|
||||
"facing=west,powered=false,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_extended_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=extended": {
|
||||
"facing=east,powered=false,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_extended_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=extended": {
|
||||
"facing=north,powered=true,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_extended_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=extended": {
|
||||
"facing=south,powered=true,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_extended_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=extended": {
|
||||
"facing=west,powered=true,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_extended_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=extended": {
|
||||
"facing=east,powered=true,shape=extended,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_extended_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=pushing": {
|
||||
"facing=north,powered=false,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=pushing": {
|
||||
"facing=south,powered=false,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=pushing": {
|
||||
"facing=west,powered=false,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=pushing": {
|
||||
"facing=east,powered=false,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=pushing": {
|
||||
"facing=north,powered=true,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=pushing": {
|
||||
"facing=south,powered=true,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=pushing": {
|
||||
"facing=west,powered=true,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=pushing": {
|
||||
"facing=east,powered=true,shape=pushing,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=pulling": {
|
||||
"facing=north,powered=false,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=pulling": {
|
||||
"facing=south,powered=false,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=pulling": {
|
||||
"facing=west,powered=false,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=pulling": {
|
||||
"facing=east,powered=false,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=pulling": {
|
||||
"facing=north,powered=true,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=pulling": {
|
||||
"facing=south,powered=true,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=pulling": {
|
||||
"facing=west,powered=true,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=pulling": {
|
||||
"facing=east,powered=true,shape=pulling,waterlogged=false": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=retracted,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_retracted_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_extended_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_extended_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_extended_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_extended_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_extended_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_extended_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_extended_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=extended,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_extended_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=pushing,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pushing_powered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=false,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_unpowered"
|
||||
},
|
||||
"facing=south,powered=false,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=false,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=false,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,powered=true,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_powered"
|
||||
},
|
||||
"facing=south,powered=true,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_powered",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,powered=true,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_powered",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,powered=true,shape=pulling,waterlogged=true": {
|
||||
"model": "create:block/brass_belt_funnel_pulling_powered",
|
||||
"y": 90
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,98 +1,194 @@
|
|||
{
|
||||
"variants": {
|
||||
"extracting=false,facing=down,powered=false": {
|
||||
"extracting=false,facing=down,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_vertical_pull_unpowered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=down,powered=false": {
|
||||
"extracting=true,facing=down,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_vertical_push_unpowered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=up,powered=false": {
|
||||
"extracting=false,facing=up,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_vertical_pull_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=up,powered=false": {
|
||||
"extracting=true,facing=up,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_vertical_push_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=north,powered=false": {
|
||||
"extracting=false,facing=north,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_unpowered"
|
||||
},
|
||||
"extracting=true,facing=north,powered=false": {
|
||||
"extracting=true,facing=north,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_unpowered"
|
||||
},
|
||||
"extracting=false,facing=south,powered=false": {
|
||||
"extracting=false,facing=south,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=south,powered=false": {
|
||||
"extracting=true,facing=south,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=west,powered=false": {
|
||||
"extracting=false,facing=west,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=true,facing=west,powered=false": {
|
||||
"extracting=true,facing=west,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=false,facing=east,powered=false": {
|
||||
"extracting=false,facing=east,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=true,facing=east,powered=false": {
|
||||
"extracting=true,facing=east,powered=false,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=false,facing=down,powered=true": {
|
||||
"extracting=false,facing=down,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_vertical_pull_powered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=down,powered=true": {
|
||||
"extracting=true,facing=down,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_vertical_push_powered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=up,powered=true": {
|
||||
"extracting=false,facing=up,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_vertical_pull_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=up,powered=true": {
|
||||
"extracting=true,facing=up,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_vertical_push_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=north,powered=true": {
|
||||
"extracting=false,facing=north,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_powered"
|
||||
},
|
||||
"extracting=true,facing=north,powered=true": {
|
||||
"extracting=true,facing=north,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_powered"
|
||||
},
|
||||
"extracting=false,facing=south,powered=true": {
|
||||
"extracting=false,facing=south,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=south,powered=true": {
|
||||
"extracting=true,facing=south,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=west,powered=true": {
|
||||
"extracting=false,facing=west,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_powered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=true,facing=west,powered=true": {
|
||||
"extracting=true,facing=west,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_powered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=false,facing=east,powered=true": {
|
||||
"extracting=false,facing=east,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_powered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=true,facing=east,powered=true": {
|
||||
"extracting=true,facing=east,powered=true,waterlogged=false": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_powered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=false,facing=down,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_vertical_pull_unpowered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=down,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_vertical_push_unpowered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=up,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_vertical_pull_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=up,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_vertical_push_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=north,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_unpowered"
|
||||
},
|
||||
"extracting=true,facing=north,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_unpowered"
|
||||
},
|
||||
"extracting=false,facing=south,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=south,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_unpowered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=west,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=true,facing=west,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_unpowered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=false,facing=east,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=true,facing=east,powered=false,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_unpowered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=false,facing=down,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_vertical_pull_powered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=down,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_vertical_push_powered",
|
||||
"x": 180,
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=up,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_vertical_pull_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=up,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_vertical_push_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=north,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_powered"
|
||||
},
|
||||
"extracting=true,facing=north,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_powered"
|
||||
},
|
||||
"extracting=false,facing=south,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=true,facing=south,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_powered",
|
||||
"y": 180
|
||||
},
|
||||
"extracting=false,facing=west,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_powered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=true,facing=west,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_powered",
|
||||
"y": 270
|
||||
},
|
||||
"extracting=false,facing=east,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_pull_powered",
|
||||
"y": 90
|
||||
},
|
||||
"extracting=true,facing=east,powered=true,waterlogged=true": {
|
||||
"model": "create:block/brass_funnel_horizontal_push_powered",
|
||||
"y": 90
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,74 +1,146 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=down,shape=intersection": {
|
||||
"facing=down,shape=intersection,waterlogged=false": {
|
||||
"model": "create:block/chute/block_intersection"
|
||||
},
|
||||
"facing=north,shape=intersection": {
|
||||
"facing=north,shape=intersection,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=intersection": {
|
||||
"facing=south,shape=intersection,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal_intersection"
|
||||
},
|
||||
"facing=west,shape=intersection": {
|
||||
"facing=west,shape=intersection,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=intersection": {
|
||||
"facing=east,shape=intersection,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=window": {
|
||||
"facing=down,shape=window,waterlogged=false": {
|
||||
"model": "create:block/chute/block_windowed"
|
||||
},
|
||||
"facing=north,shape=window": {
|
||||
"facing=north,shape=window,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=window": {
|
||||
"facing=south,shape=window,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal"
|
||||
},
|
||||
"facing=west,shape=window": {
|
||||
"facing=west,shape=window,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=window": {
|
||||
"facing=east,shape=window,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=normal": {
|
||||
"facing=down,shape=normal,waterlogged=false": {
|
||||
"model": "create:block/chute/block"
|
||||
},
|
||||
"facing=north,shape=normal": {
|
||||
"facing=north,shape=normal,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=normal": {
|
||||
"facing=south,shape=normal,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal"
|
||||
},
|
||||
"facing=west,shape=normal": {
|
||||
"facing=west,shape=normal,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=normal": {
|
||||
"facing=east,shape=normal,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=encased": {
|
||||
"facing=down,shape=encased,waterlogged=false": {
|
||||
"model": "create:block/chute/block_intersection"
|
||||
},
|
||||
"facing=north,shape=encased": {
|
||||
"facing=north,shape=encased,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal_encased",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=encased": {
|
||||
"facing=south,shape=encased,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal_encased"
|
||||
},
|
||||
"facing=west,shape=encased": {
|
||||
"facing=west,shape=encased,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal_encased",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=encased": {
|
||||
"facing=east,shape=encased,waterlogged=false": {
|
||||
"model": "create:block/chute/block_diagonal_encased",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=intersection,waterlogged=true": {
|
||||
"model": "create:block/chute/block_intersection"
|
||||
},
|
||||
"facing=north,shape=intersection,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=intersection,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal_intersection"
|
||||
},
|
||||
"facing=west,shape=intersection,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=intersection,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal_intersection",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=window,waterlogged=true": {
|
||||
"model": "create:block/chute/block_windowed"
|
||||
},
|
||||
"facing=north,shape=window,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=window,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal"
|
||||
},
|
||||
"facing=west,shape=window,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=window,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=normal,waterlogged=true": {
|
||||
"model": "create:block/chute/block"
|
||||
},
|
||||
"facing=north,shape=normal,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=normal,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal"
|
||||
},
|
||||
"facing=west,shape=normal,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=normal,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal",
|
||||
"y": 270
|
||||
},
|
||||
"facing=down,shape=encased,waterlogged=true": {
|
||||
"model": "create:block/chute/block_intersection"
|
||||
},
|
||||
"facing=north,shape=encased,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal_encased",
|
||||
"y": 180
|
||||
},
|
||||
"facing=south,shape=encased,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal_encased"
|
||||
},
|
||||
"facing=west,shape=encased,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal_encased",
|
||||
"y": 90
|
||||
},
|
||||
"facing=east,shape=encased,waterlogged=true": {
|
||||
"model": "create:block/chute/block_diagonal_encased",
|
||||
"y": 270
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,32 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north": {
|
||||
"facing=north,waterlogged=false": {
|
||||
"model": "create:block/weighted_ejector/block"
|
||||
},
|
||||
"facing=south": {
|
||||
"facing=south,waterlogged=false": {
|
||||
"model": "create:block/weighted_ejector/block",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west": {
|
||||
"facing=west,waterlogged=false": {
|
||||
"model": "create:block/weighted_ejector/block",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east": {
|
||||
"facing=east,waterlogged=false": {
|
||||
"model": "create:block/weighted_ejector/block",
|
||||
"y": 90
|
||||
},
|
||||
"facing=north,waterlogged=true": {
|
||||
"model": "create:block/weighted_ejector/block"
|
||||
},
|
||||
"facing=south,waterlogged=true": {
|
||||
"model": "create:block/weighted_ejector/block",
|
||||
"y": 180
|
||||
},
|
||||
"facing=west,waterlogged=true": {
|
||||
"model": "create:block/weighted_ejector/block",
|
||||
"y": 270
|
||||
},
|
||||
"facing=east,waterlogged=true": {
|
||||
"model": "create:block/weighted_ejector/block",
|
||||
"y": 90
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import java.util.Map;
|
|||
import com.simibubi.create.AllBlockEntityTypes;
|
||||
import com.simibubi.create.AllBlocks;
|
||||
import com.simibubi.create.content.logistics.block.funnel.FunnelBlock;
|
||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||
import com.simibubi.create.foundation.utility.Iterate;
|
||||
import com.simibubi.create.foundation.utility.Lang;
|
||||
|
||||
|
|
@ -21,6 +22,7 @@ import net.minecraft.world.item.context.BlockPlaceContext;
|
|||
import net.minecraft.world.item.context.UseOnContext;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.LevelAccessor;
|
||||
import net.minecraft.world.level.LevelReader;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Mirror;
|
||||
|
|
@ -32,10 +34,11 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
|||
import net.minecraft.world.level.block.state.properties.DirectionProperty;
|
||||
import net.minecraft.world.level.block.state.properties.EnumProperty;
|
||||
import net.minecraft.world.level.block.state.properties.Property;
|
||||
import net.minecraft.world.level.material.FluidState;
|
||||
import net.minecraft.world.level.pathfinder.PathComputationType;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
|
||||
public class ChuteBlock extends AbstractChuteBlock {
|
||||
public class ChuteBlock extends AbstractChuteBlock implements ProperWaterloggedBlock {
|
||||
|
||||
public static final Property<Shape> SHAPE = EnumProperty.create("shape", Shape.class);
|
||||
public static final DirectionProperty FACING = BlockStateProperties.FACING_HOPPER;
|
||||
|
|
@ -43,7 +46,8 @@ public class ChuteBlock extends AbstractChuteBlock {
|
|||
public ChuteBlock(Properties p_i48440_1_) {
|
||||
super(p_i48440_1_);
|
||||
registerDefaultState(defaultBlockState().setValue(SHAPE, Shape.NORMAL)
|
||||
.setValue(FACING, Direction.DOWN));
|
||||
.setValue(FACING, Direction.DOWN)
|
||||
.setValue(WATERLOGGED, false));
|
||||
}
|
||||
|
||||
public enum Shape implements StringRepresentable {
|
||||
|
|
@ -69,6 +73,11 @@ public class ChuteBlock extends AbstractChuteBlock {
|
|||
public boolean isTransparent(BlockState state) {
|
||||
return state.getValue(SHAPE) == Shape.WINDOW;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidState getFluidState(BlockState pState) {
|
||||
return fluidState(pState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public InteractionResult onWrenched(BlockState state, UseOnContext context) {
|
||||
|
|
@ -109,7 +118,7 @@ public class ChuteBlock extends AbstractChuteBlock {
|
|||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockPlaceContext ctx) {
|
||||
BlockState state = super.getStateForPlacement(ctx);
|
||||
BlockState state = withWater(super.getStateForPlacement(ctx), ctx);
|
||||
Direction face = ctx.getClickedFace();
|
||||
if (face.getAxis()
|
||||
.isHorizontal() && !ctx.isSecondaryUseActive()) {
|
||||
|
|
@ -119,10 +128,17 @@ public class ChuteBlock extends AbstractChuteBlock {
|
|||
}
|
||||
return state;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState updateShape(BlockState state, Direction direction, BlockState above, LevelAccessor world,
|
||||
BlockPos pos, BlockPos p_196271_6_) {
|
||||
updateWater(world, state, pos);
|
||||
return super.updateShape(state, direction, above, world, pos, p_196271_6_);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(Builder<Block, BlockState> p_206840_1_) {
|
||||
super.createBlockStateDefinition(p_206840_1_.add(SHAPE, FACING));
|
||||
super.createBlockStateDefinition(p_206840_1_.add(SHAPE, FACING, WATERLOGGED));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package com.simibubi.create.content.logistics.block.chute;
|
||||
|
||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
|
|
@ -41,8 +43,11 @@ public class ChuteItem extends BlockItem {
|
|||
return InteractionResult.FAIL;
|
||||
AbstractChuteBlock block = (AbstractChuteBlock) blockState.getBlock();
|
||||
if (block.getFacing(blockState) == Direction.DOWN) {
|
||||
world.setBlockAndUpdate(correctPos, block.updateChuteState(blockState.setValue(ChuteBlock.FACING, face),
|
||||
world.getBlockState(correctPos.above()), world, correctPos));
|
||||
world.setBlockAndUpdate(correctPos,
|
||||
ProperWaterloggedBlock.withWater(world,
|
||||
block.updateChuteState(blockState.setValue(ChuteBlock.FACING, face),
|
||||
world.getBlockState(correctPos.above()), world, correctPos),
|
||||
correctPos));
|
||||
return InteractionResult.SUCCESS;
|
||||
}
|
||||
return InteractionResult.FAIL;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import com.simibubi.create.AllBlockEntityTypes;
|
|||
import com.simibubi.create.AllShapes;
|
||||
import com.simibubi.create.content.contraptions.wrench.IWrenchable;
|
||||
import com.simibubi.create.foundation.block.IBE;
|
||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||
|
||||
import net.minecraft.MethodsReturnNonnullByDefault;
|
||||
import net.minecraft.core.BlockPos;
|
||||
|
|
@ -14,11 +15,15 @@ import net.minecraft.world.InteractionHand;
|
|||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.LevelAccessor;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.StateDefinition.Builder;
|
||||
import net.minecraft.world.level.material.FluidState;
|
||||
import net.minecraft.world.level.pathfinder.PathComputationType;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.shapes.CollisionContext;
|
||||
|
|
@ -26,10 +31,33 @@ import net.minecraft.world.phys.shapes.VoxelShape;
|
|||
|
||||
@ParametersAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
public class DepotBlock extends Block implements IBE<DepotBlockEntity>, IWrenchable {
|
||||
public class DepotBlock extends Block implements IBE<DepotBlockEntity>, IWrenchable, ProperWaterloggedBlock {
|
||||
|
||||
public DepotBlock(Properties p_i48440_1_) {
|
||||
super(p_i48440_1_);
|
||||
registerDefaultState(defaultBlockState().setValue(WATERLOGGED, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(Builder<Block, BlockState> pBuilder) {
|
||||
super.createBlockStateDefinition(pBuilder.add(WATERLOGGED));
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidState getFluidState(BlockState pState) {
|
||||
return fluidState(pState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState updateShape(BlockState pState, Direction pDirection, BlockState pNeighborState,
|
||||
LevelAccessor pLevel, BlockPos pCurrentPos, BlockPos pNeighborPos) {
|
||||
updateWater(pLevel, pState, pCurrentPos);
|
||||
return pState;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockPlaceContext pContext) {
|
||||
return withWater(super.getStateForPlacement(pContext), pContext);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import com.simibubi.create.AllShapes;
|
|||
import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock;
|
||||
import com.simibubi.create.content.logistics.block.depot.EjectorBlockEntity.State;
|
||||
import com.simibubi.create.foundation.block.IBE;
|
||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||
import com.simibubi.create.foundation.networking.AllPackets;
|
||||
import com.simibubi.create.foundation.utility.VecHelper;
|
||||
|
||||
|
|
@ -21,22 +22,49 @@ import net.minecraft.world.damagesource.DamageSource;
|
|||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.LevelAccessor;
|
||||
import net.minecraft.world.level.LevelReader;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.StateDefinition.Builder;
|
||||
import net.minecraft.world.level.material.FluidState;
|
||||
import net.minecraft.world.level.pathfinder.PathComputationType;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import net.minecraft.world.phys.shapes.CollisionContext;
|
||||
import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
|
||||
public class EjectorBlock extends HorizontalKineticBlock implements IBE<EjectorBlockEntity> {
|
||||
public class EjectorBlock extends HorizontalKineticBlock implements IBE<EjectorBlockEntity>, ProperWaterloggedBlock {
|
||||
|
||||
public EjectorBlock(Properties properties) {
|
||||
super(properties);
|
||||
registerDefaultState(defaultBlockState().setValue(WATERLOGGED, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(Builder<Block, BlockState> pBuilder) {
|
||||
super.createBlockStateDefinition(pBuilder.add(WATERLOGGED));
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidState getFluidState(BlockState pState) {
|
||||
return fluidState(pState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState updateShape(BlockState pState, Direction pDirection, BlockState pNeighborState,
|
||||
LevelAccessor pLevel, BlockPos pCurrentPos, BlockPos pNeighborPos) {
|
||||
updateWater(pLevel, pState, pCurrentPos);
|
||||
return pState;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockPlaceContext pContext) {
|
||||
return withWater(super.getStateForPlacement(pContext), pContext);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import javax.annotation.Nullable;
|
|||
import com.simibubi.create.AllBlockEntityTypes;
|
||||
import com.simibubi.create.content.contraptions.wrench.IWrenchable;
|
||||
import com.simibubi.create.foundation.block.IBE;
|
||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||
import com.simibubi.create.foundation.block.render.ReducedDestroyEffects;
|
||||
import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
|
||||
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
|
||||
|
|
@ -20,6 +21,7 @@ import net.minecraft.world.item.ItemStack;
|
|||
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.LevelAccessor;
|
||||
import net.minecraft.world.level.LevelReader;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
|
|
@ -28,18 +30,21 @@ import net.minecraft.world.level.block.state.BlockState;
|
|||
import net.minecraft.world.level.block.state.StateDefinition.Builder;
|
||||
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||
import net.minecraft.world.level.block.state.properties.BooleanProperty;
|
||||
import net.minecraft.world.level.material.FluidState;
|
||||
import net.minecraft.world.level.pathfinder.PathComputationType;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.client.IBlockRenderProperties;
|
||||
|
||||
public abstract class AbstractFunnelBlock extends Block implements IBE<FunnelBlockEntity>, IWrenchable {
|
||||
public abstract class AbstractFunnelBlock extends Block
|
||||
implements IBE<FunnelBlockEntity>, IWrenchable, ProperWaterloggedBlock {
|
||||
|
||||
public static final BooleanProperty POWERED = BlockStateProperties.POWERED;
|
||||
|
||||
protected AbstractFunnelBlock(Properties p_i48377_1_) {
|
||||
super(p_i48377_1_);
|
||||
registerDefaultState(defaultBlockState().setValue(POWERED, false));
|
||||
registerDefaultState(defaultBlockState().setValue(POWERED, false)
|
||||
.setValue(WATERLOGGED, false));
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
|
|
@ -49,10 +54,22 @@ public abstract class AbstractFunnelBlock extends Block implements IBE<FunnelBlo
|
|||
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockPlaceContext context) {
|
||||
return defaultBlockState().setValue(POWERED, context.getLevel()
|
||||
.hasNeighborSignal(context.getClickedPos()));
|
||||
return withWater(defaultBlockState().setValue(POWERED, context.getLevel()
|
||||
.hasNeighborSignal(context.getClickedPos())), context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidState getFluidState(BlockState pState) {
|
||||
return fluidState(pState);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState updateShape(BlockState pState, Direction pDirection, BlockState pNeighborState,
|
||||
LevelAccessor pLevel, BlockPos pCurrentPos, BlockPos pNeighborPos) {
|
||||
updateWater(pLevel, pState, pCurrentPos);
|
||||
return pState;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPathfindable(BlockState state, BlockGetter reader, BlockPos pos, PathComputationType type) {
|
||||
return false;
|
||||
|
|
@ -60,7 +77,7 @@ public abstract class AbstractFunnelBlock extends Block implements IBE<FunnelBlo
|
|||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(Builder<Block, BlockState> builder) {
|
||||
super.createBlockStateDefinition(builder.add(POWERED));
|
||||
super.createBlockStateDefinition(builder.add(POWERED, WATERLOGGED));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import com.simibubi.create.content.contraptions.relays.belt.BeltSlope;
|
|||
import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement;
|
||||
import com.simibubi.create.content.schematics.ItemRequirement;
|
||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||
import com.simibubi.create.foundation.blockEntity.BlockEntityBehaviour;
|
||||
import com.simibubi.create.foundation.blockEntity.behaviour.belt.DirectBeltInputBehaviour;
|
||||
import com.simibubi.create.foundation.utility.Lang;
|
||||
|
|
@ -121,8 +122,9 @@ public class BeltFunnelBlock extends AbstractHorizontalFunnelBlock implements IS
|
|||
@Override
|
||||
public BlockState updateShape(BlockState state, Direction direction, BlockState neighbour, LevelAccessor world,
|
||||
BlockPos pos, BlockPos p_196271_6_) {
|
||||
updateWater(world, state, pos);
|
||||
if (!isOnValidBelt(state, world, pos)) {
|
||||
BlockState parentState = parent.getDefaultState();
|
||||
BlockState parentState = ProperWaterloggedBlock.withWater(world, parent.getDefaultState(), pos);
|
||||
if (state.getOptionalValue(POWERED)
|
||||
.orElse(false))
|
||||
parentState = parentState.setValue(POWERED, true);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import com.simibubi.create.AllBlocks;
|
|||
import com.simibubi.create.AllItems;
|
||||
import com.simibubi.create.AllShapes;
|
||||
import com.simibubi.create.foundation.advancement.AdvancementBehaviour;
|
||||
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
|
||||
import com.simibubi.create.foundation.utility.VecHelper;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
|
|
@ -156,10 +157,12 @@ public abstract class FunnelBlock extends AbstractDirectionalFunnelBlock {
|
|||
@Override
|
||||
public BlockState updateShape(BlockState state, Direction direction, BlockState p_196271_3_, LevelAccessor world,
|
||||
BlockPos pos, BlockPos p_196271_6_) {
|
||||
updateWater(world, state, pos);
|
||||
if (getFacing(state).getAxis()
|
||||
.isVertical() || direction != Direction.DOWN)
|
||||
return state;
|
||||
BlockState equivalentFunnel = getEquivalentBeltFunnel(null, null, state);
|
||||
BlockState equivalentFunnel =
|
||||
ProperWaterloggedBlock.withWater(world, getEquivalentBeltFunnel(null, null, state), pos);
|
||||
if (BeltFunnelBlock.isOnValidBelt(equivalentFunnel, world, pos))
|
||||
return equivalentFunnel.setValue(BeltFunnelBlock.SHAPE,
|
||||
BeltFunnelBlock.getShapeForPosition(world, pos, getFacing(state), state.getValue(EXTRACTING)));
|
||||
|
|
|
|||
Loading…
Reference in a new issue