Tinted Love

- apply redstone's block coloring to the controller rail
- add a little more polish to the piston pole placement helper

- textures at create:block/controller_rail_on and _off are currently unused, _analog is used for item only i think
This commit is contained in:
Zelophed 2020-11-30 12:29:50 +01:00
parent 32d8869b8a
commit a760ff8a79
34 changed files with 237 additions and 898 deletions

View file

@ -49,7 +49,7 @@ b59324f051f21d8ce1a48a08f4721a61a3c414d6 assets/create/blockstates/chute.json
1f33834c685e3243882acfe20183fe64dfa872be assets/create/blockstates/clutch.json 1f33834c685e3243882acfe20183fe64dfa872be assets/create/blockstates/clutch.json
e5e3757e99c139d67b2a70288466d8a74d818841 assets/create/blockstates/cogwheel.json e5e3757e99c139d67b2a70288466d8a74d818841 assets/create/blockstates/cogwheel.json
36f54136a7756c97f71bc6b47ef4e8e575e72879 assets/create/blockstates/content_observer.json 36f54136a7756c97f71bc6b47ef4e8e575e72879 assets/create/blockstates/content_observer.json
c309aead7e052aef770baebfb4d0e65dfd257b66 assets/create/blockstates/controller_rail.json 41b173dd97b3006478796ff356f6ac15f3dfa980 assets/create/blockstates/controller_rail.json
f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets/create/blockstates/copper_block.json f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets/create/blockstates/copper_block.json
cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets/create/blockstates/copper_casing.json cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets/create/blockstates/copper_casing.json
3355a852cdc717e257ca19b3db836068964733e3 assets/create/blockstates/copper_ore.json 3355a852cdc717e257ca19b3db836068964733e3 assets/create/blockstates/copper_ore.json
@ -138,7 +138,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_
fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json
b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json
6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json 6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json
3d97226b5e8d8f70ed08e45e78db1faf78d5e28b assets/create/blockstates/fluid_pipe.json 7335a938fa5e80060cad2ed987afa123debb3998 assets/create/blockstates/fluid_pipe.json
f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json
5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json 5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json
e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json
@ -332,7 +332,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl
d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json
92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json 92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json
61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json 61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json
8d7e653bfd9846e684a0d3725595714a19201017 assets/create/blockstates/radial_chassis.json 6fa36883e76e9e403bb429c8f86b8c0d3bba0cff assets/create/blockstates/radial_chassis.json
45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json 45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json
da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json
722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json 722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json
@ -395,16 +395,16 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
458ea82f1528fc105ae5511619a8673dbd71101f assets/create/lang/en_ud.json 458ea82f1528fc105ae5511619a8673dbd71101f assets/create/lang/en_ud.json
0b031873dee4854906c42ca74431796809529979 assets/create/lang/en_us.json a9b08f790ce95310966b32fd2fda7ff345c1aa06 assets/create/lang/en_us.json
e0edef1fd82761c99556a8f9f968817c9d00a389 assets/create/lang/unfinished/de_de.json df56d014cd57fc3671b045b4c38c56344645b67e assets/create/lang/unfinished/de_de.json
80bd81070645f36dc5a4a3355985b68aadee932c assets/create/lang/unfinished/fr_fr.json 62827b2303501f5ff8a2a6b32bb8626de3ab5c43 assets/create/lang/unfinished/fr_fr.json
74e0f3f8635be43ae96f199374d95b2e4b467c46 assets/create/lang/unfinished/it_it.json 3d4486c4c55e61714f1a9f244a911d9b7726288a assets/create/lang/unfinished/it_it.json
d2d2239b0c6a750a0aa0cb9fc6e190522202b5e7 assets/create/lang/unfinished/ja_jp.json 08b938808c76b1069b46cf071001c9f8190dfb0d assets/create/lang/unfinished/ja_jp.json
71a75e1739dea9a0d26a6c3cb07c9c1f5e3bcd00 assets/create/lang/unfinished/ko_kr.json 5e4673880e92012fc27d680a9c15d62ea08961d1 assets/create/lang/unfinished/ko_kr.json
036ace865f424c6d38330a5dda3783df6fc9feac assets/create/lang/unfinished/nl_nl.json 5b43ca6db5772d53618d3ea38f1b97f14c3b2b6d assets/create/lang/unfinished/nl_nl.json
53dddb1c29cf6739750567350c89f7ae01cda588 assets/create/lang/unfinished/pt_br.json 2355818f7e6b9176ced2fcbf741cab339c0376b7 assets/create/lang/unfinished/pt_br.json
03d1bf6e868f87fe27704acdde55e75f5101acd9 assets/create/lang/unfinished/ru_ru.json 50f6b4f0166f8cf379c27c108b6ca6d0103c4847 assets/create/lang/unfinished/ru_ru.json
72c0f7e67c59b4e3f13c348d007044d86afb7e75 assets/create/lang/unfinished/zh_cn.json ccd2ea1e73d535feb22597ea739d1caceff60944 assets/create/lang/unfinished/zh_cn.json
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json

View file

@ -1,724 +1,49 @@
{ {
"variants": { "variants": {
"backwards=false,power=0,shape=north_south": { "backwards=false,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_off" "model": "create:block/controller_rail/block_north_south"
}, },
"backwards=true,power=0,shape=north_south": { "backwards=true,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_off", "model": "create:block/controller_rail/block_north_south",
"y": 180 "y": 180
}, },
"backwards=false,power=1,shape=north_south": { "backwards=false,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog" "model": "create:block/controller_rail/block_north_south",
"y": 270
}, },
"backwards=true,power=1,shape=north_south": { "backwards=true,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog", "model": "create:block/controller_rail/block_north_south",
"y": 90
},
"backwards=false,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north",
"y": 90
},
"backwards=true,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south",
"y": 270
},
"backwards=false,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north",
"y": 270
},
"backwards=true,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south",
"y": 90
},
"backwards=false,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north"
},
"backwards=true,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south",
"y": 180 "y": 180
}, },
"backwards=false,power=2,shape=north_south": { "backwards=false,shape=ascending_south": {
"model": "create:block/controller_rail/block_north_south_analog" "model": "create:block/controller_rail/block_ascending_north",
},
"backwards=true,power=2,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180 "y": 180
}, },
"backwards=false,power=3,shape=north_south": { "backwards=true,shape=ascending_south": {
"model": "create:block/controller_rail/block_north_south_analog" "model": "create:block/controller_rail/block_ascending_south"
},
"backwards=true,power=3,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=4,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=4,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=5,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=5,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=6,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=6,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=7,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=7,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=8,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=8,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=9,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=9,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=10,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=10,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=11,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=11,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=12,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=12,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=13,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=13,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=14,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog"
},
"backwards=true,power=14,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 180
},
"backwards=false,power=15,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_on"
},
"backwards=true,power=15,shape=north_south": {
"model": "create:block/controller_rail/block_north_south_on",
"y": 180
},
"backwards=false,power=0,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_off",
"y": 270
},
"backwards=true,power=0,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_off",
"y": 90
},
"backwards=false,power=1,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=1,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=2,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=2,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=3,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=3,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=4,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=4,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=5,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=5,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=6,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=6,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=7,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=7,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=8,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=8,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=9,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=9,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=10,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=10,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=11,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=11,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=12,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=12,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=13,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=13,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=14,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 270
},
"backwards=true,power=14,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_analog",
"y": 90
},
"backwards=false,power=15,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_on",
"y": 270
},
"backwards=true,power=15,shape=east_west": {
"model": "create:block/controller_rail/block_north_south_on",
"y": 90
},
"backwards=false,power=0,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_off",
"y": 90
},
"backwards=true,power=0,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_off",
"y": 270
},
"backwards=false,power=1,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=1,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=2,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=2,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=3,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=3,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=4,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=4,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=5,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=5,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=6,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=6,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=7,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=7,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=8,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=8,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=9,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=9,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=10,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=10,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=11,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=11,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=12,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=12,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=13,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=13,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=14,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 90
},
"backwards=true,power=14,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 270
},
"backwards=false,power=15,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_north_on",
"y": 90
},
"backwards=true,power=15,shape=ascending_east": {
"model": "create:block/controller_rail/block_ascending_south_on",
"y": 270
},
"backwards=false,power=0,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_off",
"y": 270
},
"backwards=true,power=0,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_off",
"y": 90
},
"backwards=false,power=1,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=1,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=2,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=2,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=3,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=3,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=4,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=4,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=5,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=5,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=6,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=6,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=7,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=7,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=8,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=8,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=9,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=9,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=10,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=10,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=11,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=11,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=12,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=12,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=13,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=13,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=14,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 270
},
"backwards=true,power=14,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 90
},
"backwards=false,power=15,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_north_on",
"y": 270
},
"backwards=true,power=15,shape=ascending_west": {
"model": "create:block/controller_rail/block_ascending_south_on",
"y": 90
},
"backwards=false,power=0,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_off"
},
"backwards=true,power=0,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_off",
"y": 180
},
"backwards=false,power=1,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=1,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=2,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=2,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=3,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=3,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=4,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=4,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=5,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=5,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=6,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=6,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=7,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=7,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=8,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=8,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=9,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=9,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=10,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=10,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=11,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=11,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=12,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=12,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=13,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=13,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=14,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_analog"
},
"backwards=true,power=14,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_analog",
"y": 180
},
"backwards=false,power=15,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_north_on"
},
"backwards=true,power=15,shape=ascending_north": {
"model": "create:block/controller_rail/block_ascending_south_on",
"y": 180
},
"backwards=false,power=0,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_off",
"y": 180
},
"backwards=true,power=0,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_off"
},
"backwards=false,power=1,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=1,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=2,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=2,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=3,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=3,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=4,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=4,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=5,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=5,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=6,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=6,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=7,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=7,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=8,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=8,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=9,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=9,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=10,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=10,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=11,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=11,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=12,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=12,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=13,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=13,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=14,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_analog",
"y": 180
},
"backwards=true,power=14,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_analog"
},
"backwards=false,power=15,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_north_on",
"y": 180
},
"backwards=true,power=15,shape=ascending_south": {
"model": "create:block/controller_rail/block_ascending_south_on"
} }
} }
} }

View file

@ -722,6 +722,7 @@
"create.gui.goggles.generator_stats": "Generator Stats:", "create.gui.goggles.generator_stats": "Generator Stats:",
"create.gui.goggles.kinetic_stats": "Kinetic Stats:", "create.gui.goggles.kinetic_stats": "Kinetic Stats:",
"create.gui.goggles.at_current_speed": "at current speed", "create.gui.goggles.at_current_speed": "at current speed",
"create.gui.goggles.pole_length": "Pole Length:",
"create.gui.gauge.info_header": "Gauge Information:", "create.gui.gauge.info_header": "Gauge Information:",
"create.gui.speedometer.title": "Rotation Speed", "create.gui.speedometer.title": "Rotation Speed",
"create.gui.stressometer.title": "Network Stress", "create.gui.stressometer.title": "Network Stress",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 1051", "_": "Missing Localizations: 1052",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "UNLOCALIZED: Generator Stats:", "create.gui.goggles.generator_stats": "UNLOCALIZED: Generator Stats:",
"create.gui.goggles.kinetic_stats": "UNLOCALIZED: Kinetic Stats:", "create.gui.goggles.kinetic_stats": "UNLOCALIZED: Kinetic Stats:",
"create.gui.goggles.at_current_speed": "UNLOCALIZED: at current speed", "create.gui.goggles.at_current_speed": "UNLOCALIZED: at current speed",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "UNLOCALIZED: Gauge Information:", "create.gui.gauge.info_header": "UNLOCALIZED: Gauge Information:",
"create.gui.speedometer.title": "UNLOCALIZED: Rotation Speed", "create.gui.speedometer.title": "UNLOCALIZED: Rotation Speed",
"create.gui.stressometer.title": "UNLOCALIZED: Network Stress", "create.gui.stressometer.title": "UNLOCALIZED: Network Stress",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 681", "_": "Missing Localizations: 682",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "Statistiques du générateur:", "create.gui.goggles.generator_stats": "Statistiques du générateur:",
"create.gui.goggles.kinetic_stats": "Statistiques cinétiques:", "create.gui.goggles.kinetic_stats": "Statistiques cinétiques:",
"create.gui.goggles.at_current_speed": "À la vitesse actuelle", "create.gui.goggles.at_current_speed": "À la vitesse actuelle",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "Informations sur la jauge:", "create.gui.gauge.info_header": "Informations sur la jauge:",
"create.gui.speedometer.title": "Vitesse de rotation", "create.gui.speedometer.title": "Vitesse de rotation",
"create.gui.stressometer.title": "Stress du réseau", "create.gui.stressometer.title": "Stress du réseau",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 665", "_": "Missing Localizations: 666",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "Statistiche del Generatore:", "create.gui.goggles.generator_stats": "Statistiche del Generatore:",
"create.gui.goggles.kinetic_stats": "Statistiche Cinetiche:", "create.gui.goggles.kinetic_stats": "Statistiche Cinetiche:",
"create.gui.goggles.at_current_speed": "Alla velocità Attuale", "create.gui.goggles.at_current_speed": "Alla velocità Attuale",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "Informazioni sul Calibro:", "create.gui.gauge.info_header": "Informazioni sul Calibro:",
"create.gui.speedometer.title": "Velocità di Rotazione", "create.gui.speedometer.title": "Velocità di Rotazione",
"create.gui.stressometer.title": "Stress della Rete", "create.gui.stressometer.title": "Stress della Rete",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 664", "_": "Missing Localizations: 665",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "ジェネレータの統計:", "create.gui.goggles.generator_stats": "ジェネレータの統計:",
"create.gui.goggles.kinetic_stats": "動力の統計:", "create.gui.goggles.kinetic_stats": "動力の統計:",
"create.gui.goggles.at_current_speed": "現在の速度", "create.gui.goggles.at_current_speed": "現在の速度",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "計器の情報:", "create.gui.gauge.info_header": "計器の情報:",
"create.gui.speedometer.title": "回転速度", "create.gui.speedometer.title": "回転速度",
"create.gui.stressometer.title": "ネットワークの応力", "create.gui.stressometer.title": "ネットワークの応力",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 665", "_": "Missing Localizations: 666",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "발전 상태:", "create.gui.goggles.generator_stats": "발전 상태:",
"create.gui.goggles.kinetic_stats": "가동 상태:", "create.gui.goggles.kinetic_stats": "가동 상태:",
"create.gui.goggles.at_current_speed": "현재 속도", "create.gui.goggles.at_current_speed": "현재 속도",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "게이지 정보:", "create.gui.gauge.info_header": "게이지 정보:",
"create.gui.speedometer.title": "회전 속도", "create.gui.speedometer.title": "회전 속도",
"create.gui.stressometer.title": "네트워크 부하", "create.gui.stressometer.title": "네트워크 부하",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 992", "_": "Missing Localizations: 993",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "UNLOCALIZED: Generator Stats:", "create.gui.goggles.generator_stats": "UNLOCALIZED: Generator Stats:",
"create.gui.goggles.kinetic_stats": "UNLOCALIZED: Kinetic Stats:", "create.gui.goggles.kinetic_stats": "UNLOCALIZED: Kinetic Stats:",
"create.gui.goggles.at_current_speed": "UNLOCALIZED: at current speed", "create.gui.goggles.at_current_speed": "UNLOCALIZED: at current speed",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "UNLOCALIZED: Gauge Information:", "create.gui.gauge.info_header": "UNLOCALIZED: Gauge Information:",
"create.gui.speedometer.title": "UNLOCALIZED: Rotation Speed", "create.gui.speedometer.title": "UNLOCALIZED: Rotation Speed",
"create.gui.stressometer.title": "UNLOCALIZED: Network Stress", "create.gui.stressometer.title": "UNLOCALIZED: Network Stress",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 1058", "_": "Missing Localizations: 1059",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "UNLOCALIZED: Generator Stats:", "create.gui.goggles.generator_stats": "UNLOCALIZED: Generator Stats:",
"create.gui.goggles.kinetic_stats": "UNLOCALIZED: Kinetic Stats:", "create.gui.goggles.kinetic_stats": "UNLOCALIZED: Kinetic Stats:",
"create.gui.goggles.at_current_speed": "UNLOCALIZED: at current speed", "create.gui.goggles.at_current_speed": "UNLOCALIZED: at current speed",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "UNLOCALIZED: Gauge Information:", "create.gui.gauge.info_header": "UNLOCALIZED: Gauge Information:",
"create.gui.speedometer.title": "UNLOCALIZED: Rotation Speed", "create.gui.speedometer.title": "UNLOCALIZED: Rotation Speed",
"create.gui.stressometer.title": "UNLOCALIZED: Network Stress", "create.gui.stressometer.title": "UNLOCALIZED: Network Stress",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 334", "_": "Missing Localizations: 335",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "Статистика генератора:", "create.gui.goggles.generator_stats": "Статистика генератора:",
"create.gui.goggles.kinetic_stats": "Кинетическая статистика:", "create.gui.goggles.kinetic_stats": "Кинетическая статистика:",
"create.gui.goggles.at_current_speed": "На текущей скорости", "create.gui.goggles.at_current_speed": "На текущей скорости",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "Калибровочная информация:", "create.gui.gauge.info_header": "Калибровочная информация:",
"create.gui.speedometer.title": "Скорость вращения", "create.gui.speedometer.title": "Скорость вращения",
"create.gui.stressometer.title": "Сетевой момент", "create.gui.stressometer.title": "Сетевой момент",

View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 347", "_": "Missing Localizations: 348",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -723,6 +723,7 @@
"create.gui.goggles.generator_stats": "产能器状态:", "create.gui.goggles.generator_stats": "产能器状态:",
"create.gui.goggles.kinetic_stats": "动能状态:", "create.gui.goggles.kinetic_stats": "动能状态:",
"create.gui.goggles.at_current_speed": "当前速度应力值", "create.gui.goggles.at_current_speed": "当前速度应力值",
"create.gui.goggles.pole_length": "UNLOCALIZED: Pole Length:",
"create.gui.gauge.info_header": "仪表信息:", "create.gui.gauge.info_header": "仪表信息:",
"create.gui.speedometer.title": "旋转速度", "create.gui.speedometer.title": "旋转速度",
"create.gui.stressometer.title": "网络应力", "create.gui.stressometer.title": "网络应力",

View file

@ -1,29 +1,10 @@
package com.simibubi.create; package com.simibubi.create;
import static com.simibubi.create.AllMovementBehaviours.addMovementBehaviour;
import static com.simibubi.create.AllTags.tagBlockAndItem;
import static com.simibubi.create.content.AllSections.SCHEMATICS;
import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock;
import static com.simibubi.create.foundation.data.BlockStateGen.oxidizedBlockstate;
import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures;
import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
import static com.simibubi.create.foundation.data.ModelGen.oxidizedItemModel;
import com.simibubi.create.AllTags.AllBlockTags; import com.simibubi.create.AllTags.AllBlockTags;
import com.simibubi.create.AllTags.AllItemTags; import com.simibubi.create.AllTags.AllItemTags;
import com.simibubi.create.content.AllSections; import com.simibubi.create.content.AllSections;
import com.simibubi.create.content.contraptions.base.CasingBlock; import com.simibubi.create.content.contraptions.base.CasingBlock;
import com.simibubi.create.content.contraptions.components.actors.DrillBlock; import com.simibubi.create.content.contraptions.components.actors.*;
import com.simibubi.create.content.contraptions.components.actors.DrillMovementBehaviour;
import com.simibubi.create.content.contraptions.components.actors.HarvesterBlock;
import com.simibubi.create.content.contraptions.components.actors.HarvesterMovementBehaviour;
import com.simibubi.create.content.contraptions.components.actors.PloughBlock;
import com.simibubi.create.content.contraptions.components.actors.PloughMovementBehaviour;
import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceBlock;
import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceMovement;
import com.simibubi.create.content.contraptions.components.actors.SawMovementBehaviour;
import com.simibubi.create.content.contraptions.components.actors.SeatBlock;
import com.simibubi.create.content.contraptions.components.actors.SeatMovementBehaviour;
import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlock; import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlock;
import com.simibubi.create.content.contraptions.components.crafter.CrafterCTBehaviour; import com.simibubi.create.content.contraptions.components.crafter.CrafterCTBehaviour;
import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock;
@ -46,11 +27,7 @@ import com.simibubi.create.content.contraptions.components.motor.CreativeMotorGe
import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlock; import com.simibubi.create.content.contraptions.components.press.MechanicalPressBlock;
import com.simibubi.create.content.contraptions.components.saw.SawBlock; import com.simibubi.create.content.contraptions.components.saw.SawBlock;
import com.simibubi.create.content.contraptions.components.saw.SawGenerator; import com.simibubi.create.content.contraptions.components.saw.SawGenerator;
import com.simibubi.create.content.contraptions.components.structureMovement.bearing.StabilizedBearingMovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.bearing.*;
import com.simibubi.create.content.contraptions.components.structureMovement.bearing.ClockworkBearingBlock;
import com.simibubi.create.content.contraptions.components.structureMovement.bearing.MechanicalBearingBlock;
import com.simibubi.create.content.contraptions.components.structureMovement.bearing.SailBlock;
import com.simibubi.create.content.contraptions.components.structureMovement.bearing.WindmillBearingBlock;
import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock;
import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock.ChassisCTBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.LinearChassisBlock.ChassisCTBehaviour;
import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock;
@ -70,15 +47,7 @@ import com.simibubi.create.content.contraptions.fluids.PumpBlock;
import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyBlock; import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyBlock;
import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainBlock; import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainBlock;
import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlock; import com.simibubi.create.content.contraptions.fluids.actors.SpoutBlock;
import com.simibubi.create.content.contraptions.fluids.pipes.BracketBlock; import com.simibubi.create.content.contraptions.fluids.pipes.*;
import com.simibubi.create.content.contraptions.fluids.pipes.BracketBlockItem;
import com.simibubi.create.content.contraptions.fluids.pipes.BracketGenerator;
import com.simibubi.create.content.contraptions.fluids.pipes.EncasedPipeBlock;
import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
import com.simibubi.create.content.contraptions.fluids.pipes.FluidValveBlock;
import com.simibubi.create.content.contraptions.fluids.pipes.GlassFluidPipeBlock;
import com.simibubi.create.content.contraptions.fluids.pipes.SmartFluidPipeBlock;
import com.simibubi.create.content.contraptions.fluids.pipes.SmartFluidPipeGenerator;
import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock; import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock;
import com.simibubi.create.content.contraptions.fluids.tank.FluidTankGenerator; import com.simibubi.create.content.contraptions.fluids.tank.FluidTankGenerator;
import com.simibubi.create.content.contraptions.fluids.tank.FluidTankItem; import com.simibubi.create.content.contraptions.fluids.tank.FluidTankItem;
@ -100,12 +69,7 @@ import com.simibubi.create.content.contraptions.relays.elementary.BracketedKinet
import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock;
import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem; import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem;
import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
import com.simibubi.create.content.contraptions.relays.encased.AdjustablePulleyBlock; import com.simibubi.create.content.contraptions.relays.encased.*;
import com.simibubi.create.content.contraptions.relays.encased.ClutchBlock;
import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock;
import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltGenerator;
import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftBlock;
import com.simibubi.create.content.contraptions.relays.encased.GearshiftBlock;
import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock; import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock;
import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator; import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator;
import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock; import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock;
@ -116,49 +80,22 @@ import com.simibubi.create.content.logistics.block.chute.ChuteBlock;
import com.simibubi.create.content.logistics.block.chute.ChuteGenerator; import com.simibubi.create.content.logistics.block.chute.ChuteGenerator;
import com.simibubi.create.content.logistics.block.chute.ChuteItem; import com.simibubi.create.content.logistics.block.chute.ChuteItem;
import com.simibubi.create.content.logistics.block.depot.DepotBlock; import com.simibubi.create.content.logistics.block.depot.DepotBlock;
import com.simibubi.create.content.logistics.block.diodes.AbstractDiodeGenerator; import com.simibubi.create.content.logistics.block.diodes.*;
import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock; import com.simibubi.create.content.logistics.block.funnel.*;
import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterGenerator;
import com.simibubi.create.content.logistics.block.diodes.PoweredLatchBlock;
import com.simibubi.create.content.logistics.block.diodes.PoweredLatchGenerator;
import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterBlock;
import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterGenerator;
import com.simibubi.create.content.logistics.block.diodes.ToggleLatchBlock;
import com.simibubi.create.content.logistics.block.diodes.ToggleLatchGenerator;
import com.simibubi.create.content.logistics.block.funnel.AndesiteBeltFunnelBlock;
import com.simibubi.create.content.logistics.block.funnel.AndesiteFunnelBlock;
import com.simibubi.create.content.logistics.block.funnel.BeltFunnelGenerator;
import com.simibubi.create.content.logistics.block.funnel.BrassBeltFunnelBlock;
import com.simibubi.create.content.logistics.block.funnel.BrassFunnelBlock;
import com.simibubi.create.content.logistics.block.funnel.FunnelMovementBehaviour;
import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock;
import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlock; import com.simibubi.create.content.logistics.block.inventories.CreativeCrateBlock;
import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlock; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmBlock;
import com.simibubi.create.content.logistics.block.mechanicalArm.ArmItem; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmItem;
import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlock; import com.simibubi.create.content.logistics.block.redstone.*;
import com.simibubi.create.content.logistics.block.redstone.ContactMovementBehaviour;
import com.simibubi.create.content.logistics.block.redstone.ContentObserverBlock;
import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock;
import com.simibubi.create.content.logistics.block.redstone.NixieTubeGenerator;
import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock;
import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock;
import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkGenerator;
import com.simibubi.create.content.logistics.block.redstone.StockpileSwitchBlock;
import com.simibubi.create.content.palettes.MetalBlock; import com.simibubi.create.content.palettes.MetalBlock;
import com.simibubi.create.content.schematics.block.SchematicTableBlock; import com.simibubi.create.content.schematics.block.SchematicTableBlock;
import com.simibubi.create.content.schematics.block.SchematicannonBlock; import com.simibubi.create.content.schematics.block.SchematicannonBlock;
import com.simibubi.create.foundation.config.StressConfigDefaults; import com.simibubi.create.foundation.config.StressConfigDefaults;
import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.*;
import com.simibubi.create.foundation.data.BlockStateGen;
import com.simibubi.create.foundation.data.BuilderTransformers;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.data.ModelGen;
import com.simibubi.create.foundation.data.SharedProperties;
import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.utility.DyeHelper; import com.simibubi.create.foundation.utility.DyeHelper;
import com.simibubi.create.foundation.worldgen.OxidizingBlock; import com.simibubi.create.foundation.worldgen.OxidizingBlock;
import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.entry.BlockEntry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.SoundType; import net.minecraft.block.SoundType;
@ -175,6 +112,15 @@ import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.common.Tags; import net.minecraftforge.common.Tags;
import net.minecraftforge.common.ToolType; import net.minecraftforge.common.ToolType;
import static com.simibubi.create.AllMovementBehaviours.addMovementBehaviour;
import static com.simibubi.create.AllTags.tagBlockAndItem;
import static com.simibubi.create.content.AllSections.SCHEMATICS;
import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock;
import static com.simibubi.create.foundation.data.BlockStateGen.oxidizedBlockstate;
import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures;
import static com.simibubi.create.foundation.data.ModelGen.customItemModel;
import static com.simibubi.create.foundation.data.ModelGen.oxidizedItemModel;
public class AllBlocks { public class AllBlocks {
private static final CreateRegistrate REGISTRATE = Create.registrate() private static final CreateRegistrate REGISTRATE = Create.registrate()
@ -741,10 +687,13 @@ public class AllBlocks {
.initialProperties(() -> Blocks.POWERED_RAIL) .initialProperties(() -> Blocks.POWERED_RAIL)
.blockstate(BlockStateGen.controllerRail()) .blockstate(BlockStateGen.controllerRail())
.addLayer(() -> RenderType::getCutoutMipped) .addLayer(() -> RenderType::getCutoutMipped)
.onRegister(CreateRegistrate.blockColors(() -> AllColorHandlers::getRedstonePower))
//.onRegister(CreateRegistrate.blockColorProperty(ControllerRailBlock.POWER))
.tag(BlockTags.RAILS) .tag(BlockTags.RAILS)
.item() .item()
.model((c, p) -> p.generated(c, Create.asResource("block/controller_rail_analog"))) .model((c, p) -> p.generated(c, Create.asResource("block/controller_rail_analog")))
.build().register(); .build()
.register();
public static final BlockEntry<MinecartAnchorBlock> MINECART_ANCHOR = public static final BlockEntry<MinecartAnchorBlock> MINECART_ANCHOR =
REGISTRATE.block("minecart_anchor", MinecartAnchorBlock::new) REGISTRATE.block("minecart_anchor", MinecartAnchorBlock::new)

View file

@ -1,30 +1,31 @@
package com.simibubi.create; package com.simibubi.create;
import java.util.HashMap;
import java.util.Map;
import com.simibubi.create.foundation.block.IBlockVertexColor; import com.simibubi.create.foundation.block.IBlockVertexColor;
import com.simibubi.create.foundation.block.render.ColoredVertexModel; import com.simibubi.create.foundation.block.render.ColoredVertexModel;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.RedstoneWireBlock;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.color.BlockColors; import net.minecraft.client.renderer.color.BlockColors;
import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.client.renderer.color.ItemColors; import net.minecraft.client.renderer.color.ItemColors;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.util.IItemProvider; import net.minecraft.util.IItemProvider;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.GrassColors; import net.minecraft.world.GrassColors;
import net.minecraft.world.ILightReader; import net.minecraft.world.ILightReader;
import net.minecraft.world.biome.BiomeColors; import net.minecraft.world.biome.BiomeColors;
import java.util.HashMap;
import java.util.Map;
public class AllColorHandlers { public class AllColorHandlers {
private Map<Block, IBlockVertexColor> coloredVertexBlocks = new HashMap<>(); private final Map<Block, IBlockVertexColor> coloredVertexBlocks = new HashMap<>();
private Map<Block, IBlockColor> coloredBlocks = new HashMap<>(); private final Map<Block, IBlockColor> coloredBlocks = new HashMap<>();
private Map<IItemProvider, IItemColor> coloredItems = new HashMap<>(); private final Map<IItemProvider, IItemColor> coloredItems = new HashMap<>();
// //
@ -38,6 +39,12 @@ public class AllColorHandlers {
return new ItemColor((stack, layer) -> GrassColors.get(0.5D, 1.0D)); return new ItemColor((stack, layer) -> GrassColors.get(0.5D, 1.0D));
} }
public static IBlockColor getRedstonePower() {
return new BlockColor(
(state, world, pos, layer) -> RedstoneWireBlock.colorMultiplier(pos != null && world != null ? state.get(BlockStateProperties.POWER_0_15) : 0)
);
}
// //
public void register(Block block, IBlockColor color) { public void register(Block block, IBlockColor color) {

View file

@ -120,7 +120,7 @@ public class PistonExtensionPoleBlock extends ProperDirectionalBlock implements
if (world.isRemote) if (world.isRemote)
return ActionResultType.SUCCESS; return ActionResultType.SUCCESS;
world.setBlockState(newPos, AllBlocks.PISTON_EXTENSION_POLE.getDefaultState().with(FACING, offset.getFirst())); world.setBlockState(newPos, AllBlocks.PISTON_EXTENSION_POLE.getDefaultState().with(FACING, state.get(FACING)));
if (!player.isCreative()) if (!player.isCreative())
heldItem.shrink(1); heldItem.shrink(1);

View file

@ -32,7 +32,10 @@ public class PistonPolePlacementHelper {
BlockRayTraceResult ray = (BlockRayTraceResult) mc.objectMouseOver; BlockRayTraceResult ray = (BlockRayTraceResult) mc.objectMouseOver;
if (!isHoldingPole(mc.player)) if (mc.player != null && !isHoldingPole(mc.player))
return;
if (mc.player.isSneaking())
return; return;
BlockPos pos = ray.getPos(); BlockPos pos = ray.getPos();

View file

@ -34,11 +34,20 @@ import static net.minecraft.state.properties.RailShape.*;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public class ControllerRailBlock extends AbstractRailBlock implements IWrenchable { public class ControllerRailBlock extends AbstractRailBlock implements IWrenchable {
public static final EnumProperty<RailShape> SHAPE = BlockStateProperties.RAIL_SHAPE_STRAIGHT; public static final EnumProperty<RailShape> SHAPE = BlockStateProperties.RAIL_SHAPE_STRAIGHT;
public static final IntegerProperty POWER = BlockStateProperties.POWER_0_15;
public static final BooleanProperty BACKWARDS = BooleanProperty.create("backwards"); public static final BooleanProperty BACKWARDS = BooleanProperty.create("backwards");
/*
* SHAPE | BACKWARDS | FACING
* N/S FALSE North
* N/S TRUE South
* E/W FALSE West
* E/W TRUE East
* ASC_X FALSE X
* ASC_X TRUE X.opposite()
* */
public static final IntegerProperty POWER = BlockStateProperties.POWER_0_15;
public ControllerRailBlock(Properties p_i48444_2_) { public ControllerRailBlock(Properties properties) {
super(true, p_i48444_2_); super(true, properties);
this.setDefaultState(this.stateContainer.getBaseState().with(POWER, 0).with(BACKWARDS, false).with(SHAPE, NORTH_SOUTH)); this.setDefaultState(this.stateContainer.getBaseState().with(POWER, 0).with(BACKWARDS, false).with(SHAPE, NORTH_SOUTH));
} }

View file

@ -1,10 +1,5 @@
package com.simibubi.create.content.contraptions.goggles; package com.simibubi.create.content.contraptions.goggles;
import static com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation.spacing;
import java.util.ArrayList;
import java.util.List;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems; import com.simibubi.create.AllItems;
@ -14,7 +9,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.pis
import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.gui.GuiGameElement;
import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Iterate;
import com.simibubi.create.foundation.utility.Lang;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
@ -33,6 +28,11 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import java.util.ArrayList;
import java.util.List;
import static com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation.spacing;
@EventBusSubscriber(value = Dist.CLIENT) @EventBusSubscriber(value = Dist.CLIENT)
public class GoggleOverlayRenderer { public class GoggleOverlayRenderer {
@ -100,7 +100,7 @@ public class GoggleOverlayRenderer {
if (!tooltip.isEmpty()) if (!tooltip.isEmpty())
tooltip.add(""); tooltip.add("");
tooltip.add(spacing + "Pole length: " + poles); tooltip.add(spacing + Lang.translate("gui.goggles.pole_length") + " " + poles);
} }
if (tooltip.isEmpty()) if (tooltip.isEmpty())

View file

@ -1,17 +1,6 @@
package com.simibubi.create.foundation.data; package com.simibubi.create.foundation.data;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.function.BiFunction;
import java.util.function.Function;
import com.simibubi.create.content.contraptions.components.tracks.ControllerRailBlock;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock;
@ -19,6 +8,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.cha
import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.RadialChassisBlock;
import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssembleRailType; import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssembleRailType;
import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock; import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlock;
import com.simibubi.create.content.contraptions.components.tracks.ControllerRailBlock;
import com.simibubi.create.content.contraptions.components.tracks.ReinforcedRailBlock; import com.simibubi.create.content.contraptions.components.tracks.ReinforcedRailBlock;
import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock; import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock;
import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
@ -31,7 +21,6 @@ import com.tterrag.registrate.providers.DataGenContext;
import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullBiConsumer;
import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.state.BooleanProperty; import net.minecraft.state.BooleanProperty;
@ -44,6 +33,11 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder;
import org.apache.commons.lang3.tuple.Pair;
import java.util.*;
import java.util.function.BiFunction;
import java.util.function.Function;
public class BlockStateGen { public class BlockStateGen {
@ -437,10 +431,10 @@ public class BlockStateGen {
public static NonNullBiConsumer<DataGenContext<Block, ControllerRailBlock>, RegistrateBlockstateProvider> controllerRail() { public static NonNullBiConsumer<DataGenContext<Block, ControllerRailBlock>, RegistrateBlockstateProvider> controllerRail() {
return (c, p) -> p.getVariantBuilder(c.get()) return (c, p) -> p.getVariantBuilder(c.get())
.forAllStates(state -> { .forAllStatesExcept(state -> {
int power = state.get(ControllerRailBlock.POWER); //int power = state.get(ControllerRailBlock.POWER);
boolean backwards = state.get(ControllerRailBlock.BACKWARDS); boolean backwards = state.get(ControllerRailBlock.BACKWARDS);
String powerStr = power == 0 ? "off" : (power == 15 ? "on" : "analog"); //String powerStr = power == 0 ? "off" : (power == 15 ? "on" : "analog");
RailShape shape = state.get(ControllerRailBlock.SHAPE); RailShape shape = state.get(ControllerRailBlock.SHAPE);
String shapeName = shape.isAscending() ? RailShape.ASCENDING_NORTH.getName() : RailShape.NORTH_SOUTH.getName(); String shapeName = shape.isAscending() ? RailShape.ASCENDING_NORTH.getName() : RailShape.NORTH_SOUTH.getName();
int rotation = 0; int rotation = 0;
@ -472,10 +466,9 @@ public class BlockStateGen {
return ConfiguredModel.builder() return ConfiguredModel.builder()
.modelFile(p.models() .modelFile(p.models()
.getExistingFile(p.modLoc( .getExistingFile(p.modLoc(
"block/" + c.getName() + "/block_" + shapeName + "_" + "block/" + c.getName() + "/block_" + shapeName)))
powerStr)))
.rotationY(rotation % 360) .rotationY(rotation % 360)
.build(); .build();
}); }, ControllerRailBlock.POWER);
} }
} }

View file

@ -170,6 +170,7 @@
"create.gui.goggles.generator_stats": "Generator Stats:", "create.gui.goggles.generator_stats": "Generator Stats:",
"create.gui.goggles.kinetic_stats": "Kinetic Stats:", "create.gui.goggles.kinetic_stats": "Kinetic Stats:",
"create.gui.goggles.at_current_speed": "at current speed", "create.gui.goggles.at_current_speed": "at current speed",
"create.gui.goggles.pole_length": "Pole Length:",
"create.gui.gauge.info_header": "Gauge Information:", "create.gui.gauge.info_header": "Gauge Information:",
"create.gui.speedometer.title": "Rotation Speed", "create.gui.speedometer.title": "Rotation Speed",

View file

@ -0,0 +1,36 @@
{
"ambientocclusion": false,
"textures": {
"particle": "#rail",
"rail": "create:block/controller_rail_base",
"tint": "create:block/controller_rail_tint"
},
"elements": [
{ "from": [ 0, 9, 0 ],
"to": [ 16, 9, 16 ],
"rotation": {
"origin": [ 8, 9, 8 ],
"axis": "x",
"angle": 45,
"rescale": true
},
"faces": {
"down": { "uv": [ 0, 16, 16, 0 ], "texture": "#rail" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rail" }
}
},
{ "from": [ 0, 9, 0 ],
"to": [ 16, 9, 16 ],
"rotation": {
"origin": [ 8, 9, 8 ],
"axis": "x",
"angle": 45,
"rescale": true
},
"faces": {
"down": { "uv": [ 0, 16, 16, 0 ], "texture": "#tint", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#tint", "tintindex": 0 }
}
}
]
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/template_rail_raised_ne",
"textures": {
"rail": "create:block/controller_rail_analog"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/template_rail_raised_ne",
"textures": {
"rail": "create:block/controller_rail_off"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/template_rail_raised_ne",
"textures": {
"rail": "create:block/controller_rail_on"
}
}

View file

@ -0,0 +1,36 @@
{
"ambientocclusion": false,
"textures": {
"particle": "#rail",
"rail": "create:block/controller_rail_base",
"tint": "create:block/controller_rail_tint"
},
"elements": [
{ "from": [ 0, 9, 0 ],
"to": [ 16, 9, 16 ],
"rotation": {
"origin": [ 8, 9, 8 ],
"axis": "x",
"angle": -45,
"rescale": true
},
"faces": {
"down": { "uv": [ 0, 16, 16, 0 ], "texture": "#rail" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rail" }
}
},
{ "from": [ 0, 9, 0 ],
"to": [ 16, 9, 16 ],
"rotation": {
"origin": [ 8, 9, 8 ],
"axis": "x",
"angle": -45,
"rescale": true
},
"faces": {
"down": { "uv": [ 0, 16, 16, 0 ], "texture": "#tint", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#tint", "tintindex": 0 }
}
}
]
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/template_rail_raised_sw",
"textures": {
"rail": "create:block/controller_rail_analog"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/template_rail_raised_sw",
"textures": {
"rail": "create:block/controller_rail_off"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/template_rail_raised_sw",
"textures": {
"rail": "create:block/controller_rail_on"
}
}

View file

@ -0,0 +1,24 @@
{
"ambientocclusion": false,
"textures": {
"particle": "#rail",
"rail": "create:block/controller_rail_base",
"tint": "create:block/controller_rail_tint"
},
"elements": [
{ "from": [ 0, 1, 0 ],
"to": [ 16, 1, 16 ],
"faces": {
"down": { "uv": [ 0, 16, 16, 0 ], "texture": "#rail" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#rail" }
}
},
{ "from": [ 0, 1, 0 ],
"to": [ 16, 1, 16 ],
"faces": {
"down": { "uv": [ 0, 16, 16, 0 ], "texture": "#tint", "tintindex": 0 },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#tint", "tintindex": 0 }
}
}
]
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/rail_flat",
"textures": {
"rail": "create:block/controller_rail_analog"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/rail_flat",
"textures": {
"rail": "create:block/controller_rail_off"
}
}

View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/rail_flat",
"textures": {
"rail": "create:block/controller_rail_on"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 985 B