diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 7c97328ec..044091c4d 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -2,8 +2,6 @@ f0d6baaabda94151134f569246d61a6e710c35a9 assets/create/blockstates/acacia_window_pane.json 6b70306397316d6ebfa1cb07f2308d5c7fce83e0 assets/create/blockstates/adjustable_chain_gearshift.json 55d57354040f4b5cefa2a9bfaf1cb777350fd699 assets/create/blockstates/adjustable_crate.json -79c50afcea3a360783a5b3c73de9823511e9aed9 assets/create/blockstates/adjustable_pulse_repeater.json -1d730df54c9eae94063e37396d224fb3c87517e0 assets/create/blockstates/adjustable_repeater.json 9dd79bf5430f674e7d3e3fc7d59edee3d66e241e assets/create/blockstates/analog_lever.json dd468657a73fc2ad6e1ac08ace2996b6997d33e0 assets/create/blockstates/andesite_belt_funnel.json 585481e97c5066af63ea12fa5dd658798844d64c assets/create/blockstates/andesite_bricks.json @@ -362,7 +360,8 @@ ad721e3911f48c61c3639edac1896680a31451ff assets/create/blockstates/polished_weat 8296d43d5f1c2113012d127038fb319af83aaee4 assets/create/blockstates/powered_latch.json e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggle_latch.json 3a739f9d4276828d83f2d2750bf3227c87bcd438 assets/create/blockstates/pulley_magnet.json -469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets/create/blockstates/pulse_repeater.json +dee3cdef860bb92d439ecaaec4300b42208b025c assets/create/blockstates/pulse_extender.json +638eb675fe3c464a0ab265c37f7d37fdf6440323 assets/create/blockstates/pulse_repeater.json 83ad917bb7f528e68d64f3859b3bf1236080d454 assets/create/blockstates/purple_nixie_tube.json d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json 92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json @@ -440,20 +439,20 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -ab739712612ceb2a3389c5aa15014843494c8ec6 assets/create/lang/en_ud.json -c38867134cdbf42bba8d5d19e6a29ea9f50588a6 assets/create/lang/en_us.json -a8618e9144ffd3f359f4020afce3f89832802bfe assets/create/lang/unfinished/de_de.json -09e2c4ed7b53c9a58ce0ae36a6fde085262dbadc assets/create/lang/unfinished/es_es.json -cfc0167ab1ce94798291ebcf9afaf18f86f26588 assets/create/lang/unfinished/fr_fr.json -6102f9e88008d169fa14a981c65e1d2a5e6aa13f assets/create/lang/unfinished/it_it.json -c0789c0963b5492d5dd89c854ee719a43e54a097 assets/create/lang/unfinished/ja_jp.json -be101523d1e93a34b0fb3ebb9cd544d1babb7b9f assets/create/lang/unfinished/ko_kr.json -4b26e64d6a7353f666d2c542a057da998a82ec47 assets/create/lang/unfinished/nl_nl.json -eb6e8c600f9565af1c83b9fe6267b247ff39315a assets/create/lang/unfinished/pl_pl.json -981ea891605b72b2f55745067727635964bf103c assets/create/lang/unfinished/pt_br.json -3ef467c07a129a9533f7582666db3042db2e7875 assets/create/lang/unfinished/ru_ru.json -659fb0a1f37416b8f1918b758f99265c2c92e5ef assets/create/lang/unfinished/zh_cn.json -b5d2e14f96f05d2dc46f4e3fe5a20492a643af93 assets/create/lang/unfinished/zh_tw.json +1e39bdca154552acc83fe98a110c02fd06638c01 assets/create/lang/en_ud.json +d9e8e6dc6859a714ecc72ef798db566a46cda77c assets/create/lang/en_us.json +7e200ff83aafe896b1fbe708ab20a726a85807e8 assets/create/lang/unfinished/de_de.json +2b125053c9de03b5faeac24e08c02aac03d3f552 assets/create/lang/unfinished/es_es.json +66f04487d7d22a80ca76881ecb36cba080f1d96e assets/create/lang/unfinished/fr_fr.json +f82aa35e79729d273a92ab1bca2130714ea54cd4 assets/create/lang/unfinished/it_it.json +1d7c7ac3b5ab8ac8add7daf2d44433d8acc7e1d1 assets/create/lang/unfinished/ja_jp.json +c815a0036f7390a4b5ae509a8c565fa23a2216ad assets/create/lang/unfinished/ko_kr.json +462b591336337b89dcf57c371a87e58dbe52083f assets/create/lang/unfinished/nl_nl.json +b5f4311465343c8b1deda440db1d4f64676560b9 assets/create/lang/unfinished/pl_pl.json +794ad4ae225ec6f999b6c7d75f488b3bcaa77528 assets/create/lang/unfinished/pt_br.json +5cf94714252bdf8ca30bcfb25d1c91ef9edc79c2 assets/create/lang/unfinished/ru_ru.json +5900ce619dbe682a52ba9bf23b1b5bae5ba7a9d0 assets/create/lang/unfinished/zh_cn.json +b1d760c5782865bf1178544b48a65d7342ec3675 assets/create/lang/unfinished/zh_tw.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json @@ -470,12 +469,6 @@ c3fdfa0ef84a598a17b2194fd0ea56fb323441d6 assets/create/models/block/adjustable_c 11c034a7689e3bc96cf54f67fd93bc3839ae19e9 assets/create/models/block/adjustable_chain_gearshift_middle_vertical_powered.json 221b65e4fed640dc77f8ec5fee300f2a199d05b1 assets/create/models/block/adjustable_chain_gearshift_single.json ef644b33e136692c19cf8e79fcd28431b40dbb62 assets/create/models/block/adjustable_chain_gearshift_single_powered.json -68ad5cab7a32235aabf060f05d72d5a2dcfd0e74 assets/create/models/block/adjustable_pulse_repeater_powered.json -2c88abbdca1e59f971f28276477a24d81bee93e8 assets/create/models/block/adjustable_pulse_repeater_powered_powering.json -fde9ff3520cd7d2cc2926cf95cad8c7ec5bdcae9 assets/create/models/block/adjustable_pulse_repeater_powering.json -ce5e0cd1598cf2228bb77a68c304dd210f3848f8 assets/create/models/block/adjustable_repeater_powered.json -b62a75c96400bf75287091ce324727f00754bf31 assets/create/models/block/adjustable_repeater_powered_powering.json -ea279b9b1a2d1eab8a69e5e35627ada170013b89 assets/create/models/block/adjustable_repeater_powering.json 10832d276445d8a5f94413de1979349db1364ec4 assets/create/models/block/andesite_belt_funnel__extended.json d01611179d3ed6c013f4f649127239772cbdeba3 assets/create/models/block/andesite_belt_funnel__powered_extended.json ed52e27fd7d645c25dc9dc58a44f29be12cb6d5e assets/create/models/block/andesite_belt_funnel__powered_pulling.json @@ -1165,8 +1158,12 @@ c934df1cfe097bcc0f0c21d1b1a3f3b53e50e831 assets/create/models/block/polished_wea 3e414b053b973729577a61bb1d73b9a2c2eb56a4 assets/create/models/block/powered_latch_powered.json f22d7d8263dcabd726aa04784031ae9062633579 assets/create/models/block/powered_toggle_latch_off_powered.json e6097d9ab9dc9954cbc750020bc33c7a423b73c6 assets/create/models/block/powered_toggle_latch_on_powered.json +e071e1586c3517b9575744e658c0ddcc0614f2ce assets/create/models/block/pulse_extender_powered.json +f2986f733e7bff1a0e7c8286b41511e69b97bf23 assets/create/models/block/pulse_extender_powered_powering.json +8590953783462a6f4e148e7582930d8d3fc65cd3 assets/create/models/block/pulse_extender_powering.json 622239a3a09fcac7235b9670eb395a530839a59b assets/create/models/block/pulse_repeater_powered.json -d469dce70d15759baed35025b8c7fa403c8b3b26 assets/create/models/block/pulse_repeater_pulsing.json +31610d977b4fe5ce848e97d47a85068c9cf68c6b assets/create/models/block/pulse_repeater_powered_powering.json +d5967f954940281df937cfaabc97f833322c8953 assets/create/models/block/pulse_repeater_powering.json 71cd22dc2d847d317f19afb4b21802fbf5347e0b assets/create/models/block/purple_nixie_tube.json b56fad63b82434564bc41ae9c01e3b427203fb5b assets/create/models/block/purple_sail.json 96adc7865ebe64b43865bc2fe914830c11258856 assets/create/models/block/purple_seat.json @@ -1276,8 +1273,6 @@ f3059145a84ddbd54d08167e984112c7baf5ef4a assets/create/models/block/zinc_ore.jso c695dab3964186a857767b2b4975aebffa86dcf9 assets/create/models/item/acacia_window_pane.json 564f6245f92ec48a733e34d91b96b1beebbaf44a assets/create/models/item/adjustable_chain_gearshift.json 06d8b6e8f050b8ec0bef88b7633f3741baad4571 assets/create/models/item/adjustable_crate.json -96fcec285c0c26a8cb55e126f8c7053c70ad188b assets/create/models/item/adjustable_pulse_repeater.json -30292e874dd36e45eaeebb8d0bb8c4867866a38b assets/create/models/item/adjustable_repeater.json e7759d9b3cd64d2719a58dc35fc75ca65b9e14fa assets/create/models/item/analog_lever.json 2e90c7abfcad12ca656ae253d834fbb799e15277 assets/create/models/item/andesite_alloy.json a513af38f164a48fd44693b70a93012f3546caff assets/create/models/item/andesite_bricks.json @@ -1657,7 +1652,8 @@ b97c891ebe74e7850ef1f982e4cc043338baa30f assets/create/models/item/potato_cannon 3a6dfc7f36e31ebfcd650c3144a7f2210e8a4f9f assets/create/models/item/powered_toggle_latch.json 7459efc8f20d093a8b0ef987eaace8cb0ad0aaa8 assets/create/models/item/precision_mechanism.json 4a3c3d81097d56bbd3aefeeb9eb7db87f514b5b4 assets/create/models/item/propeller.json -4b8a27ff05ed5331889dfc4b0b4562f3e94b0dfe assets/create/models/item/pulse_repeater.json +8010c989e4ff7a865a7c1744695674abf6b239e8 assets/create/models/item/pulse_extender.json +056cf051a6bb256658b7a66a5dd38c7ddc56def1 assets/create/models/item/pulse_repeater.json a598b2f5eb34b061e81efb8a55267a02f8e08a61 assets/create/models/item/purple_seat.json f309695ba0470c5228f38443f09bad85d09de8bd assets/create/models/item/purple_toolbox.json e5138f9e37ca4d24cda2eb7b24a021eb7c8ae21c assets/create/models/item/purple_valve_handle.json @@ -2013,8 +2009,6 @@ b73e6f8b89e6ef94167b6fa3d0837a27222edb01 data/create/advancements/recipes/create e8c2001863d9819d2a2c1fddeda41a4f126a5c09 data/create/advancements/recipes/create.base/crafting/kinetics/yellow_seat_from_other_seat.json f05bbae1e39eabb51dffa0babecf07f5de2cee3d data/create/advancements/recipes/create.base/crafting/kinetics/yellow_valve_handle_from_other_valve_handle.json 4e397619a76acc6083e3d3a3a4a3bd46a5f61efd data/create/advancements/recipes/create.base/crafting/logistics/adjustable_crate.json -146d55f3c5c9247c9992278873c6b8be890d733f data/create/advancements/recipes/create.base/crafting/logistics/adjustable_pulse_repeater.json -4793d335955c9d6c293e1358dc227eac93a5fe61 data/create/advancements/recipes/create.base/crafting/logistics/adjustable_repeater.json 0af26235bc51f73b0656d26a4232ae26419cee38 data/create/advancements/recipes/create.base/crafting/logistics/andesite_funnel.json 3443156df3d50b283be20d466797075064ddd59d data/create/advancements/recipes/create.base/crafting/logistics/andesite_tunnel.json 66dbb3486c5d38d309dd480e3f2ab0eb5ff9e559 data/create/advancements/recipes/create.base/crafting/logistics/brass_funnel.json @@ -2022,6 +2016,7 @@ f05bbae1e39eabb51dffa0babecf07f5de2cee3d data/create/advancements/recipes/create 6ee9a16973001dcce16afc4c085f6dc3abbc344a data/create/advancements/recipes/create.base/crafting/logistics/content_observer.json b9b0a8bfff61a89149d4fcadf679f753385212d0 data/create/advancements/recipes/create.base/crafting/logistics/powered_latch.json 9951f2d35f7444c98c022142119b18b1289ca734 data/create/advancements/recipes/create.base/crafting/logistics/powered_toggle_latch.json +7513a5f19cc03098b3fb6922561fb2fea0a147aa data/create/advancements/recipes/create.base/crafting/logistics/pulse_extender.json 76d4c5f04d0a3e6817127a828594388b18f210c4 data/create/advancements/recipes/create.base/crafting/logistics/pulse_repeater.json 0020b5c5cc6301c576d392ace447235de3e1b70c data/create/advancements/recipes/create.base/crafting/logistics/redstone_contact.json 24a00abe5c747b3c8864872c4c0c50d872f219a1 data/create/advancements/recipes/create.base/crafting/logistics/redstone_link.json @@ -2485,8 +2480,6 @@ ef4fa382442aacbda1ca8b762bd51ff80b708a93 data/create/advancements/wrench.json 258f8e75b299329a0ec3cae2fa66ced18a42a52d data/create/loot_tables/blocks/acacia_window_pane.json 56ec7e7fd2fc52252e525697acd3f09841ee66f2 data/create/loot_tables/blocks/adjustable_chain_gearshift.json a6ccdd1a9e55494787661505eeae898517b31118 data/create/loot_tables/blocks/adjustable_crate.json -fa41a3da64b72825308142d9088ee1386762ef3c data/create/loot_tables/blocks/adjustable_pulse_repeater.json -23e5a451cc9063474d79b2c791ce325be6b3c57b data/create/loot_tables/blocks/adjustable_repeater.json d3f60ec79bb671f5dcaa5567c14ea99cc84a32c1 data/create/loot_tables/blocks/analog_lever.json d9ca3622cca3b9515133257610aa3b8f6941cd61 data/create/loot_tables/blocks/andesite_belt_funnel.json c44b4692cbebf8dfdb13849ef9a3443a25529b4d data/create/loot_tables/blocks/andesite_bricks.json @@ -2843,6 +2836,7 @@ d57762b87883ca25432805ccdda3e9498c45f7e2 data/create/loot_tables/blocks/portable c9d3531a796ef833f99e1ec41cc3bf452972f02a data/create/loot_tables/blocks/powered_latch.json 8ad6f68224cb3bed00b4e09053a7e269c863934c data/create/loot_tables/blocks/powered_toggle_latch.json 0b9cbd531392b15e6636a300f23d22a095ba355e data/create/loot_tables/blocks/pulley_magnet.json +da9930d81364b1e9e230361b0af5b99c6100e226 data/create/loot_tables/blocks/pulse_extender.json 7a8674234c484707a742daf8164ceb61023521ad data/create/loot_tables/blocks/pulse_repeater.json 9f62e7edceab226285a964ec49e8319b2d06f393 data/create/loot_tables/blocks/purple_nixie_tube.json dcfb7b39203d85d47c9c22ebfc0d23322d40705c data/create/loot_tables/blocks/purple_sail.json @@ -3134,8 +3128,6 @@ d11eee4005372b1d0fad283b28c8016d823b5e37 data/create/recipes/crafting/kinetics/w f055d233ac7ee9eac840a658afa01bedd793ff38 data/create/recipes/crafting/kinetics/yellow_seat_from_other_seat.json 19c5c8bddeec51c9b47183c728e9ec4313c54410 data/create/recipes/crafting/kinetics/yellow_valve_handle_from_other_valve_handle.json 3f6f3a547dc06c9462da880360f29b49ac3f5e2a data/create/recipes/crafting/logistics/adjustable_crate.json -c465151b64381e2222203bf069b717435fdc2b26 data/create/recipes/crafting/logistics/adjustable_pulse_repeater.json -34bcdffae0b104829161c86b7d161068f890daa2 data/create/recipes/crafting/logistics/adjustable_repeater.json fc75c87159569cb6ee978e6d51b0c3b0f504b5de data/create/recipes/crafting/logistics/andesite_funnel.json 660e824ab6042c145f02ffcfe95a34c38f113e19 data/create/recipes/crafting/logistics/andesite_tunnel.json 9b4e74f9a950191134d978bf45c3339212677b0d data/create/recipes/crafting/logistics/brass_funnel.json @@ -3143,7 +3135,8 @@ fc75c87159569cb6ee978e6d51b0c3b0f504b5de data/create/recipes/crafting/logistics/ 8559045b42abd99490fb9a3cf5d06b08fd014b38 data/create/recipes/crafting/logistics/content_observer.json a32ac53848862837f3044ff9c81ed62c1134fe4f data/create/recipes/crafting/logistics/powered_latch.json 660eb73bcc66c1528cbd4d4204ad6b771f4bd721 data/create/recipes/crafting/logistics/powered_toggle_latch.json -74b8a38d252cce564cc63db2ade41ed2d656d025 data/create/recipes/crafting/logistics/pulse_repeater.json +08be50405433365f483a1b5f2ff688e3adbf6a7b data/create/recipes/crafting/logistics/pulse_extender.json +9f079a853c128f68f15277448bbf72dfbc212f26 data/create/recipes/crafting/logistics/pulse_repeater.json 739f0d8b7f98a5639ed37f7fb8ce474d5e6ba0c6 data/create/recipes/crafting/logistics/redstone_contact.json bc511f7c225750743ae3e985502fa65beb1e7b8d data/create/recipes/crafting/logistics/redstone_link.json 10b16358664f2bb8a11589ef8ba3d69ee8d3b9fc data/create/recipes/crafting/logistics/stockpile_switch.json @@ -3809,7 +3802,7 @@ d3fdb8ece6cb072a93ddb64a0baad5ac952117a4 data/create/recipes/weathered_limestone 6558ef43f28c92cc558fbfc572f38496f1ed479e data/create/tags/blocks/brittle.json 330bfb3850ba3964b10b1bccbc3cbb9b012cae54 data/create/tags/blocks/fan_heaters.json 57b942386a15c874d1ca9cd6a8032c11a5599fc2 data/create/tags/blocks/fan_transparent.json -c81ea194e808985847159b201140d4aa4cbcca65 data/create/tags/blocks/safe_nbt.json +557a29a61145b0f266760ef06256188a296739a7 data/create/tags/blocks/safe_nbt.json c9ac7e3e5ec18554e7184168d65e9b8e44ef5610 data/create/tags/blocks/sails.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/blocks/seats.json d063e12c9ef75f39518c6d129ea35d833464d547 data/create/tags/blocks/toolboxes.json diff --git a/src/generated/resources/assets/create/blockstates/adjustable_pulse_repeater.json b/src/generated/resources/assets/create/blockstates/adjustable_pulse_repeater.json deleted file mode 100644 index 111089cfb..000000000 --- a/src/generated/resources/assets/create/blockstates/adjustable_pulse_repeater.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "variants": { - "facing=north,powered=false,powering=false": { - "model": "create:block/diodes/adjustable_pulse_repeater", - "y": 180 - }, - "facing=south,powered=false,powering=false": { - "model": "create:block/diodes/adjustable_pulse_repeater" - }, - "facing=west,powered=false,powering=false": { - "model": "create:block/diodes/adjustable_pulse_repeater", - "y": 90 - }, - "facing=east,powered=false,powering=false": { - "model": "create:block/diodes/adjustable_pulse_repeater", - "y": 270 - }, - "facing=north,powered=true,powering=false": { - "model": "create:block/adjustable_pulse_repeater_powered", - "y": 180 - }, - "facing=south,powered=true,powering=false": { - "model": "create:block/adjustable_pulse_repeater_powered" - }, - "facing=west,powered=true,powering=false": { - "model": "create:block/adjustable_pulse_repeater_powered", - "y": 90 - }, - "facing=east,powered=true,powering=false": { - "model": "create:block/adjustable_pulse_repeater_powered", - "y": 270 - }, - "facing=north,powered=false,powering=true": { - "model": "create:block/adjustable_pulse_repeater_powering", - "y": 180 - }, - "facing=south,powered=false,powering=true": { - "model": "create:block/adjustable_pulse_repeater_powering" - }, - "facing=west,powered=false,powering=true": { - "model": "create:block/adjustable_pulse_repeater_powering", - "y": 90 - }, - "facing=east,powered=false,powering=true": { - "model": "create:block/adjustable_pulse_repeater_powering", - "y": 270 - }, - "facing=north,powered=true,powering=true": { - "model": "create:block/adjustable_pulse_repeater_powered_powering", - "y": 180 - }, - "facing=south,powered=true,powering=true": { - "model": "create:block/adjustable_pulse_repeater_powered_powering" - }, - "facing=west,powered=true,powering=true": { - "model": "create:block/adjustable_pulse_repeater_powered_powering", - "y": 90 - }, - "facing=east,powered=true,powering=true": { - "model": "create:block/adjustable_pulse_repeater_powered_powering", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/adjustable_repeater.json b/src/generated/resources/assets/create/blockstates/pulse_extender.json similarity index 53% rename from src/generated/resources/assets/create/blockstates/adjustable_repeater.json rename to src/generated/resources/assets/create/blockstates/pulse_extender.json index 357a10e08..e90e9f51f 100644 --- a/src/generated/resources/assets/create/blockstates/adjustable_repeater.json +++ b/src/generated/resources/assets/create/blockstates/pulse_extender.json @@ -1,63 +1,63 @@ { "variants": { "facing=north,powered=false,powering=false": { - "model": "create:block/diodes/adjustable_repeater", + "model": "create:block/diodes/pulse_extender", "y": 180 }, "facing=south,powered=false,powering=false": { - "model": "create:block/diodes/adjustable_repeater" + "model": "create:block/diodes/pulse_extender" }, "facing=west,powered=false,powering=false": { - "model": "create:block/diodes/adjustable_repeater", + "model": "create:block/diodes/pulse_extender", "y": 90 }, "facing=east,powered=false,powering=false": { - "model": "create:block/diodes/adjustable_repeater", + "model": "create:block/diodes/pulse_extender", "y": 270 }, "facing=north,powered=true,powering=false": { - "model": "create:block/adjustable_repeater_powered", + "model": "create:block/pulse_extender_powered", "y": 180 }, "facing=south,powered=true,powering=false": { - "model": "create:block/adjustable_repeater_powered" + "model": "create:block/pulse_extender_powered" }, "facing=west,powered=true,powering=false": { - "model": "create:block/adjustable_repeater_powered", + "model": "create:block/pulse_extender_powered", "y": 90 }, "facing=east,powered=true,powering=false": { - "model": "create:block/adjustable_repeater_powered", + "model": "create:block/pulse_extender_powered", "y": 270 }, "facing=north,powered=false,powering=true": { - "model": "create:block/adjustable_repeater_powering", + "model": "create:block/pulse_extender_powering", "y": 180 }, "facing=south,powered=false,powering=true": { - "model": "create:block/adjustable_repeater_powering" + "model": "create:block/pulse_extender_powering" }, "facing=west,powered=false,powering=true": { - "model": "create:block/adjustable_repeater_powering", + "model": "create:block/pulse_extender_powering", "y": 90 }, "facing=east,powered=false,powering=true": { - "model": "create:block/adjustable_repeater_powering", + "model": "create:block/pulse_extender_powering", "y": 270 }, "facing=north,powered=true,powering=true": { - "model": "create:block/adjustable_repeater_powered_powering", + "model": "create:block/pulse_extender_powered_powering", "y": 180 }, "facing=south,powered=true,powering=true": { - "model": "create:block/adjustable_repeater_powered_powering" + "model": "create:block/pulse_extender_powered_powering" }, "facing=west,powered=true,powering=true": { - "model": "create:block/adjustable_repeater_powered_powering", + "model": "create:block/pulse_extender_powered_powering", "y": 90 }, "facing=east,powered=true,powering=true": { - "model": "create:block/adjustable_repeater_powered_powering", + "model": "create:block/pulse_extender_powered_powering", "y": 270 } } diff --git a/src/generated/resources/assets/create/blockstates/pulse_repeater.json b/src/generated/resources/assets/create/blockstates/pulse_repeater.json index fe93a99de..701e2a96d 100644 --- a/src/generated/resources/assets/create/blockstates/pulse_repeater.json +++ b/src/generated/resources/assets/create/blockstates/pulse_repeater.json @@ -1,63 +1,63 @@ { "variants": { - "facing=north,powered=false,pulsing=false": { + "facing=north,powered=false,powering=false": { "model": "create:block/diodes/pulse_repeater", "y": 180 }, - "facing=south,powered=false,pulsing=false": { + "facing=south,powered=false,powering=false": { "model": "create:block/diodes/pulse_repeater" }, - "facing=west,powered=false,pulsing=false": { + "facing=west,powered=false,powering=false": { "model": "create:block/diodes/pulse_repeater", "y": 90 }, - "facing=east,powered=false,pulsing=false": { + "facing=east,powered=false,powering=false": { "model": "create:block/diodes/pulse_repeater", "y": 270 }, - "facing=north,powered=true,pulsing=false": { + "facing=north,powered=true,powering=false": { "model": "create:block/pulse_repeater_powered", "y": 180 }, - "facing=south,powered=true,pulsing=false": { + "facing=south,powered=true,powering=false": { "model": "create:block/pulse_repeater_powered" }, - "facing=west,powered=true,pulsing=false": { + "facing=west,powered=true,powering=false": { "model": "create:block/pulse_repeater_powered", "y": 90 }, - "facing=east,powered=true,pulsing=false": { + "facing=east,powered=true,powering=false": { "model": "create:block/pulse_repeater_powered", "y": 270 }, - "facing=north,powered=false,pulsing=true": { - "model": "create:block/pulse_repeater_pulsing", + "facing=north,powered=false,powering=true": { + "model": "create:block/pulse_repeater_powering", "y": 180 }, - "facing=south,powered=false,pulsing=true": { - "model": "create:block/pulse_repeater_pulsing" + "facing=south,powered=false,powering=true": { + "model": "create:block/pulse_repeater_powering" }, - "facing=west,powered=false,pulsing=true": { - "model": "create:block/pulse_repeater_pulsing", + "facing=west,powered=false,powering=true": { + "model": "create:block/pulse_repeater_powering", "y": 90 }, - "facing=east,powered=false,pulsing=true": { - "model": "create:block/pulse_repeater_pulsing", + "facing=east,powered=false,powering=true": { + "model": "create:block/pulse_repeater_powering", "y": 270 }, - "facing=north,powered=true,pulsing=true": { - "model": "create:block/pulse_repeater_pulsing", + "facing=north,powered=true,powering=true": { + "model": "create:block/pulse_repeater_powered_powering", "y": 180 }, - "facing=south,powered=true,pulsing=true": { - "model": "create:block/pulse_repeater_pulsing" + "facing=south,powered=true,powering=true": { + "model": "create:block/pulse_repeater_powered_powering" }, - "facing=west,powered=true,pulsing=true": { - "model": "create:block/pulse_repeater_pulsing", + "facing=west,powered=true,powering=true": { + "model": "create:block/pulse_repeater_powered_powering", "y": 90 }, - "facing=east,powered=true,pulsing=true": { - "model": "create:block/pulse_repeater_pulsing", + "facing=east,powered=true,powering=true": { + "model": "create:block/pulse_repeater_powered_powering", "y": 270 } } diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index be035ad0d..3db600512 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -3,8 +3,6 @@ "block.create.acacia_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", "block.create.adjustable_chain_gearshift": "\u0287\u025F\u0131\u0265s\u0279\u0250\u01DD\u2141 u\u0131\u0250\u0265\u0186 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", "block.create.adjustable_crate": "\u01DD\u0287\u0250\u0279\u0186 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", - "block.create.adjustable_pulse_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DDs\u05DFn\u0500 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", - "block.create.adjustable_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", "block.create.analog_lever": "\u0279\u01DD\u028C\u01DD\uA780 bo\u05DF\u0250u\u2C6F", "block.create.andesite_belt_funnel": "\u05DF\u01DDuun\u2132 \u0287\u05DF\u01DD\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", @@ -363,6 +361,7 @@ "block.create.powered_latch": "\u0265\u0254\u0287\u0250\uA780 p\u01DD\u0279\u01DD\u028Do\u0500", "block.create.powered_toggle_latch": "\u0265\u0254\u0287\u0250\uA780 \u01DD\u05DFbbo\u27D8 p\u01DD\u0279\u01DD\u028Do\u0500", "block.create.pulley_magnet": "\u0287\u01DDub\u0250W \u028E\u01DD\u05DF\u05DFn\u0500", + "block.create.pulse_extender": "\u0279\u01DDpu\u01DD\u0287x\u018E \u01DDs\u05DFn\u0500", "block.create.pulse_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DDs\u05DFn\u0500", "block.create.purple_nixie_tube": "\u01DDqn\u27D8 \u01DD\u0131x\u0131N \u01DD\u05DFd\u0279n\u0500", "block.create.purple_sail": "\u05DF\u0131\u0250S \u01DD\u05DFd\u0279n\u0500", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index cbdfab526..d9525a087 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -6,8 +6,6 @@ "block.create.acacia_window_pane": "Acacia Window Pane", "block.create.adjustable_chain_gearshift": "Adjustable Chain Gearshift", "block.create.adjustable_crate": "Adjustable Crate", - "block.create.adjustable_pulse_repeater": "Adjustable Pulse Repeater", - "block.create.adjustable_repeater": "Adjustable Repeater", "block.create.analog_lever": "Analog Lever", "block.create.andesite_belt_funnel": "Andesite Belt Funnel", "block.create.andesite_bricks": "Andesite Bricks", @@ -366,6 +364,7 @@ "block.create.powered_latch": "Powered Latch", "block.create.powered_toggle_latch": "Powered Toggle Latch", "block.create.pulley_magnet": "Pulley Magnet", + "block.create.pulse_extender": "Pulse Extender", "block.create.pulse_repeater": "Pulse Repeater", "block.create.purple_nixie_tube": "Purple Nixie Tube", "block.create.purple_sail": "Purple Sail", @@ -1584,18 +1583,6 @@ "create.ponder.tag.logistics": "Item Transportation", "create.ponder.tag.logistics.description": "Components which help moving items around", - "create.ponder.adjustable_pulse_repeater.header": "Controlling signals using Adjustable Pulse Repeaters", - "create.ponder.adjustable_pulse_repeater.text_1": "Adjustable Pulse Repeaters emit a short pulse at a delay", - "create.ponder.adjustable_pulse_repeater.text_2": "Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_pulse_repeater.text_3": "Configured delays can range up to 30 minutes", - - "create.ponder.adjustable_repeater.header": "Controlling signals using Adjustable Repeaters", - "create.ponder.adjustable_repeater.text_1": "Adjustable Repeaters behave similarly to regular Repeaters", - "create.ponder.adjustable_repeater.text_2": "They charge up for a set time...", - "create.ponder.adjustable_repeater.text_3": "...and cool down for the same duration", - "create.ponder.adjustable_repeater.text_4": "Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_repeater.text_5": "Configured delays can range up to 30 minutes", - "create.ponder.analog_lever.header": "Controlling signals using the Analog Lever", "create.ponder.analog_lever.text_1": "Analog Levers make for a compact and precise source of redstone power", "create.ponder.analog_lever.text_2": "Right-click to increase its analog power output", @@ -2172,9 +2159,6 @@ "create.ponder.powered_toggle_latch.text_3": "...on and back off", "create.ponder.powered_toggle_latch.text_4": "Powered toggle latches can also be toggled manually", - "create.ponder.pulse_repeater.header": "Controlling signals using Pulse Repeaters", - "create.ponder.pulse_repeater.text_1": "Pulse Repeaters will shorten any redstone signal to a single pulse", - "create.ponder.radial_chassis.header": "Attaching blocks using Radial Chassis", "create.ponder.radial_chassis.text_1": "Radial Chassis connect to identical Chassis blocks in a row", "create.ponder.radial_chassis.text_2": "When one is moved by a Contraption, the others are dragged with it", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 47b4f13a6..ff15504d5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1173", + "_": "Missing Localizations: 1162", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "Akazienholzfensterscheibe", "block.create.adjustable_chain_gearshift": "Verstellbares Kettengetriebe", "block.create.adjustable_crate": "Verstellbare Kiste", - "block.create.adjustable_pulse_repeater": "Verstellbarer Pulsverstärker", - "block.create.adjustable_repeater": "Verstellbarer Verstärker", "block.create.analog_lever": "Analoger Schalter", "block.create.andesite_belt_funnel": "Riementrichter aus Andesit", "block.create.andesite_bricks": "Andesitziegel", @@ -367,6 +365,7 @@ "block.create.powered_latch": "RS-Flipflop", "block.create.powered_toggle_latch": "T-Flipflop", "block.create.pulley_magnet": "Rollenmagnet", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "Pulsierender Verstärker", "block.create.purple_nixie_tube": "UNLOCALIZED: Purple Nixie Tube", "block.create.purple_sail": "Lila Segel", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", - "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", - "create.ponder.adjustable_pulse_repeater.text_2": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_pulse_repeater.text_3": "UNLOCALIZED: Configured delays can range up to 30 minutes", - - "create.ponder.adjustable_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Repeaters", - "create.ponder.adjustable_repeater.text_1": "UNLOCALIZED: Adjustable Repeaters behave similarly to regular Repeaters", - "create.ponder.adjustable_repeater.text_2": "UNLOCALIZED: They charge up for a set time...", - "create.ponder.adjustable_repeater.text_3": "UNLOCALIZED: ...and cool down for the same duration", - "create.ponder.adjustable_repeater.text_4": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_repeater.text_5": "UNLOCALIZED: Configured delays can range up to 30 minutes", - "create.ponder.analog_lever.header": "UNLOCALIZED: Controlling signals using the Analog Lever", "create.ponder.analog_lever.text_1": "UNLOCALIZED: Analog Levers make for a compact and precise source of redstone power", "create.ponder.analog_lever.text_2": "UNLOCALIZED: Right-click to increase its analog power output", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "UNLOCALIZED: ...on and back off", "create.ponder.powered_toggle_latch.text_4": "UNLOCALIZED: Powered toggle latches can also be toggled manually", - "create.ponder.pulse_repeater.header": "UNLOCALIZED: Controlling signals using Pulse Repeaters", - "create.ponder.pulse_repeater.text_1": "UNLOCALIZED: Pulse Repeaters will shorten any redstone signal to a single pulse", - "create.ponder.radial_chassis.header": "UNLOCALIZED: Attaching blocks using Radial Chassis", "create.ponder.radial_chassis.text_1": "UNLOCALIZED: Radial Chassis connect to identical Chassis blocks in a row", "create.ponder.radial_chassis.text_2": "UNLOCALIZED: When one is moved by a Contraption, the others are dragged with it", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index 17cb6cef0..991fcf4e4 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 39", + "_": "Missing Localizations: 40", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "Panel de ventana de acacia", "block.create.adjustable_chain_gearshift": "Cadena de transmisión ajustable", "block.create.adjustable_crate": "Caja ajustable", - "block.create.adjustable_pulse_repeater": "Repetidor de pulso ajustable", - "block.create.adjustable_repeater": "Repetidor ajustable", "block.create.analog_lever": "Palanca analógica", "block.create.andesite_belt_funnel": "Embudo de cinta de andesita", "block.create.andesite_bricks": "Ladrillos de andesita", @@ -367,6 +365,7 @@ "block.create.powered_latch": "Palanca motorizada", "block.create.powered_toggle_latch": "Palanca de cierre motorizada", "block.create.pulley_magnet": "Imán de la polea", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "Repetidor de pulsos de redstone", "block.create.purple_nixie_tube": "Tubo Nixie morado", "block.create.purple_sail": "Vela morada", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "Transporte de objetos", "create.ponder.tag.logistics.description": "Componentes que ayudan a desplazar los objetos", - "create.ponder.adjustable_pulse_repeater.header": "Controlar señales mediante repetidores de pulsos ajustables", - "create.ponder.adjustable_pulse_repeater.text_1": "Los repetidores de pulsos ajustables emiten un pulso corto con un retardo", - "create.ponder.adjustable_pulse_repeater.text_2": "Con la rueda del ratón se puede configurar el tiempo de carga", - "create.ponder.adjustable_pulse_repeater.text_3": "Los retrasos configurados pueden ser de hasta 30 minutos", - - "create.ponder.adjustable_repeater.header": "Controlar señales mediante repetidores ajustables", - "create.ponder.adjustable_repeater.text_1": "Los repetidores ajustables se comportan de forma similar a los repetidores normales", - "create.ponder.adjustable_repeater.text_2": "Se cargan durante un tiempo determinado...", - "create.ponder.adjustable_repeater.text_3": "...y se enfrían durante el mismo tiempo", - "create.ponder.adjustable_repeater.text_4": "Con la rueda del ratón se puede configurar el tiempo de carga", - "create.ponder.adjustable_repeater.text_5": "Los retrasos configurados pueden variar hasta 30 minutos", - "create.ponder.analog_lever.header": "Controlar señales mediante la palanca analógica", "create.ponder.analog_lever.text_1": "Las palancas analógicas son una fuente compacta y precisa de energía de redstone", "create.ponder.analog_lever.text_2": "Haz clic derecho para aumentar su potencia analógica", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "...encender y apagar", "create.ponder.powered_toggle_latch.text_4": "Las palancas de cierre motorizadas también se pueden accionar manualmente", - "create.ponder.pulse_repeater.header": "Controlar señales mediante repetidores de pulsos", - "create.ponder.pulse_repeater.text_1": "Los repetidores de pulsos acortan cualquier señal de redstone a un solo pulso", - "create.ponder.radial_chassis.header": "Fijar bloques mediante chasis radiales", "create.ponder.radial_chassis.text_1": "Los chasis radiales se conectan a bloques de chasis idénticos en una fila", "create.ponder.radial_chassis.text_2": "Cuando uno es movido por un artilugio, los otros son arrastrados con él", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index be27cee1f..4a68b5ab6 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1424", + "_": "Missing Localizations: 1413", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "Vitre en acacia", "block.create.adjustable_chain_gearshift": "UNLOCALIZED: Adjustable Chain Gearshift", "block.create.adjustable_crate": "Caisse ajustable", - "block.create.adjustable_pulse_repeater": "Répéteur d'impulsions réglable", - "block.create.adjustable_repeater": "Répéteur réglable", "block.create.analog_lever": "Levier analogique", "block.create.andesite_belt_funnel": "Entonnoir en andésite pour tapis roulant", "block.create.andesite_bricks": "Briques d'andésite", @@ -367,6 +365,7 @@ "block.create.powered_latch": "Verrou alimenté", "block.create.powered_toggle_latch": "Verrou alimenté à bascule", "block.create.pulley_magnet": "Aimant de poulie", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "Répéteur d'impulsions", "block.create.purple_nixie_tube": "UNLOCALIZED: Purple Nixie Tube", "block.create.purple_sail": "UNLOCALIZED: Purple Sail", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", - "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", - "create.ponder.adjustable_pulse_repeater.text_2": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_pulse_repeater.text_3": "UNLOCALIZED: Configured delays can range up to 30 minutes", - - "create.ponder.adjustable_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Repeaters", - "create.ponder.adjustable_repeater.text_1": "UNLOCALIZED: Adjustable Repeaters behave similarly to regular Repeaters", - "create.ponder.adjustable_repeater.text_2": "UNLOCALIZED: They charge up for a set time...", - "create.ponder.adjustable_repeater.text_3": "UNLOCALIZED: ...and cool down for the same duration", - "create.ponder.adjustable_repeater.text_4": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_repeater.text_5": "UNLOCALIZED: Configured delays can range up to 30 minutes", - "create.ponder.analog_lever.header": "UNLOCALIZED: Controlling signals using the Analog Lever", "create.ponder.analog_lever.text_1": "UNLOCALIZED: Analog Levers make for a compact and precise source of redstone power", "create.ponder.analog_lever.text_2": "UNLOCALIZED: Right-click to increase its analog power output", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "UNLOCALIZED: ...on and back off", "create.ponder.powered_toggle_latch.text_4": "UNLOCALIZED: Powered toggle latches can also be toggled manually", - "create.ponder.pulse_repeater.header": "UNLOCALIZED: Controlling signals using Pulse Repeaters", - "create.ponder.pulse_repeater.text_1": "UNLOCALIZED: Pulse Repeaters will shorten any redstone signal to a single pulse", - "create.ponder.radial_chassis.header": "UNLOCALIZED: Attaching blocks using Radial Chassis", "create.ponder.radial_chassis.text_1": "UNLOCALIZED: Radial Chassis connect to identical Chassis blocks in a row", "create.ponder.radial_chassis.text_2": "UNLOCALIZED: When one is moved by a Contraption, the others are dragged with it", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 0a3d2b23c..946f5f8cf 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 953", + "_": "Missing Localizations: 942", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "Pannello di finestra di acacia", "block.create.adjustable_chain_gearshift": "Cambio a catena regolabile", "block.create.adjustable_crate": "Baule regolabile", - "block.create.adjustable_pulse_repeater": "Ripetitore di impulsi regolabile", - "block.create.adjustable_repeater": "Ripetitore regolabile", "block.create.analog_lever": "Leva analogica", "block.create.andesite_belt_funnel": "Imbuto per nastro di andesite", "block.create.andesite_bricks": "Mattoni di andesite", @@ -367,6 +365,7 @@ "block.create.powered_latch": "Leva alimentata", "block.create.powered_toggle_latch": "Leva alimentata alterata", "block.create.pulley_magnet": "Magnete della carrucola", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "Ripetitore di impulsi", "block.create.purple_nixie_tube": "UNLOCALIZED: Purple Nixie Tube", "block.create.purple_sail": "Vela viola", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", - "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", - "create.ponder.adjustable_pulse_repeater.text_2": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_pulse_repeater.text_3": "UNLOCALIZED: Configured delays can range up to 30 minutes", - - "create.ponder.adjustable_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Repeaters", - "create.ponder.adjustable_repeater.text_1": "UNLOCALIZED: Adjustable Repeaters behave similarly to regular Repeaters", - "create.ponder.adjustable_repeater.text_2": "UNLOCALIZED: They charge up for a set time...", - "create.ponder.adjustable_repeater.text_3": "UNLOCALIZED: ...and cool down for the same duration", - "create.ponder.adjustable_repeater.text_4": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_repeater.text_5": "UNLOCALIZED: Configured delays can range up to 30 minutes", - "create.ponder.analog_lever.header": "UNLOCALIZED: Controlling signals using the Analog Lever", "create.ponder.analog_lever.text_1": "UNLOCALIZED: Analog Levers make for a compact and precise source of redstone power", "create.ponder.analog_lever.text_2": "UNLOCALIZED: Right-click to increase its analog power output", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "UNLOCALIZED: ...on and back off", "create.ponder.powered_toggle_latch.text_4": "UNLOCALIZED: Powered toggle latches can also be toggled manually", - "create.ponder.pulse_repeater.header": "UNLOCALIZED: Controlling signals using Pulse Repeaters", - "create.ponder.pulse_repeater.text_1": "UNLOCALIZED: Pulse Repeaters will shorten any redstone signal to a single pulse", - "create.ponder.radial_chassis.header": "UNLOCALIZED: Attaching blocks using Radial Chassis", "create.ponder.radial_chassis.text_1": "UNLOCALIZED: Radial Chassis connect to identical Chassis blocks in a row", "create.ponder.radial_chassis.text_2": "UNLOCALIZED: When one is moved by a Contraption, the others are dragged with it", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index fc74e1d5c..4f4095613 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 48", + "_": "Missing Localizations: 49", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "アカシアの窓板", "block.create.adjustable_chain_gearshift": "可変チェーンギアシフト", "block.create.adjustable_crate": "可変クレート", - "block.create.adjustable_pulse_repeater": "可変パルスリピーター", - "block.create.adjustable_repeater": "可変リピーター", "block.create.analog_lever": "アナログレバー", "block.create.andesite_belt_funnel": "安山岩のベルトファンネル", "block.create.andesite_bricks": "安山岩レンガ", @@ -367,6 +365,7 @@ "block.create.powered_latch": "パワードラッチ", "block.create.powered_toggle_latch": "パワードトグルラッチ", "block.create.pulley_magnet": "プーリーマグネット", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "パルスリピーター", "block.create.purple_nixie_tube": "紫色のニキシー管", "block.create.purple_sail": "紫色の帆", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "輸送機械", "create.ponder.tag.logistics.description": "アイテムの運搬を補助する機械です", - "create.ponder.adjustable_pulse_repeater.header": "可変パルスリピーターによる信号制御", - "create.ponder.adjustable_pulse_repeater.text_1": "可変パルスリピーターは信号を遅延し、短いパルスにして出力します", - "create.ponder.adjustable_pulse_repeater.text_2": "マウスホイールで遅延時間を調整できます", - "create.ponder.adjustable_pulse_repeater.text_3": "最大30分まで遅延時間を調整できます", - - "create.ponder.adjustable_repeater.header": "可変リピーターによる信号制御", - "create.ponder.adjustable_repeater.text_1": "可変リピーターは通常のレッドストーンリピーターと同様の動作をします", - "create.ponder.adjustable_repeater.text_2": "決められた時間だけ遅延します...", - "create.ponder.adjustable_repeater.text_3": "...そして同じ時間だけクールダウンします", - "create.ponder.adjustable_repeater.text_4": "マウスホイールで遅延時間を調整できます", - "create.ponder.adjustable_repeater.text_5": "最大30分まで遅延時間を調整できます", - "create.ponder.analog_lever.header": "アナログレバーによる信号制御", "create.ponder.analog_lever.text_1": "アナログレバーはコンパクトに正確なレッドストーン動力を出力できます。", "create.ponder.analog_lever.text_2": "右クリックでレッドストーン強度を上げられます。", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "何度も信号を送るとオンとオフと繰り返します", "create.ponder.powered_toggle_latch.text_4": "パワードトグルラッチは、手動でもオンオフもできます", - "create.ponder.pulse_repeater.header": "パルスリピーターによる信号制御", - "create.ponder.pulse_repeater.text_1": "パルスリピーターは、レッドストーン信号を短縮して1tickのパルス信号にします", - "create.ponder.radial_chassis.header": "ラジアルシャーシによるブロックの取り付け", "create.ponder.radial_chassis.text_1": "ラジアルシャーシは、同じ種類のシャーシと繋がります", "create.ponder.radial_chassis.text_2": "からくり機械によって1つが動かされると、他も一緒に動きます", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 2f4260216..033835960 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 63", + "_": "Missing Localizations: 64", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "아카시아나무 유리판 ", "block.create.adjustable_chain_gearshift": "벨트 변속기", "block.create.adjustable_crate": "가변 창고", - "block.create.adjustable_pulse_repeater": "가변 펄스 중계기", - "block.create.adjustable_repeater": "가변 중계기", "block.create.analog_lever": "아날로그 레버", "block.create.andesite_belt_funnel": "안산암 퍼널", "block.create.andesite_bricks": "안산암 벽돌", @@ -367,6 +365,7 @@ "block.create.powered_latch": "레드스톤 걸쇠", "block.create.powered_toggle_latch": "레드스톤 토글 걸쇠", "block.create.pulley_magnet": "도르래 자석", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "펄스 중계기", "block.create.purple_nixie_tube": "보라샥 닉시관", "block.create.purple_sail": "보라색 날개", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "아이템 수송", "create.ponder.tag.logistics.description": "아이템을 옮기는데 도움을 줄 부품입니다.", - "create.ponder.adjustable_pulse_repeater.header": "가변 펄스 중계기를 이용해 신호 조절하기", - "create.ponder.adjustable_pulse_repeater.text_1": "가변 펄스 중계기는 딜레이 이후 짧은 신호를 보냅니다.", - "create.ponder.adjustable_pulse_repeater.text_2": "마우스 휠을 이용하여 딜레이를 조절합니다.", - "create.ponder.adjustable_pulse_repeater.text_3": "딜레이는 최대 30분까지 조절할 수 있습니다.", - - "create.ponder.adjustable_repeater.header": "가변 중계기를 이용해 신호 조절하기", - "create.ponder.adjustable_repeater.text_1": "가변 중계기는 기존 중계기와 비슷합니다.", - "create.ponder.adjustable_repeater.text_2": "정해진 딜레이만큼 신호를 주고...", - "create.ponder.adjustable_repeater.text_3": "...정해진 딜레이만큼 쉽니다.", - "create.ponder.adjustable_repeater.text_4": "마우스 휠을 이용해 딜레이를 조절합니다.", - "create.ponder.adjustable_repeater.text_5": "딜레이는 최대 30분까지 조절할 수 있습니다.", - "create.ponder.analog_lever.header": "아날로그 레버를 이용해 신호 조절하기", "create.ponder.analog_lever.text_1": "아날로그 레버는 정확하고 간편하게 레드스톤 신호의 세기를 조절합니다.", "create.ponder.analog_lever.text_2": "우클릭으로 세기를 높입니다.", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "혹은 끕니다.", "create.ponder.powered_toggle_latch.text_4": "레드스톤 토글 걸쇠는 직접 끄고 킬 수도 있습니다.", - "create.ponder.pulse_repeater.header": "펄스 중계기 사용하기", - "create.ponder.pulse_repeater.text_1": "펄스 중계기는 어느 레드스톤 신호라도 1틱 신호로 바꿉니다.", - "create.ponder.radial_chassis.header": "원형 섀시를 이용해 블록 붙이기", "create.ponder.radial_chassis.text_1": "원형 섀시는 다른 원형 섀시와 이어집니다.", "create.ponder.radial_chassis.text_2": "하나가 움직이면, 다른 섀시도 같이 움직입니다.", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index fef869af9..9b0646fa1 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1804", + "_": "Missing Localizations: 1792", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", "block.create.adjustable_chain_gearshift": "UNLOCALIZED: Adjustable Chain Gearshift", "block.create.adjustable_crate": "FlexKrat", - "block.create.adjustable_pulse_repeater": "UNLOCALIZED: Adjustable Pulse Repeater", - "block.create.adjustable_repeater": "FlexSterker", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Andesietstenen", @@ -367,6 +365,7 @@ "block.create.powered_latch": "UNLOCALIZED: Powered Latch", "block.create.powered_toggle_latch": "UNLOCALIZED: Powered Toggle Latch", "block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "Pulse Versterker", "block.create.purple_nixie_tube": "UNLOCALIZED: Purple Nixie Tube", "block.create.purple_sail": "UNLOCALIZED: Purple Sail", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", - "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", - "create.ponder.adjustable_pulse_repeater.text_2": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_pulse_repeater.text_3": "UNLOCALIZED: Configured delays can range up to 30 minutes", - - "create.ponder.adjustable_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Repeaters", - "create.ponder.adjustable_repeater.text_1": "UNLOCALIZED: Adjustable Repeaters behave similarly to regular Repeaters", - "create.ponder.adjustable_repeater.text_2": "UNLOCALIZED: They charge up for a set time...", - "create.ponder.adjustable_repeater.text_3": "UNLOCALIZED: ...and cool down for the same duration", - "create.ponder.adjustable_repeater.text_4": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_repeater.text_5": "UNLOCALIZED: Configured delays can range up to 30 minutes", - "create.ponder.analog_lever.header": "UNLOCALIZED: Controlling signals using the Analog Lever", "create.ponder.analog_lever.text_1": "UNLOCALIZED: Analog Levers make for a compact and precise source of redstone power", "create.ponder.analog_lever.text_2": "UNLOCALIZED: Right-click to increase its analog power output", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "UNLOCALIZED: ...on and back off", "create.ponder.powered_toggle_latch.text_4": "UNLOCALIZED: Powered toggle latches can also be toggled manually", - "create.ponder.pulse_repeater.header": "UNLOCALIZED: Controlling signals using Pulse Repeaters", - "create.ponder.pulse_repeater.text_1": "UNLOCALIZED: Pulse Repeaters will shorten any redstone signal to a single pulse", - "create.ponder.radial_chassis.header": "UNLOCALIZED: Attaching blocks using Radial Chassis", "create.ponder.radial_chassis.text_1": "UNLOCALIZED: Radial Chassis connect to identical Chassis blocks in a row", "create.ponder.radial_chassis.text_2": "UNLOCALIZED: When one is moved by a Contraption, the others are dragged with it", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index 2a9c2ff80..981a503b5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 39", + "_": "Missing Localizations: 40", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "Akacjowa szyba okienna", "block.create.adjustable_chain_gearshift": "Regulowany przekładnik łańcuchowy", "block.create.adjustable_crate": "Regulowana skrzynka", - "block.create.adjustable_pulse_repeater": "Regulowany przekaźnik pulsu", - "block.create.adjustable_repeater": "Regulowany przekaźnik", "block.create.analog_lever": "Dźwignia analogowa", "block.create.andesite_belt_funnel": "Andezytowy lejek taśmowy", "block.create.andesite_bricks": "Andezytowe cegły", @@ -367,6 +365,7 @@ "block.create.powered_latch": "Zaawansowany zasilany przełącznik", "block.create.powered_toggle_latch": "Zasilany przełącznik", "block.create.pulley_magnet": "Krążek z magnesem", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "Przekaźnik pulsowy", "block.create.purple_nixie_tube": "Fioletowa lampa cyfrowa", "block.create.purple_sail": "Fioletowy żagiel", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "Transport przedmiotów", "create.ponder.tag.logistics.description": "Komponenty, które pomagają w transporcie przedmiotów", - "create.ponder.adjustable_pulse_repeater.header": "Kontrola sygnałów z wykorzystaniem regulowanych przekaźników pulsu", - "create.ponder.adjustable_pulse_repeater.text_1": "Regulowane przekaźniki pulsu emitują krótki puls po opóźnieniu", - "create.ponder.adjustable_pulse_repeater.text_2": "Używając rolki w myszce można modyfikować opóźnienie", - "create.ponder.adjustable_pulse_repeater.text_3": "Opóźnienia mogą mieć nawet do 30 minut", - - "create.ponder.adjustable_repeater.header": "Kontrola sygnałów z wykorzystaniem regulowanych przekaźników\n", - "create.ponder.adjustable_repeater.text_1": "Regulowane przekaźniki zachowują się podobnie do zwykłych przekaźników", - "create.ponder.adjustable_repeater.text_2": "Ładują się przez określony czas...", - "create.ponder.adjustable_repeater.text_3": "...i stygną przez ten sam czas", - "create.ponder.adjustable_repeater.text_4": "Używając rolki w myszce można modyfikować czas ładowania", - "create.ponder.adjustable_repeater.text_5": "Czasy ładowania mogą mieć nawet do 30 minut", - "create.ponder.analog_lever.header": "Kontrola sygnałów z wykorzystaniem dźwigni analogowej", "create.ponder.analog_lever.text_1": "Dźwignie analogowe są kompaktowymi i dokładnymi źródłami sygnału Redstone", "create.ponder.analog_lever.text_2": "Kliknij PPM, aby zwiększyć wysyłaną przez nie siłę sygnału ", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "włączone... wyłączone...", "create.ponder.powered_toggle_latch.text_4": "Zasilane przełączniki mogą też być przełączone ręcznie", - "create.ponder.pulse_repeater.header": "Kontrola sygnału z użyciem przekaźników pulsowych", - "create.ponder.pulse_repeater.text_1": "Przekaźniki pulsowe skrócą dowolny sygnał do pojedynczego pulsu", - "create.ponder.radial_chassis.header": "Przyłączanie bloków z użyciem stelaża promienistego", "create.ponder.radial_chassis.text_1": "Stelaże promieniste łączą się z identycznymi stelażami w jednym rzędzie", "create.ponder.radial_chassis.text_2": "Kiedy jeden z nich jest przesunięty, wszystkie inne również się przesuwają", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 32e2a0312..7187e1bbd 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1651", + "_": "Missing Localizations: 1640", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", "block.create.adjustable_chain_gearshift": "Correia Ajustável", "block.create.adjustable_crate": "Caixa Ajustável", - "block.create.adjustable_pulse_repeater": "Repetidor de Pulso Ajustável", - "block.create.adjustable_repeater": "Repetidor Ajustável", "block.create.analog_lever": "Alavanca Analógica", "block.create.andesite_belt_funnel": "Funil de Esteira de Andesito", "block.create.andesite_bricks": "Tijolos de Andesite", @@ -367,6 +365,7 @@ "block.create.powered_latch": "UNLOCALIZED: Powered Latch", "block.create.powered_toggle_latch": "UNLOCALIZED: Powered Toggle Latch", "block.create.pulley_magnet": "Imã da Polia", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "Repetidor de Pulso", "block.create.purple_nixie_tube": "UNLOCALIZED: Purple Nixie Tube", "block.create.purple_sail": "UNLOCALIZED: Purple Sail", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "UNLOCALIZED: Item Transportation", "create.ponder.tag.logistics.description": "UNLOCALIZED: Components which help moving items around", - "create.ponder.adjustable_pulse_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Pulse Repeaters", - "create.ponder.adjustable_pulse_repeater.text_1": "UNLOCALIZED: Adjustable Pulse Repeaters emit a short pulse at a delay", - "create.ponder.adjustable_pulse_repeater.text_2": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_pulse_repeater.text_3": "UNLOCALIZED: Configured delays can range up to 30 minutes", - - "create.ponder.adjustable_repeater.header": "UNLOCALIZED: Controlling signals using Adjustable Repeaters", - "create.ponder.adjustable_repeater.text_1": "UNLOCALIZED: Adjustable Repeaters behave similarly to regular Repeaters", - "create.ponder.adjustable_repeater.text_2": "UNLOCALIZED: They charge up for a set time...", - "create.ponder.adjustable_repeater.text_3": "UNLOCALIZED: ...and cool down for the same duration", - "create.ponder.adjustable_repeater.text_4": "UNLOCALIZED: Using the mouse wheel, the charge time can be configured", - "create.ponder.adjustable_repeater.text_5": "UNLOCALIZED: Configured delays can range up to 30 minutes", - "create.ponder.analog_lever.header": "UNLOCALIZED: Controlling signals using the Analog Lever", "create.ponder.analog_lever.text_1": "UNLOCALIZED: Analog Levers make for a compact and precise source of redstone power", "create.ponder.analog_lever.text_2": "UNLOCALIZED: Right-click to increase its analog power output", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "UNLOCALIZED: ...on and back off", "create.ponder.powered_toggle_latch.text_4": "UNLOCALIZED: Powered toggle latches can also be toggled manually", - "create.ponder.pulse_repeater.header": "UNLOCALIZED: Controlling signals using Pulse Repeaters", - "create.ponder.pulse_repeater.text_1": "UNLOCALIZED: Pulse Repeaters will shorten any redstone signal to a single pulse", - "create.ponder.radial_chassis.header": "UNLOCALIZED: Attaching blocks using Radial Chassis", "create.ponder.radial_chassis.text_1": "UNLOCALIZED: Radial Chassis connect to identical Chassis blocks in a row", "create.ponder.radial_chassis.text_2": "UNLOCALIZED: When one is moved by a Contraption, the others are dragged with it", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index a091dd584..32c14f3c6 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 44", + "_": "Missing Localizations: 45", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "Панель из акациевого окна", "block.create.adjustable_chain_gearshift": "Регулируемый цепной механизм", "block.create.adjustable_crate": "Регулируемый ящик", - "block.create.adjustable_pulse_repeater": "Регулируемый импульсный повторитель", - "block.create.adjustable_repeater": "Регулируемый повторитель", "block.create.analog_lever": "Аналоговый рычаг", "block.create.andesite_belt_funnel": "Андезитовая конвейерная воронка", "block.create.andesite_bricks": "Андезитовый кирпич", @@ -367,6 +365,7 @@ "block.create.powered_latch": "Питаемый рычаг", "block.create.powered_toggle_latch": "Питаемый рычаг-переключатель", "block.create.pulley_magnet": "Магнитный шкив", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "Импульсный повторитель", "block.create.purple_nixie_tube": "Фиолетовый газоразрядный индикатор", "block.create.purple_sail": "Фиолетовый парус", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "Транспортировка предметов", "create.ponder.tag.logistics.description": "Компоненты, помогающие перемещать предметы", - "create.ponder.adjustable_pulse_repeater.header": "Управлении сигналами с помощью Регулируемого импульсного повторителя", - "create.ponder.adjustable_pulse_repeater.text_1": "Регулируемые импульсные повторители испускают короткий импульс с задержкой", - "create.ponder.adjustable_pulse_repeater.text_2": "Используя колесо мыши, время зарядки может быть настроено", - "create.ponder.adjustable_pulse_repeater.text_3": "Настраиваемая задержка может достигать 30 минут", - - "create.ponder.adjustable_repeater.header": "Управлении сигналами с помощью Регулируемого повторителя", - "create.ponder.adjustable_repeater.text_1": "Регулируемые повторители ведут себя схожим образом с обычными Повторителями", - "create.ponder.adjustable_repeater.text_2": "Они заряжаются за заданное время...", - "create.ponder.adjustable_repeater.text_3": "...и разряжаются за столько же времени", - "create.ponder.adjustable_repeater.text_4": "Используя колесо мыши, время зарядки может быть настроено", - "create.ponder.adjustable_repeater.text_5": "Настраиваемая задержка может достигать 30 минут", - "create.ponder.analog_lever.header": "Управлении сигналами используя Аналоговый рычаг", "create.ponder.analog_lever.text_1": "Аналоговый рычаг создан как компактный и точный источник Редстоун сигнала", "create.ponder.analog_lever.text_2": "ПКМ, чтобы увеличить силу выходного сигнала", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "...включают и снова выключают", "create.ponder.powered_toggle_latch.text_4": "Питаемые рычаги-переключатели также можно переключать вручную", - "create.ponder.pulse_repeater.header": "Управлении сигналами при помощи Импульсных повторителей", - "create.ponder.pulse_repeater.text_1": "Импульсные повторители укоротят любой редстуон сигнал до одного импульса.", - "create.ponder.radial_chassis.header": "Присоединении блоков при помощи Радиальных шасси", "create.ponder.radial_chassis.text_1": "Радиальное шасси соединяются с идентичными блоками шасси в ряд", "create.ponder.radial_chassis.text_2": "Когда один блок перемещается штуковиной, остальные двигаются с ним", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index a59142a52..3b10f4b2b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 43", + "_": "Missing Localizations: 44", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "金合欢木窗户板", "block.create.adjustable_chain_gearshift": "可调节链式传动箱", "block.create.adjustable_crate": "可调节板条箱", - "block.create.adjustable_pulse_repeater": "可调节脉冲中继器", - "block.create.adjustable_repeater": "可调节中继器", "block.create.analog_lever": "模拟拉杆", "block.create.andesite_belt_funnel": "安山岩传送带漏斗", "block.create.andesite_bricks": "安山岩砖", @@ -367,6 +365,7 @@ "block.create.powered_latch": "锁存器", "block.create.powered_toggle_latch": "转换锁存器", "block.create.pulley_magnet": "滑轮磁铁", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "脉冲中继器", "block.create.purple_nixie_tube": "紫色辉光管", "block.create.purple_sail": "紫色风帆", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "物品运输", "create.ponder.tag.logistics.description": "该组件可以协助物品运输", - "create.ponder.adjustable_pulse_repeater.header": "使用可调节脉冲中继器控制信号发送", - "create.ponder.adjustable_pulse_repeater.text_1": "可调节脉冲中继器在一段延时之后会发出一道短时脉冲", - "create.ponder.adjustable_pulse_repeater.text_2": "滑动滚轮即可更改延时时间", - "create.ponder.adjustable_pulse_repeater.text_3": "延时配置范围的上限为 30 分钟", - - "create.ponder.adjustable_repeater.header": "使用可调节中继器控制信号发送", - "create.ponder.adjustable_repeater.text_1": "可调节中继器与常规的中继器的行为较为相似", - "create.ponder.adjustable_repeater.text_2": "它们会进行一段时间的充能,时长为设定的时间...", - "create.ponder.adjustable_repeater.text_3": "...然后以同样的时长逐渐退出充能状态", - "create.ponder.adjustable_repeater.text_4": "滑动滚轮即可更改充能时间", - "create.ponder.adjustable_repeater.text_5": "延时配置范围的上限为 30 分钟", - "create.ponder.analog_lever.header": "使用模拟拉杆控制信号发送", "create.ponder.analog_lever.text_1": "要想使得红石信号源信号强度精确且占地面积小,模拟拉杆不可少。", "create.ponder.analog_lever.text_2": "右击可以提升输出模拟信号的强度", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "...开启或者是关闭", "create.ponder.powered_toggle_latch.text_4": "你也可以手动切换其状态", - "create.ponder.pulse_repeater.header": "使用脉冲中继器控制信号", - "create.ponder.pulse_repeater.text_1": "脉冲中继器会将所有通入的红石信号缩减为一次脉冲", - "create.ponder.radial_chassis.header": "使用旋转底盘黏着方块", "create.ponder.radial_chassis.text_1": "同一行上的旋转底盘会相互连接在一起", "create.ponder.radial_chassis.text_2": "当其中的一个底盘被装置带动时,其余的底盘也会被带动", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index 102f8940b..4ea2e9bf2 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 58", + "_": "Missing Localizations: 59", "_": "->------------------------] Game Elements [------------------------<-", @@ -7,8 +7,6 @@ "block.create.acacia_window_pane": "相思木窗戶片", "block.create.adjustable_chain_gearshift": "可調式鏈式變速箱", "block.create.adjustable_crate": "可調式板條箱", - "block.create.adjustable_pulse_repeater": "可調式脈衝中繼器", - "block.create.adjustable_repeater": "可調式中繼器", "block.create.analog_lever": "可調式拉桿", "block.create.andesite_belt_funnel": "安山岩輸送帶漏斗", "block.create.andesite_bricks": "安山岩磚", @@ -367,6 +365,7 @@ "block.create.powered_latch": "閂鎖器", "block.create.powered_toggle_latch": "T型正反器", "block.create.pulley_magnet": "滑輪磁鐵", + "block.create.pulse_extender": "UNLOCALIZED: Pulse Extender", "block.create.pulse_repeater": "脈衝中繼器", "block.create.purple_nixie_tube": "紫色真空管", "block.create.purple_sail": "紫色風帆", @@ -1585,18 +1584,6 @@ "create.ponder.tag.logistics": "傳輸物品", "create.ponder.tag.logistics.description": "該裝置用於物品的傳輸", - "create.ponder.adjustable_pulse_repeater.header": "使用可調式脈衝中繼器來控制訊號", - "create.ponder.adjustable_pulse_repeater.text_1": "可調式脈衝中繼器每次運作時會產生一個短脈衝", - "create.ponder.adjustable_pulse_repeater.text_2": "使用滑鼠滾輪來設定啟動後到產生脈衝的延遲", - "create.ponder.adjustable_pulse_repeater.text_3": "延遲可設定到最大30分鐘", - - "create.ponder.adjustable_repeater.header": "使用可調式中繼器來控制訊號", - "create.ponder.adjustable_repeater.text_1": "可調式中繼器就像一般的中繼器", - "create.ponder.adjustable_repeater.text_2": "收到訊號後在設定好的時間過後才啟動...", - "create.ponder.adjustable_repeater.text_3": "...訊號停止後也需要相隔同樣的時間過後才會停止", - "create.ponder.adjustable_repeater.text_4": "使用滑鼠滾輪來設定延遲", - "create.ponder.adjustable_repeater.text_5": "延遲可設定到最大30分鐘", - "create.ponder.analog_lever.header": "使用可調式拉桿來控制訊號", "create.ponder.analog_lever.text_1": "可調式拉桿是一種小巧而輕準的紅石能源", "create.ponder.analog_lever.text_2": "右鍵來增加其紅石訊號輸出", @@ -2173,9 +2160,6 @@ "create.ponder.powered_toggle_latch.text_3": "...開啟或者是關閉", "create.ponder.powered_toggle_latch.text_4": "你也可以手動切換其狀態", - "create.ponder.pulse_repeater.header": "使用脈衝中繼器控制訊號", - "create.ponder.pulse_repeater.text_1": "脈衝中繼器會將所有通入的紅石訊號縮減為一次脈衝", - "create.ponder.radial_chassis.header": "使用旋轉底盤黏著方塊", "create.ponder.radial_chassis.text_1": "同一行上的旋轉底盤會相互連接在一起", "create.ponder.radial_chassis.text_2": "當其中的一個底盤被裝置帶動時,其餘的底盤也會被帶動", diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powered.json b/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powered.json deleted file mode 100644 index f1bbd00c2..000000000 --- a/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/diodes/adjustable_pulse_repeater", - "textures": { - "top": "create:block/diodes/adjustable_pulse_repeater/powered" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powered_powering.json b/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powered_powering.json deleted file mode 100644 index 3d698381e..000000000 --- a/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powered_powering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/diodes/adjustable_pulse_repeater", - "textures": { - "torch": "minecraft:block/redstone_torch", - "top": "create:block/diodes/adjustable_pulse_repeater/powered_powering" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powering.json b/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powering.json deleted file mode 100644 index 80fa085fe..000000000 --- a/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/diodes/adjustable_pulse_repeater", - "textures": { - "torch": "minecraft:block/redstone_torch", - "top": "create:block/diodes/adjustable_pulse_repeater/powering" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_repeater_powered.json b/src/generated/resources/assets/create/models/block/adjustable_repeater_powered.json deleted file mode 100644 index 0022dae18..000000000 --- a/src/generated/resources/assets/create/models/block/adjustable_repeater_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/diodes/adjustable_repeater", - "textures": { - "top": "create:block/diodes/adjustable_repeater/powered" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_repeater_powered_powering.json b/src/generated/resources/assets/create/models/block/adjustable_repeater_powered_powering.json deleted file mode 100644 index 2f6e70954..000000000 --- a/src/generated/resources/assets/create/models/block/adjustable_repeater_powered_powering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/diodes/adjustable_repeater", - "textures": { - "torch": "minecraft:block/redstone_torch", - "top": "create:block/diodes/adjustable_repeater/powered_powering" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/adjustable_repeater_powering.json b/src/generated/resources/assets/create/models/block/adjustable_repeater_powering.json deleted file mode 100644 index 942a6c584..000000000 --- a/src/generated/resources/assets/create/models/block/adjustable_repeater_powering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/diodes/adjustable_repeater", - "textures": { - "torch": "minecraft:block/redstone_torch", - "top": "create:block/diodes/adjustable_repeater/powering" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/pulse_extender_powered.json b/src/generated/resources/assets/create/models/block/pulse_extender_powered.json new file mode 100644 index 000000000..efc0a04c7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/pulse_extender_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/diodes/pulse_extender", + "textures": { + "top": "create:block/diodes/pulse_extender/powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/pulse_extender_powered_powering.json b/src/generated/resources/assets/create/models/block/pulse_extender_powered_powering.json new file mode 100644 index 000000000..9f27a6992 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/pulse_extender_powered_powering.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/pulse_extender", + "textures": { + "torch": "minecraft:block/redstone_torch", + "top": "create:block/diodes/pulse_extender/powered_powering" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/pulse_extender_powering.json b/src/generated/resources/assets/create/models/block/pulse_extender_powering.json new file mode 100644 index 000000000..a73bc0ea5 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/pulse_extender_powering.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/pulse_extender", + "textures": { + "torch": "minecraft:block/redstone_torch", + "top": "create:block/diodes/pulse_extender/powering" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/pulse_repeater_powered_powering.json b/src/generated/resources/assets/create/models/block/pulse_repeater_powered_powering.json new file mode 100644 index 000000000..aa68803fc --- /dev/null +++ b/src/generated/resources/assets/create/models/block/pulse_repeater_powered_powering.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/pulse_repeater", + "textures": { + "torch": "minecraft:block/redstone_torch", + "top": "create:block/diodes/pulse_repeater/powered_powering" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/pulse_repeater_powering.json b/src/generated/resources/assets/create/models/block/pulse_repeater_powering.json new file mode 100644 index 000000000..376f2666d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/pulse_repeater_powering.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/pulse_repeater", + "textures": { + "torch": "minecraft:block/redstone_torch", + "top": "create:block/diodes/pulse_repeater/powering" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/pulse_repeater_pulsing.json b/src/generated/resources/assets/create/models/block/pulse_repeater_pulsing.json deleted file mode 100644 index 0a09d2b03..000000000 --- a/src/generated/resources/assets/create/models/block/pulse_repeater_pulsing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/diodes/pulse_repeater", - "textures": { - "top": "create:block/diodes/pulse_repeater/powered", - "torch": "minecraft:block/redstone_torch" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/adjustable_pulse_repeater.json b/src/generated/resources/assets/create/models/item/adjustable_pulse_repeater.json deleted file mode 100644 index b5bf8a30a..000000000 --- a/src/generated/resources/assets/create/models/item/adjustable_pulse_repeater.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/diodes/adjustable_pulse_repeater", - "textures": { - "top": "create:block/diodes/adjustable_pulse_repeater/item" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/adjustable_repeater.json b/src/generated/resources/assets/create/models/item/adjustable_repeater.json deleted file mode 100644 index 075f54798..000000000 --- a/src/generated/resources/assets/create/models/item/adjustable_repeater.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/diodes/adjustable_repeater", - "textures": { - "top": "create:block/diodes/adjustable_repeater/item" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/pulse_extender.json b/src/generated/resources/assets/create/models/item/pulse_extender.json new file mode 100644 index 000000000..2e79ed83f --- /dev/null +++ b/src/generated/resources/assets/create/models/item/pulse_extender.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/diodes/pulse_extender", + "textures": { + "top": "create:block/diodes/pulse_extender/item" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/pulse_repeater.json b/src/generated/resources/assets/create/models/item/pulse_repeater.json index bb648b0e5..d5f32c00a 100644 --- a/src/generated/resources/assets/create/models/item/pulse_repeater.json +++ b/src/generated/resources/assets/create/models/item/pulse_repeater.json @@ -1,3 +1,6 @@ { - "parent": "create:block/diodes/pulse_repeater" + "parent": "create:block/diodes/pulse_repeater", + "textures": { + "top": "create:block/diodes/pulse_repeater/item" + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_pulse_repeater.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_pulse_repeater.json deleted file mode 100644 index 72a52cf20..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_pulse_repeater.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting/logistics/adjustable_pulse_repeater" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "forge:dusts/redstone" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:crafting/logistics/adjustable_pulse_repeater" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_repeater.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/pulse_extender.json similarity index 80% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_repeater.json rename to src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/pulse_extender.json index ede7f6671..7e9715387 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/adjustable_repeater.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/logistics/pulse_extender.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:crafting/logistics/adjustable_repeater" + "create:crafting/logistics/pulse_extender" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:crafting/logistics/adjustable_repeater" + "recipe": "create:crafting/logistics/pulse_extender" } } }, diff --git a/src/generated/resources/data/create/loot_tables/blocks/adjustable_pulse_repeater.json b/src/generated/resources/data/create/loot_tables/blocks/adjustable_pulse_repeater.json deleted file mode 100644 index f8cfb6324..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/adjustable_pulse_repeater.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create:adjustable_pulse_repeater" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/adjustable_repeater.json b/src/generated/resources/data/create/loot_tables/blocks/pulse_extender.json similarity index 87% rename from src/generated/resources/data/create/loot_tables/blocks/adjustable_repeater.json rename to src/generated/resources/data/create/loot_tables/blocks/pulse_extender.json index 5d9cc04de..46d8f4465 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/adjustable_repeater.json +++ b/src/generated/resources/data/create/loot_tables/blocks/pulse_extender.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:adjustable_repeater" + "name": "create:pulse_extender" } ], "conditions": [ diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/adjustable_pulse_repeater.json b/src/generated/resources/data/create/recipes/crafting/logistics/adjustable_pulse_repeater.json deleted file mode 100644 index 5cac4ee57..000000000 --- a/src/generated/resources/data/create/recipes/crafting/logistics/adjustable_pulse_repeater.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "SP" - ], - "key": { - "S": { - "item": "create:pulse_repeater" - }, - "P": { - "item": "create:adjustable_repeater" - } - }, - "result": { - "item": "create:adjustable_pulse_repeater" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/adjustable_repeater.json b/src/generated/resources/data/create/recipes/crafting/logistics/pulse_extender.json similarity index 78% rename from src/generated/resources/data/create/recipes/crafting/logistics/adjustable_repeater.json rename to src/generated/resources/data/create/recipes/crafting/logistics/pulse_extender.json index 66a256aa8..eb8ab8315 100644 --- a/src/generated/resources/data/create/recipes/crafting/logistics/adjustable_repeater.json +++ b/src/generated/resources/data/create/recipes/crafting/logistics/pulse_extender.json @@ -1,6 +1,7 @@ { "type": "minecraft:crafting_shaped", "pattern": [ + " T", "RCT", "SSS" ], @@ -9,7 +10,7 @@ "item": "minecraft:redstone_torch" }, "C": { - "item": "minecraft:clock" + "tag": "forge:plates/brass" }, "R": { "tag": "forge:dusts/redstone" @@ -19,6 +20,6 @@ } }, "result": { - "item": "create:adjustable_repeater" + "item": "create:pulse_extender" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/logistics/pulse_repeater.json b/src/generated/resources/data/create/recipes/crafting/logistics/pulse_repeater.json index 7c4461f17..f1891dfdb 100644 --- a/src/generated/resources/data/create/recipes/crafting/logistics/pulse_repeater.json +++ b/src/generated/resources/data/create/recipes/crafting/logistics/pulse_repeater.json @@ -1,13 +1,16 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "RRT", + "RCT", "SSS" ], "key": { "T": { "item": "minecraft:redstone_torch" }, + "C": { + "tag": "forge:plates/brass" + }, "R": { "tag": "forge:dusts/redstone" }, diff --git a/src/generated/resources/data/create/tags/blocks/safe_nbt.json b/src/generated/resources/data/create/tags/blocks/safe_nbt.json index d834c9f41..cd2ad9a8e 100644 --- a/src/generated/resources/data/create/tags/blocks/safe_nbt.json +++ b/src/generated/resources/data/create/tags/blocks/safe_nbt.json @@ -22,8 +22,8 @@ "create:creative_crate", "create:redstone_link", "create:analog_lever", - "create:adjustable_repeater", - "create:adjustable_pulse_repeater", + "create:pulse_repeater", + "create:pulse_extender", "#minecraft:signs" ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 6f2f4facb..4c0e7a314 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -132,12 +132,10 @@ import com.simibubi.create.content.logistics.block.depot.DepotBlock; import com.simibubi.create.content.logistics.block.depot.EjectorBlock; import com.simibubi.create.content.logistics.block.depot.EjectorItem; import com.simibubi.create.content.logistics.block.diodes.AbstractDiodeGenerator; -import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock; -import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterGenerator; +import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock; +import com.simibubi.create.content.logistics.block.diodes.BrassDiodeGenerator; 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.AndesiteFunnelBlock; @@ -1339,33 +1337,25 @@ public class AllBlocks { .transform(customItemModel()) .register(); - public static final BlockEntry PULSE_REPEATER = - REGISTRATE.block("pulse_repeater", PulseRepeaterBlock::new) - .initialProperties(() -> Blocks.REPEATER) - .blockstate(new PulseRepeaterGenerator()::generate) - .addLayer(() -> RenderType::cutoutMipped) - .item() - .transform(customItemModel("diodes", "pulse_repeater")) - .register(); - - public static final BlockEntry ADJUSTABLE_REPEATER = - REGISTRATE.block("adjustable_repeater", AdjustableRepeaterBlock::new) + public static final BlockEntry PULSE_REPEATER = + REGISTRATE.block("pulse_repeater", BrassDiodeBlock::new) .initialProperties(() -> Blocks.REPEATER) .tag(AllBlockTags.SAFE_NBT.tag) - .blockstate(new AdjustableRepeaterGenerator()::generate) + .blockstate(new BrassDiodeGenerator()::generate) + .addLayer(() -> RenderType::cutoutMipped) .item() - .model(AbstractDiodeGenerator.diodeItemModel(true)) + .model(AbstractDiodeGenerator::diodeItemModel) .build() .register(); - public static final BlockEntry ADJUSTABLE_PULSE_REPEATER = - REGISTRATE.block("adjustable_pulse_repeater", AdjustableRepeaterBlock::new) + public static final BlockEntry PULSE_EXTENDER = + REGISTRATE.block("pulse_extender", BrassDiodeBlock::new) .initialProperties(() -> Blocks.REPEATER) .tag(AllBlockTags.SAFE_NBT.tag) - .blockstate(new AdjustableRepeaterGenerator()::generate) + .blockstate(new BrassDiodeGenerator()::generate) .addLayer(() -> RenderType::cutoutMipped) .item() - .model(AbstractDiodeGenerator.diodeItemModel(true)) + .model(AbstractDiodeGenerator::diodeItemModel) .build() .register(); diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index c707584e6..9e052e48c 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -138,10 +138,10 @@ import com.simibubi.create.content.logistics.block.depot.DepotTileEntity; import com.simibubi.create.content.logistics.block.depot.EjectorInstance; import com.simibubi.create.content.logistics.block.depot.EjectorRenderer; import com.simibubi.create.content.logistics.block.depot.EjectorTileEntity; -import com.simibubi.create.content.logistics.block.diodes.AdjustablePulseRepeaterTileEntity; -import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterInstance; -import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterRenderer; -import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterTileEntity; +import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterTileEntity; +import com.simibubi.create.content.logistics.block.diodes.BrassDiodeInstance; +import com.simibubi.create.content.logistics.block.diodes.BrassDiodeRenderer; +import com.simibubi.create.content.logistics.block.diodes.PulseExtenderTileEntity; import com.simibubi.create.content.logistics.block.funnel.FunnelInstance; import com.simibubi.create.content.logistics.block.funnel.FunnelRenderer; import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; @@ -651,19 +651,19 @@ public class AllTileEntities { .renderer(() -> SmartTileEntityRenderer::new) .register(); - public static final TileEntityEntry ADJUSTABLE_REPEATER = Create.registrate() - .tileEntity("adjustable_repeater", AdjustableRepeaterTileEntity::new) - .instance(() -> AdjustableRepeaterInstance::new) - .validBlocks(AllBlocks.ADJUSTABLE_REPEATER) - .renderer(() -> AdjustableRepeaterRenderer::new) + public static final TileEntityEntry PULSE_EXTENDER = Create.registrate() + .tileEntity("adjustable_repeater", PulseExtenderTileEntity::new) + .instance(() -> BrassDiodeInstance::new) + .validBlocks(AllBlocks.PULSE_EXTENDER) + .renderer(() -> BrassDiodeRenderer::new) .register(); - public static final TileEntityEntry ADJUSTABLE_PULSE_REPEATER = + public static final TileEntityEntry PULSE_REPEATER = Create.registrate() - .tileEntity("adjustable_pulse_repeater", AdjustablePulseRepeaterTileEntity::new) - .instance(() -> AdjustableRepeaterInstance::new) - .validBlocks(AllBlocks.ADJUSTABLE_PULSE_REPEATER) - .renderer(() -> AdjustableRepeaterRenderer::new) + .tileEntity("adjustable_pulse_repeater", PulseRepeaterTileEntity::new) + .instance(() -> BrassDiodeInstance::new) + .validBlocks(AllBlocks.PULSE_REPEATER) + .renderer(() -> BrassDiodeRenderer::new) .register(); public static final TileEntityEntry LECTERN_CONTROLLER = diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java index 06758e184..89a74d08f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AbstractDiodeGenerator.java @@ -7,7 +7,6 @@ import com.simibubi.create.foundation.data.SpecialBlockStateGen; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.providers.RegistrateItemModelProvider; -import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.BlockItem; @@ -23,16 +22,11 @@ public abstract class AbstractDiodeGenerator extends SpecialBlockStateGen { private Vector models; - public static NonNullBiConsumer, RegistrateItemModelProvider> diodeItemModel( - boolean needsItemTexture) { - return (c, p) -> { - String name = c.getName(); - String path = "block/diodes/"; - ItemModelBuilder builder = p.withExistingParent(name, p.modLoc(path + name)); - if (!needsItemTexture) - return; - builder.texture("top", path + name + "/item"); - }; + public static void diodeItemModel(DataGenContext c, RegistrateItemModelProvider p) { + String name = c.getName(); + String path = "block/diodes/"; + ItemModelBuilder builder = p.withExistingParent(name, p.modLoc(path + name)); + builder.texture("top", path + name + "/item"); } @Override @@ -45,9 +39,10 @@ public abstract class AbstractDiodeGenerator extends SpecialBlockStateGen { return horizontalAngle(state.getValue(AbstractDiodeBlock.FACING)); } - abstract Vector createModels(DataGenContext ctx, BlockModelProvider prov); + protected abstract Vector createModels(DataGenContext ctx, + BlockModelProvider prov); - abstract int getModelIndex(BlockState state); + protected abstract int getModelIndex(BlockState state); @Override public final ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java deleted file mode 100644 index 8f9a020c8..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.simibubi.create.content.logistics.block.diodes; - -import static com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock.POWERING; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; - -public class AdjustablePulseRepeaterTileEntity extends AdjustableRepeaterTileEntity { - - public AdjustablePulseRepeaterTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { - super(type, pos, state); - } - - @Override - protected void updateState(boolean powered, boolean powering, boolean atMax, boolean atMin) { - if (!charging && powered && !atMax) - charging = true; - - if (charging && atMax) { - if (powering) { - level.setBlockAndUpdate(worldPosition, getBlockState().setValue(POWERING, false)); - charging = false; - return; - } - if (!powering && !level.isClientSide) - level.setBlockAndUpdate(worldPosition, getBlockState().setValue(POWERING, true)); - return; - } - - if (!charging && powered) - return; - - if (!charging && !atMin) { - if (!level.isClientSide) - level.setBlockAndUpdate(worldPosition, getBlockState().setValue(POWERING, false)); - state = 0; - return; - } - - state += charging ? 1 : 0; - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlock.java similarity index 72% rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlock.java index d74d55de0..f36c07932 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeBlock.java @@ -13,11 +13,11 @@ 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.BooleanProperty; -public class AdjustableRepeaterBlock extends AbstractDiodeBlock implements ITE { +public class BrassDiodeBlock extends AbstractDiodeBlock implements ITE { - public static BooleanProperty POWERING = BooleanProperty.create("powering"); + public static final BooleanProperty POWERING = BooleanProperty.create("powering"); - public AdjustableRepeaterBlock(Properties properties) { + public BrassDiodeBlock(Properties properties) { super(properties); registerDefaultState(defaultBlockState().setValue(POWERED, false) .setValue(POWERING, false)); @@ -41,7 +41,7 @@ public class AdjustableRepeaterBlock extends AbstractDiodeBlock implements ITE getTileEntityClass() { - return AdjustableRepeaterTileEntity.class; + public Class getTileEntityClass() { + return BrassDiodeTileEntity.class; } @Override - public BlockEntityType getTileEntityType() { - return AllBlocks.ADJUSTABLE_REPEATER.is(this) ? AllTileEntities.ADJUSTABLE_REPEATER.get() - : AllTileEntities.ADJUSTABLE_PULSE_REPEATER.get(); + public BlockEntityType getTileEntityType() { + return AllBlocks.PULSE_EXTENDER.is(this) ? AllTileEntities.PULSE_EXTENDER.get() + : AllTileEntities.PULSE_REPEATER.get(); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeGenerator.java similarity index 75% rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterGenerator.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeGenerator.java index 26a2460ae..6f52f2d1c 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeGenerator.java @@ -10,10 +10,10 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.client.model.generators.BlockModelProvider; import net.minecraftforge.client.model.generators.ModelFile; -public class AdjustableRepeaterGenerator extends AbstractDiodeGenerator { +public class BrassDiodeGenerator extends AbstractDiodeGenerator { @Override - Vector createModels(DataGenContext ctx, BlockModelProvider prov) { + protected Vector createModels(DataGenContext ctx, BlockModelProvider prov) { Vector models = makeVector(4); String name = ctx.getName(); ResourceLocation template = existing(name); @@ -32,8 +32,9 @@ public class AdjustableRepeaterGenerator extends AbstractDiodeGenerator { } @Override - int getModelIndex(BlockState state) { - return (state.getValue(AdjustableRepeaterBlock.POWERING) ? 2 : 0) + (state.getValue(AdjustableRepeaterBlock.POWERED) ? 1 : 0); + protected int getModelIndex(BlockState state) { + return (state.getValue(BrassDiodeBlock.POWERING) ? 2 : 0) + + (state.getValue(BrassDiodeBlock.POWERED) ? 1 : 0); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeInstance.java similarity index 81% rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterInstance.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeInstance.java index 76c4f94c2..47b3685de 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeInstance.java @@ -10,13 +10,13 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.foundation.utility.Color; -public class AdjustableRepeaterInstance extends TileEntityInstance implements ITickableInstance { +public class BrassDiodeInstance extends TileEntityInstance implements ITickableInstance { protected final ModelData indicator; protected int previousState; - public AdjustableRepeaterInstance(MaterialManager modelManager, AdjustableRepeaterTileEntity tile) { + public BrassDiodeInstance(MaterialManager modelManager, BrassDiodeTileEntity tile) { super(modelManager, tile); indicator = modelManager.defaultSolid() @@ -53,6 +53,6 @@ public class AdjustableRepeaterInstance extends TileEntityInstance { +public class BrassDiodeRenderer extends ColoredOverlayTileEntityRenderer { - public AdjustableRepeaterRenderer(BlockEntityRendererProvider.Context context) { + public BrassDiodeRenderer(BlockEntityRendererProvider.Context context) { super(context); } @Override - protected int getColor(AdjustableRepeaterTileEntity te, float partialTicks) { - return Color.mixColors(0x2C0300, 0xCD0000, te.state / (float) te.maxState.getValue()); + protected int getColor(BrassDiodeTileEntity te, float partialTicks) { + return Color.mixColors(0x2C0300, 0xCD0000, te.getProgress()); } @Override - protected SuperByteBuffer getOverlayBuffer(AdjustableRepeaterTileEntity te) { + protected SuperByteBuffer getOverlayBuffer(BrassDiodeTileEntity te) { return PartialBufferer.get(AllBlockPartials.FLEXPEATER_INDICATOR, te.getBlockState()); } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterScrollSlot.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollSlot.java similarity index 92% rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterScrollSlot.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollSlot.java index f1c1b03b9..c63eb8cd7 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterScrollSlot.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeScrollSlot.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.phys.Vec3; -public class AdjustableRepeaterScrollSlot extends ValueBoxTransform { +public class BrassDiodeScrollSlot extends ValueBoxTransform { @Override protected Vec3 getLocalOffset(BlockState state) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeTileEntity.java similarity index 72% rename from src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java rename to src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeTileEntity.java index 39077097c..696910f6b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/AdjustableRepeaterTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/BrassDiodeTileEntity.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.logistics.block.diodes; -import static com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock.POWERING; +import static com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock.POWERING; import java.util.List; @@ -19,28 +19,47 @@ import net.minecraft.world.level.block.DiodeBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -public class AdjustableRepeaterTileEntity extends SmartTileEntity implements IInstanceRendered { +public abstract class BrassDiodeTileEntity extends SmartTileEntity implements IInstanceRendered { - public int state; - public boolean charging; + protected int state; ScrollValueBehaviour maxState; - public AdjustableRepeaterTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { - super(type, pos, state); + public BrassDiodeTileEntity(BlockEntityType tileEntityTypeIn, BlockPos pos, BlockState state) { + super(tileEntityTypeIn, pos, state); } @Override public void addBehaviours(List behaviours) { - maxState = new ScrollValueBehaviour(Lang.translate("generic.delay"), this, new AdjustableRepeaterScrollSlot()) - .between(1, 60 * 20 * 30); + maxState = new ScrollValueBehaviour(Lang.translate("generic.delay"), this, new BrassDiodeScrollSlot()) + .between(2, 60 * 20 * 30); maxState.withStepFunction(this::step); maxState.withFormatter(this::format); maxState.withUnit(this::getUnit); maxState.withCallback(this::onMaxDelayChanged); - behaviours.add(maxState); } + public float getProgress() { + int max = Math.max(2, maxState.getValue()); + return Mth.clamp(state, 0, max) / (float) max; + } + + public boolean isIdle() { + return state == 0; + } + + @Override + public void tick() { + super.tick(); + boolean powered = getBlockState().getValue(DiodeBlock.POWERED); + boolean powering = getBlockState().getValue(POWERING); + boolean atMax = state >= maxState.getValue(); + boolean atMin = state <= 0; + updateState(powered, powering, atMax, atMin); + } + + protected abstract void updateState(boolean powered, boolean powering, boolean atMax, boolean atMin); + private void onMaxDelayChanged(int newMax) { state = Mth.clamp(state, 0, newMax); sendData(); @@ -49,14 +68,12 @@ public class AdjustableRepeaterTileEntity extends SmartTileEntity implements IIn @Override protected void fromTag(CompoundTag compound, boolean clientPacket) { state = compound.getInt("State"); - charging = compound.getBoolean("Charging"); super.fromTag(compound, clientPacket); } @Override public void write(CompoundTag compound, boolean clientPacket) { compound.putInt("State", state); - compound.putBoolean("Charging", charging); super.write(compound, clientPacket); } @@ -88,34 +105,4 @@ public class AdjustableRepeaterTileEntity extends SmartTileEntity implements IIn return Lang.translate("generic.unit.minutes"); } - @Override - public void tick() { - super.tick(); - boolean powered = getBlockState().getValue(DiodeBlock.POWERED); - boolean powering = getBlockState().getValue(POWERING); - boolean atMax = state >= maxState.getValue(); - boolean atMin = state <= 0; - updateState(powered, powering, atMax, atMin); - } - - protected void updateState(boolean powered, boolean powering, boolean atMax, boolean atMin) { - if (!charging && powered) - charging = true; - - if (charging && atMax) { - if (!powering && !level.isClientSide) - level.setBlockAndUpdate(worldPosition, getBlockState().setValue(POWERING, true)); - if (!powered) - charging = false; - return; - } - - if (!charging && atMin) { - if (powering && !level.isClientSide) - level.setBlockAndUpdate(worldPosition, getBlockState().setValue(POWERING, false)); - return; - } - - state += charging ? 1 : -1; - } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java index 1a69a05eb..7950696c9 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchBlock.java @@ -5,6 +5,8 @@ import java.util.Random; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionResult; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; @@ -43,10 +45,12 @@ public class PoweredLatchBlock extends ToggleLatchBlock { else if (side || back) tickpriority = TickPriority.VERY_HIGH; - if (worldIn.getBlockTicks().willTickThisTick(pos, this)) + if (worldIn.getBlockTicks() + .willTickThisTick(pos, this)) return; if (back != shouldBack || side != shouldSide) - worldIn.getBlockTicks().scheduleTick(pos, this, this.getDelay(state), tickpriority); + worldIn.getBlockTicks() + .scheduleTick(pos, this, this.getDelay(state), tickpriority); } protected boolean isPoweredOnSides(Level worldIn, BlockPos pos, BlockState state) { @@ -98,8 +102,11 @@ public class PoweredLatchBlock extends ToggleLatchBlock { protected InteractionResult activated(Level worldIn, BlockPos pos, BlockState state) { if (state.getValue(POWERED) != state.getValue(POWERED_SIDE)) return InteractionResult.PASS; - if (!worldIn.isClientSide) + if (!worldIn.isClientSide) { + float f = !state.getValue(POWERING) ? 0.6F : 0.5F; + worldIn.playSound(null, pos, SoundEvents.LEVER_CLICK, SoundSource.BLOCKS, 0.3F, f); worldIn.setBlock(pos, state.cycle(POWERING), 2); + } return InteractionResult.SUCCESS; } @@ -107,7 +114,8 @@ public class PoweredLatchBlock extends ToggleLatchBlock { public boolean canConnectRedstone(BlockState state, BlockGetter world, BlockPos pos, Direction side) { if (side == null) return false; - return side.getAxis().isHorizontal(); + return side.getAxis() + .isHorizontal(); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java index de8b7852e..290df7517 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PoweredLatchGenerator.java @@ -13,23 +13,23 @@ import net.minecraftforge.client.model.generators.ModelFile; public class PoweredLatchGenerator extends AbstractDiodeGenerator { @Override - Vector createModels(DataGenContext ctx, BlockModelProvider prov) { + protected Vector createModels(DataGenContext ctx, BlockModelProvider prov) { Vector models = makeVector(2); String name = ctx.getName(); ResourceLocation off = existing("latch_off"); ResourceLocation on = existing("latch_on"); - + models.add(prov.withExistingParent(name, off) .texture("top", texture(ctx, "idle"))); models.add(prov.withExistingParent(name + "_powered", on) .texture("top", texture(ctx, "powering"))); - + return models; } @Override - int getModelIndex(BlockState state) { - return state.getValue(PoweredLatchBlock.POWERING)? 1 : 0; + protected int getModelIndex(BlockState state) { + return state.getValue(PoweredLatchBlock.POWERING) ? 1 : 0; } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseExtenderTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseExtenderTileEntity.java new file mode 100644 index 000000000..1051b8107 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseExtenderTileEntity.java @@ -0,0 +1,35 @@ +package com.simibubi.create.content.logistics.block.diodes; + +import static com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock.POWERING; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +public class PulseExtenderTileEntity extends BrassDiodeTileEntity { + + public PulseExtenderTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + @Override + protected void updateState(boolean powered, boolean powering, boolean atMax, boolean atMin) { + if (atMin && !powered) + return; + if (atMin) { + level.setBlockAndUpdate(worldPosition, getBlockState().setValue(POWERING, true)); + state = maxState.getValue(); + return; + } + + if (state == 1) { + if (powering && !level.isClientSide) + level.setBlockAndUpdate(worldPosition, getBlockState().setValue(POWERING, false)); + if (!powered) + state = 0; + return; + } + + state--; + } +} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java deleted file mode 100644 index bc4608d2b..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterBlock.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.simibubi.create.content.logistics.block.diodes; - -import java.util.Random; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.TickPriority; -import net.minecraft.world.level.block.Block; -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.BooleanProperty; - -public class PulseRepeaterBlock extends AbstractDiodeBlock { - - public static BooleanProperty PULSING = BooleanProperty.create("pulsing"); - - public PulseRepeaterBlock(Properties properties) { - super(properties); - registerDefaultState(defaultBlockState().setValue(PULSING, false).setValue(POWERED, false)); - } - - @Override - protected int getDelay(BlockState state) { - return 1; - } - - @Override - public boolean canConnectRedstone(BlockState state, BlockGetter world, BlockPos pos, Direction side) { - if (side == null) - return false; - return side.getAxis() == state.getValue(FACING).getAxis(); - } - - @Override - public void tick(BlockState state, ServerLevel worldIn, BlockPos pos, Random random) { - boolean powered = state.getValue(POWERED); - boolean pulsing = state.getValue(PULSING); - boolean shouldPower = shouldTurnOn(worldIn, pos, state); - - if (pulsing) { - worldIn.setBlock(pos, state.setValue(POWERED, shouldPower).setValue(PULSING, false), 2); - } else if (powered && !shouldPower) { - worldIn.setBlock(pos, state.setValue(POWERED, false).setValue(PULSING, false), 2); - } else if (!powered) { - worldIn.setBlock(pos, state.setValue(POWERED, true).setValue(PULSING, true), 2); - worldIn.getBlockTicks().scheduleTick(pos, this, this.getDelay(state), TickPriority.HIGH); - } - - } - - @Override - protected int getOutputSignal(BlockGetter worldIn, BlockPos pos, BlockState state) { - return state.getValue(PULSING) ? 15 : 0; - } - - @Override - protected void createBlockStateDefinition(Builder builder) { - builder.add(FACING, POWERED, PULSING); - super.createBlockStateDefinition(builder); - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterGenerator.java deleted file mode 100644 index 229bcb49d..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterGenerator.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.simibubi.create.content.logistics.block.diodes; - -import java.util.Vector; - -import com.tterrag.registrate.providers.DataGenContext; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.client.model.generators.BlockModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; - -public class PulseRepeaterGenerator extends AbstractDiodeGenerator { - - @Override - Vector createModels(DataGenContext ctx, BlockModelProvider prov) { - Vector models = makeVector(3); - String name = ctx.getName(); - ResourceLocation template = existing(name); - - models.add(prov.getExistingFile(template)); - models.add(prov.withExistingParent(name + "_powered", template) - .texture("top", texture(ctx, "powered"))); - models.add(prov.withExistingParent(name + "_pulsing", template) - .texture("top", texture(ctx, "powered")) - .texture("torch", poweredTorch())); - - return models; - } - - @Override - int getModelIndex(BlockState state) { - return state.getValue(PulseRepeaterBlock.PULSING) ? 2 : state.getValue(PulseRepeaterBlock.POWERED) ? 1 : 0; - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterTileEntity.java new file mode 100644 index 000000000..330c7889a --- /dev/null +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/PulseRepeaterTileEntity.java @@ -0,0 +1,35 @@ +package com.simibubi.create.content.logistics.block.diodes; + +import static com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock.POWERING; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +public class PulseRepeaterTileEntity extends BrassDiodeTileEntity { + + public PulseRepeaterTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + @Override + protected void updateState(boolean powered, boolean powering, boolean atMax, boolean atMin) { + if (atMin && !powered) + return; + if (state > maxState.getValue() + 1) { + if (!powered && !powering) + state = 0; + return; + } + + state++; + if (level.isClientSide) + return; + + if (state == maxState.getValue() - 1 && !powering) + level.setBlockAndUpdate(worldPosition, getBlockState().cycle(POWERING)); + if (state == maxState.getValue() + 1 && powering) + level.setBlockAndUpdate(worldPosition, getBlockState().cycle(POWERING)); + } + +} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java index 375a0c7d1..4dc408e76 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java @@ -7,6 +7,8 @@ import com.simibubi.create.AllItems; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; @@ -70,8 +72,11 @@ public class ToggleLatchBlock extends AbstractDiodeBlock { } protected InteractionResult activated(Level worldIn, BlockPos pos, BlockState state) { - if (!worldIn.isClientSide) + if (!worldIn.isClientSide) { + float f = !state.getValue(POWERING) ? 0.6F : 0.5F; + worldIn.playSound(null, pos, SoundEvents.LEVER_CLICK, SoundSource.BLOCKS, 0.3F, f); worldIn.setBlock(pos, state.cycle(POWERING), 2); + } return InteractionResult.SUCCESS; } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java index 0cfa71706..9e09e32fd 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchGenerator.java @@ -13,7 +13,7 @@ import net.minecraftforge.client.model.generators.ModelFile; public class ToggleLatchGenerator extends AbstractDiodeGenerator { @Override - Vector createModels(DataGenContext ctx, BlockModelProvider prov) { + protected Vector createModels(DataGenContext ctx, BlockModelProvider prov) { String name = ctx.getName(); Vector models = makeVector(4); ResourceLocation off = existing("latch_off"); @@ -30,7 +30,7 @@ public class ToggleLatchGenerator extends AbstractDiodeGenerator { } @Override - int getModelIndex(BlockState state) { + protected int getModelIndex(BlockState state) { return (state.getValue(ToggleLatchBlock.POWERING) ? 2 : 0) + (state.getValue(ToggleLatchBlock.POWERED) ? 1 : 0); } diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index 9b994cf6d..fa14b8cca 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -855,24 +855,21 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("RCI") .pattern(" B ")), - ADJUSTABLE_REPEATER = create(AllBlocks.ADJUSTABLE_REPEATER).unlockedByTag(I::redstone) + PULSE_EXTENDER = create(AllBlocks.PULSE_EXTENDER).unlockedByTag(I::redstone) .viaShaped(b -> b.define('T', Blocks.REDSTONE_TORCH) - .define('C', Items.CLOCK) + .define('C', I.brassSheet()) .define('R', I.redstone()) .define('S', I.stone()) + .pattern(" T") .pattern("RCT") .pattern("SSS")), - ADJUSTABLE_PULSE_REPEATER = create(AllBlocks.ADJUSTABLE_PULSE_REPEATER).unlockedByTag(I::redstone) - .viaShaped(b -> b.define('S', AllBlocks.PULSE_REPEATER.get()) - .define('P', AllBlocks.ADJUSTABLE_REPEATER.get()) - .pattern("SP")), - PULSE_REPEATER = create(AllBlocks.PULSE_REPEATER).unlockedByTag(I::redstone) .viaShaped(b -> b.define('T', Blocks.REDSTONE_TORCH) + .define('C', I.brassSheet()) .define('R', I.redstone()) .define('S', I.stone()) - .pattern("RRT") + .pattern("RCT") .pattern("SSS")), POWERED_TOGGLE_LATCH = create(AllBlocks.POWERED_TOGGLE_LATCH).unlockedByTag(I::redstone) diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java index c9d85e4d1..04e0c1de5 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java @@ -277,12 +277,11 @@ public class PonderIndex { .addStoryBoard("portable_interface/redstone_fluid", MovementActorScenes::psiRedstone); // Redstone - HELPER.forComponents(AllBlocks.PULSE_REPEATER) - .addStoryBoard("pulse_repeater", RedstoneScenes::pulseRepeater); - HELPER.forComponents(AllBlocks.ADJUSTABLE_REPEATER) - .addStoryBoard("adjustable_repeater", RedstoneScenes::adjustableRepeater); - HELPER.forComponents(AllBlocks.ADJUSTABLE_PULSE_REPEATER) - .addStoryBoard("adjustable_pulse_repeater", RedstoneScenes::adjustablePulseRepeater); + // TODO simi +// HELPER.forComponents(AllBlocks.PULSE_EXTENDER) +// .addStoryBoard("adjustable_repeater", RedstoneScenes::adjustableRepeater); +// HELPER.forComponents(AllBlocks.PULSE_REPEATER) +// .addStoryBoard("adjustable_pulse_repeater", RedstoneScenes::adjustablePulseRepeater); HELPER.forComponents(AllBlocks.POWERED_LATCH) .addStoryBoard("powered_latch", RedstoneScenes::poweredLatch); HELPER.forComponents(AllBlocks.POWERED_TOGGLE_LATCH) @@ -419,9 +418,8 @@ public class PonderIndex { .add(AllBlocks.REDSTONE_CONTACT) .add(AllBlocks.ANALOG_LEVER) .add(AllBlocks.REDSTONE_LINK) - .add(AllBlocks.ADJUSTABLE_REPEATER) + .add(AllBlocks.PULSE_EXTENDER) .add(AllBlocks.PULSE_REPEATER) - .add(AllBlocks.ADJUSTABLE_PULSE_REPEATER) .add(AllBlocks.POWERED_LATCH) .add(AllBlocks.POWERED_TOGGLE_LATCH); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java index 045b28a95..cb79f8639 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/RedstoneScenes.java @@ -3,11 +3,10 @@ package com.simibubi.create.foundation.ponder.content; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.StickerTileEntity; -import com.simibubi.create.content.logistics.block.diodes.AdjustablePulseRepeaterTileEntity; -import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterBlock; -import com.simibubi.create.content.logistics.block.diodes.AdjustableRepeaterTileEntity; +import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterTileEntity; +import com.simibubi.create.content.logistics.block.diodes.PulseExtenderTileEntity; +import com.simibubi.create.content.logistics.block.diodes.BrassDiodeBlock; import com.simibubi.create.content.logistics.block.diodes.PoweredLatchBlock; -import com.simibubi.create.content.logistics.block.diodes.PulseRepeaterBlock; import com.simibubi.create.content.logistics.block.diodes.ToggleLatchBlock; import com.simibubi.create.content.logistics.block.redstone.AnalogLeverTileEntity; import com.simibubi.create.content.logistics.block.redstone.NixieTubeBlock; @@ -191,48 +190,6 @@ public class RedstoneScenes { scene.world.rotateSection(contact, 0, 10, 0, speed); } - public static void pulseRepeater(SceneBuilder scene, SceneBuildingUtil util) { - scene.title("pulse_repeater", "Controlling signals using Pulse Repeaters"); - scene.configureBasePlate(0, 0, 5); - scene.world.showSection(util.select.layer(0), Direction.UP); - - BlockPos circuitPos = util.grid.at(2, 1, 2); - BlockPos leverPos = util.grid.at(4, 1, 2); - - scene.world.showSection(util.select.layersFrom(1) - .substract(util.select.position(circuitPos)), Direction.UP); - scene.idle(10); - scene.world.showSection(util.select.position(circuitPos), Direction.DOWN); - scene.idle(20); - scene.effects.indicateRedstone(leverPos); - scene.world.toggleRedstonePower(util.select.fromTo(4, 1, 2, 0, 1, 2)); - scene.world.cycleBlockProperty(circuitPos, PulseRepeaterBlock.PULSING); - scene.idle(3); - scene.world.cycleBlockProperty(circuitPos, PulseRepeaterBlock.PULSING); - scene.world.toggleRedstonePower(util.select.position(1, 1, 2)); - scene.idle(2); - scene.world.toggleRedstonePower(util.select.position(0, 1, 2)); - - scene.idle(15); - scene.overlay.showText(70) - .text("Pulse Repeaters will shorten any redstone signal to a single pulse") - .placeNearTarget() - .attachKeyFrame() - .pointAt(util.vector.topOf(util.grid.at(0, 1, 2))); - scene.idle(60); - - scene.world.toggleRedstonePower(util.select.fromTo(4, 1, 2, 2, 1, 2)); - scene.idle(20); - scene.effects.indicateRedstone(leverPos); - scene.world.toggleRedstonePower(util.select.fromTo(4, 1, 2, 0, 1, 2)); - scene.world.cycleBlockProperty(circuitPos, PulseRepeaterBlock.PULSING); - scene.idle(3); - scene.world.cycleBlockProperty(circuitPos, PulseRepeaterBlock.PULSING); - scene.world.toggleRedstonePower(util.select.position(1, 1, 2)); - scene.idle(2); - scene.world.toggleRedstonePower(util.select.position(0, 1, 2)); - } - public static void adjustableRepeater(SceneBuilder scene, SceneBuildingUtil util) { scene.title("adjustable_repeater", "Controlling signals using Adjustable Repeaters"); scene.configureBasePlate(0, 0, 5); @@ -241,7 +198,7 @@ public class RedstoneScenes { BlockPos circuitPos = util.grid.at(2, 1, 2); BlockPos leverPos = util.grid.at(4, 1, 2); - scene.world.modifyTileNBT(util.select.position(circuitPos), AdjustableRepeaterTileEntity.class, + scene.world.modifyTileNBT(util.select.position(circuitPos), PulseExtenderTileEntity.class, nbt -> nbt.putInt("ScrollValue", 30)); scene.world.showSection(util.select.layersFrom(1) .substract(util.select.position(circuitPos)), Direction.UP); @@ -261,7 +218,7 @@ public class RedstoneScenes { scene.effects.indicateRedstone(leverPos); scene.world.toggleRedstonePower(util.select.fromTo(4, 1, 2, 2, 1, 2)); scene.idle(30); - scene.world.cycleBlockProperty(circuitPos, AdjustableRepeaterBlock.POWERING); + scene.world.cycleBlockProperty(circuitPos, BrassDiodeBlock.POWERING); scene.world.toggleRedstonePower(util.select.fromTo(1, 1, 2, 0, 1, 2)); scene.idle(15); @@ -274,7 +231,7 @@ public class RedstoneScenes { scene.effects.indicateRedstone(leverPos); scene.world.toggleRedstonePower(util.select.fromTo(4, 1, 2, 2, 1, 2)); scene.idle(30); - scene.world.cycleBlockProperty(circuitPos, AdjustableRepeaterBlock.POWERING); + scene.world.cycleBlockProperty(circuitPos, BrassDiodeBlock.POWERING); scene.world.toggleRedstonePower(util.select.fromTo(1, 1, 2, 0, 1, 2)); scene.idle(15); @@ -292,7 +249,7 @@ public class RedstoneScenes { .attachKeyFrame() .placeNearTarget() .pointAt(circuitTop); - scene.world.modifyTileNBT(util.select.position(circuitPos), AdjustableRepeaterTileEntity.class, + scene.world.modifyTileNBT(util.select.position(circuitPos), PulseExtenderTileEntity.class, nbt -> nbt.putInt("ScrollValue", 120)); scene.idle(70); @@ -304,7 +261,7 @@ public class RedstoneScenes { .placeNearTarget() .pointAt(circuitTop); scene.idle(60); - scene.world.cycleBlockProperty(circuitPos, AdjustableRepeaterBlock.POWERING); + scene.world.cycleBlockProperty(circuitPos, BrassDiodeBlock.POWERING); scene.world.toggleRedstonePower(util.select.fromTo(1, 1, 2, 0, 1, 2)); scene.idle(15); @@ -318,7 +275,7 @@ public class RedstoneScenes { BlockPos circuitPos = util.grid.at(2, 1, 2); BlockPos leverPos = util.grid.at(4, 1, 2); - scene.world.modifyTileNBT(util.select.position(circuitPos), AdjustablePulseRepeaterTileEntity.class, + scene.world.modifyTileNBT(util.select.position(circuitPos), PulseRepeaterTileEntity.class, nbt -> nbt.putInt("ScrollValue", 30)); scene.world.showSection(util.select.layersFrom(1) .substract(util.select.position(circuitPos)), Direction.UP); @@ -332,7 +289,7 @@ public class RedstoneScenes { scene.effects.indicateRedstone(leverPos); scene.world.toggleRedstonePower(util.select.fromTo(4, 1, 2, 2, 1, 2)); scene.idle(30); - scene.world.cycleBlockProperty(circuitPos, AdjustableRepeaterBlock.POWERING); + scene.world.cycleBlockProperty(circuitPos, BrassDiodeBlock.POWERING); scene.world.toggleRedstonePower(util.select.fromTo(1, 1, 2, 0, 1, 2)); scene.idle(3); scene.world.toggleRedstonePower(util.select.fromTo(1, 1, 2, 0, 1, 2)); @@ -355,7 +312,7 @@ public class RedstoneScenes { .attachKeyFrame() .placeNearTarget() .pointAt(circuitTop); - scene.world.modifyTileNBT(util.select.position(circuitPos), AdjustablePulseRepeaterTileEntity.class, + scene.world.modifyTileNBT(util.select.position(circuitPos), PulseRepeaterTileEntity.class, nbt -> nbt.putInt("ScrollValue", 120)); scene.idle(70); @@ -367,7 +324,7 @@ public class RedstoneScenes { .placeNearTarget() .pointAt(circuitTop); scene.idle(60); - scene.world.cycleBlockProperty(circuitPos, AdjustableRepeaterBlock.POWERING); + scene.world.cycleBlockProperty(circuitPos, BrassDiodeBlock.POWERING); scene.world.toggleRedstonePower(util.select.fromTo(1, 1, 2, 0, 1, 2)); scene.idle(3); scene.world.toggleRedstonePower(util.select.fromTo(1, 1, 2, 0, 1, 2)); diff --git a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java index 6b523163a..a2d2cde63 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/RemapHelper.java @@ -1,8 +1,6 @@ package com.simibubi.create.foundation.utility; import static com.simibubi.create.AllBlocks.ADJUSTABLE_CRATE; -import static com.simibubi.create.AllBlocks.ADJUSTABLE_PULSE_REPEATER; -import static com.simibubi.create.AllBlocks.ADJUSTABLE_REPEATER; import static com.simibubi.create.AllBlocks.ANDESITE_ENCASED_SHAFT; import static com.simibubi.create.AllBlocks.BRASS_BELT_FUNNEL; import static com.simibubi.create.AllBlocks.BRASS_TUNNEL; @@ -15,6 +13,8 @@ import static com.simibubi.create.AllBlocks.MECHANICAL_SAW; import static com.simibubi.create.AllBlocks.PISTON_EXTENSION_POLE; import static com.simibubi.create.AllBlocks.POWERED_LATCH; import static com.simibubi.create.AllBlocks.POWERED_TOGGLE_LATCH; +import static com.simibubi.create.AllBlocks.PULSE_EXTENDER; +import static com.simibubi.create.AllBlocks.PULSE_REPEATER; import static com.simibubi.create.AllBlocks.RADIAL_CHASSIS; import static com.simibubi.create.AllBlocks.REDSTONE_CONTACT; import static com.simibubi.create.AllBlocks.REDSTONE_LINK; @@ -108,7 +108,7 @@ public class RemapHelper { reMap.put("scoria_slab", Create.asResource("polished_scoria_slab")); reMap.put("birch_glass", BIRCH_WINDOW.getId()); reMap.put("saw", MECHANICAL_SAW.getId()); - reMap.put("flexpulsepeater", ADJUSTABLE_PULSE_REPEATER.getId()); + reMap.put("flexpulsepeater", PULSE_REPEATER.getId()); reMap.put("dolomite_wall", Create.asResource("polished_dolomite_wall")); reMap.put("gabbro_layers", Create.asResource("layered_gabbro")); reMap.put("scoria_wall", Create.asResource("polished_scoria_wall")); @@ -126,7 +126,7 @@ public class RemapHelper { reMap.put("granite_layers", Create.asResource("layered_granite")); reMap.put("indented_gabbro", Create.asResource("polished_gabbro")); reMap.put("drill", MECHANICAL_DRILL.getId()); - reMap.put("flexpeater", ADJUSTABLE_REPEATER.getId()); + reMap.put("flexpeater", PULSE_EXTENDER.getId()); reMap.put("rotation_chassis", RADIAL_CHASSIS.getId()); reMap.put("scoria_stairs", Create.asResource("polished_scoria_stairs")); reMap.put("weathered_limestone_wall", Create.asResource("polished_weathered_limestone_wall")); @@ -142,6 +142,9 @@ public class RemapHelper { reMap.put("translation_chassis_secondary", SECONDARY_LINEAR_CHASSIS.getId()); reMap.put("jungle_glass_pane", JUNGLE_WINDOW_PANE.getId()); reMap.put("piston_pole", PISTON_EXTENSION_POLE.getId()); + + reMap.put("adjustable_pulse_repeater", PULSE_REPEATER.getId()); + reMap.put("adjustable_repeater", PULSE_REPEATER.getId()); reMap.put("crushed_copper", CRUSHED_COPPER.getId()); reMap.put("empty_blueprint", SCHEMATIC.getId()); diff --git a/src/main/resources/assets/create/models/block/diodes/adjustable_pulse_repeater.json b/src/main/resources/assets/create/models/block/diodes/adjustable_pulse_repeater.json deleted file mode 100644 index 6481341d8..000000000 --- a/src/main/resources/assets/create/models/block/diodes/adjustable_pulse_repeater.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "top": "create:block/diodes/adjustable_pulse_repeater/idle", - "torch": "minecraft:block/redstone_torch_off", - "smooth_stone": "minecraft:block/smooth_stone", - "particle": "#top" - }, - "elements": [ - { - "name": "Top", - "from": [ 5, 2.1, 5 ], - "to": [ 11, 3.1, 11 ], - "faces": { - "north": { "texture": "#top", "uv": [ 5, 5, 11, 6 ], "rotation": 180 }, - "east": { "texture": "#top", "uv": [ 10, 5, 11, 11 ], "rotation": 90 }, - "south": { "texture": "#top", "uv": [ 5, 10, 11, 11 ] }, - "west": { "texture": "#top", "uv": [ 5, 11, 6, 5 ], "rotation": 90 }, - "up": { "texture": "#top", "uv": [ 5, 5, 11, 11 ] } - } - }, - { - "name": "circuit", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "east": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "west": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Front Torch", - "from": [ 6, 2, 2 ], - "to": [ 10, 8, 4 ], - "faces": { - "north": { "texture": "#torch", "uv": [ 6, 5, 10, 11 ] }, - "south": { "texture": "#torch", "uv": [ 6, 5, 10, 11 ] } - } - }, - { - "name": "Front Torch", - "from": [ 7, 2, 1 ], - "to": [ 9, 8, 5 ], - "faces": { - "east": { "texture": "#torch", "uv": [ 6, 5, 10, 11 ] }, - "west": { "texture": "#torch", "uv": [ 6, 5, 10, 11 ] } - } - }, - { - "name": "Front Torch Top", - "from": [ 7, 6, 2 ], - "to": [ 9, 7, 4 ], - "faces": { - "up": { "texture": "#torch", "uv": [ 7, 6, 9, 8 ] } - } - } - ], - "display": { - "gui": { - "rotation": [30, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [ 270, 0, 0 ], - "translation": [ 0, 0, -3], - "scale":[ 0.5, 0.5, 0.5 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/diodes/adjustable_repeater.json b/src/main/resources/assets/create/models/block/diodes/adjustable_repeater.json deleted file mode 100644 index cf137e612..000000000 --- a/src/main/resources/assets/create/models/block/diodes/adjustable_repeater.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "block/block", - "textures": { - "top": "create:block/diodes/adjustable_repeater/idle", - "smooth_stone": "minecraft:block/smooth_stone", - "torch": "minecraft:block/redstone_torch_off", - "particle": "#top" - }, - "elements": [ - { - "name": "Top", - "from": [ 5, 2.1, 5 ], - "to": [ 11, 3.1, 11 ], - "faces": { - "north": { "texture": "#top", "uv": [ 5, 5, 11, 6 ], "rotation": 180 }, - "east": { "texture": "#top", "uv": [ 10, 5, 11, 11 ], "rotation": 90 }, - "south": { "texture": "#top", "uv": [ 5, 10, 11, 11 ] }, - "west": { "texture": "#top", "uv": [ 5, 11, 6, 5 ], "rotation": 90 }, - "up": { "texture": "#top", "uv": [ 5, 5, 11, 11 ] } - } - }, - { - "name": "circuit", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "east": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "west": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 16 ] } - } - } - ], - "display": { - "gui": { - "rotation": [30, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [ 270, 0, 0 ], - "translation": [ 0, 0, -3], - "scale":[ 0.5, 0.5, 0.5 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/diodes/indicator.json b/src/main/resources/assets/create/models/block/diodes/indicator.json index 504b39f81..6a1d9ebec 100644 --- a/src/main/resources/assets/create/models/block/diodes/indicator.json +++ b/src/main/resources/assets/create/models/block/diodes/indicator.json @@ -1,6 +1,6 @@ { "textures": { - "flexpeater_off": "create:block/diodes/adjustable_repeater/idle" + "flexpeater_off": "create:block/diodes/pulse_repeater/idle" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/diodes/pulse_extender.json b/src/main/resources/assets/create/models/block/diodes/pulse_extender.json new file mode 100644 index 000000000..13e98e74f --- /dev/null +++ b/src/main/resources/assets/create/models/block/diodes/pulse_extender.json @@ -0,0 +1,101 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "4": "create:block/diodes/brass_diode_base", + "top": "create:block/diodes/pulse_extender/idle", + "torch": "block/redstone_torch_off", + "particle": "create:block/diodes/brass_diode_base" + }, + "elements": [ + { + "name": "Top", + "from": [5, 2.1, 5], + "to": [11, 3.1, 11], + "faces": { + "north": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#top"}, + "east": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#top"}, + "south": {"uv": [5, 10, 11, 11], "texture": "#top"}, + "west": {"uv": [5, 11, 6, 5], "rotation": 90, "texture": "#top"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#top"} + } + }, + { + "name": "circuit", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#4"}, + "east": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#4"}, + "south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}, + "west": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#4"} + } + }, + { + "name": "Front Torch", + "from": [3, 1, 1], + "to": [7, 7, 3], + "faces": { + "north": {"uv": [6, 5, 10, 11], "texture": "#torch"}, + "south": {"uv": [6, 5, 10, 11], "texture": "#torch"} + } + }, + { + "name": "Front Torch", + "from": [4, 1, 0], + "to": [6, 7, 4], + "faces": { + "east": {"uv": [6, 5, 10, 11], "texture": "#torch"}, + "west": {"uv": [6, 5, 10, 11], "texture": "#torch"} + } + }, + { + "name": "Front Torch Top", + "from": [4, 5, 1], + "to": [6, 6, 3], + "faces": { + "up": {"uv": [7, 6, 9, 8], "texture": "#torch"} + } + }, + { + "name": "Front Torch", + "from": [9, 1, 1], + "to": [13, 7, 3], + "faces": { + "north": {"uv": [6, 5, 10, 11], "texture": "#torch"}, + "south": {"uv": [6, 5, 10, 11], "texture": "#torch"} + } + }, + { + "name": "Front Torch", + "from": [10, 1, 0], + "to": [12, 7, 4], + "faces": { + "east": {"uv": [6, 5, 10, 11], "texture": "#torch"}, + "west": {"uv": [6, 5, 10, 11], "texture": "#torch"} + } + }, + { + "name": "Front Torch Top", + "from": [10, 5, 1], + "to": [12, 6, 3], + "faces": { + "up": {"uv": [7, 6, 9, 8], "texture": "#torch"} + } + } + ], + "display": { + "gui": { + "rotation": [30, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "rotation": [270, 0, 0], + "translation": [0, 0, -3], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json b/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json index 315d2fed2..86710126f 100644 --- a/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json +++ b/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json @@ -1,62 +1,75 @@ { - "parent": "block/block", - "textures": { - "top": "create:block/diodes/pulse_repeater/idle", - "torch": "minecraft:block/redstone_torch_off", - "smooth_stone": "minecraft:block/smooth_stone", - "particle": "#top" - }, - "elements": [ - { - "name": "circuit", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "east": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "west": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Front Torch", - "from": [ 6, 2, 3 ], - "to": [ 10, 8, 5 ], - "faces": { - "north": { "texture": "#torch", "uv": [ 6, 5, 10, 11 ] }, - "south": { "texture": "#torch", "uv": [ 6, 5, 10, 11 ] } - } - }, - { - "name": "Front Torch", - "from": [ 7, 2, 2 ], - "to": [ 9, 8, 6 ], - "faces": { - "east": { "texture": "#torch", "uv": [ 6, 5, 10, 11 ] }, - "west": { "texture": "#torch", "uv": [ 6, 5, 10, 11 ] } - } - }, - { - "name": "Front Torch Top", - "from": [ 7, 6, 3 ], - "to": [ 9, 7, 5 ], - "faces": { - "up": { "texture": "#torch", "uv": [ 7, 6, 9, 8 ] } - } - } - ], + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "4": "create:block/diodes/brass_diode_base", + "particle": "create:block/diodes/brass_diode_base", + "top": "create:block/diodes/pulse_repeater/idle", + "torch": "block/redstone_torch_off" + }, + "elements": [ + { + "name": "Top", + "from": [5, 2.1, 5], + "to": [11, 3.1, 11], + "faces": { + "north": {"uv": [5, 5, 11, 6], "rotation": 180, "texture": "#top"}, + "east": {"uv": [10, 5, 11, 11], "rotation": 90, "texture": "#top"}, + "south": {"uv": [5, 10, 11, 11], "texture": "#top"}, + "west": {"uv": [5, 11, 6, 5], "rotation": 90, "texture": "#top"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#top"} + } + }, + { + "name": "circuit", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#4"}, + "east": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#4"}, + "south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}, + "west": {"uv": [14, 0, 16, 16], "rotation": 90, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#4"} + } + }, + { + "name": "Front Torch", + "from": [6, 2, 1], + "to": [10, 8, 3], + "faces": { + "north": {"uv": [6, 5, 10, 11], "texture": "#torch"}, + "south": {"uv": [6, 5, 10, 11], "texture": "#torch"} + } + }, + { + "name": "Front Torch", + "from": [7, 2, 0], + "to": [9, 8, 4], + "faces": { + "east": {"uv": [6, 5, 10, 11], "texture": "#torch"}, + "west": {"uv": [6, 5, 10, 11], "texture": "#torch"} + } + }, + { + "name": "Front Torch Top", + "from": [7, 6, 1], + "to": [9, 7, 3], + "faces": { + "up": {"uv": [7, 6, 9, 8], "texture": "#torch"} + } + } + ], "display": { "gui": { "rotation": [30, 45, 0], "translation": [0, 2.5, 0], "scale": [0.625, 0.625, 0.625] }, - "fixed": { - "rotation": [ 270, 0, 0 ], - "translation": [ 0, 0, -3], - "scale":[ 0.5, 0.5, 0.5 ] - } - } + "fixed": { + "rotation": [270, 0, 0], + "translation": [0, 0, -3], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/idle.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/idle.png deleted file mode 100644 index fada44e77..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/idle.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/item.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/item.png deleted file mode 100644 index 98f9609d8..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/item.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered.png deleted file mode 100644 index c461f91be..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered_powering.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered_powering.png deleted file mode 100644 index c461f91be..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered_powering.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powering.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powering.png deleted file mode 100644 index fada44e77..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powering.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/idle.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/idle.png deleted file mode 100644 index 252534d88..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/idle.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/item.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/item.png deleted file mode 100644 index 44aca3a9e..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/item.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered.png deleted file mode 100644 index 69db5b633..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered_powering.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered_powering.png deleted file mode 100644 index 5e9895c0a..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered_powering.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powering.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powering.png deleted file mode 100644 index 8bc244e5f..000000000 Binary files a/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powering.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/diodes/brass_diode_base.png b/src/main/resources/assets/create/textures/block/diodes/brass_diode_base.png new file mode 100644 index 000000000..127b44f54 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/brass_diode_base.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_extender/idle.png b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/idle.png new file mode 100644 index 000000000..df0b2fbdb Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/idle.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_extender/item.png b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/item.png new file mode 100644 index 000000000..520ad9539 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/item.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powered.png b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powered.png new file mode 100644 index 000000000..78da222ec Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powered.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powered_powering.png b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powered_powering.png new file mode 100644 index 000000000..73d26df0b Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powered_powering.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powering.png b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powering.png new file mode 100644 index 000000000..34aa7d451 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/pulse_extender/powering.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/idle.png b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/idle.png index bccbf5d04..df8468414 100644 Binary files a/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/idle.png and b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/idle.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/item.png b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/item.png new file mode 100644 index 000000000..6fb1a2808 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/item.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered.png b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered.png index fe77e1238..6cf07cdae 100644 Binary files a/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered.png and b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered_powering.png b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered_powering.png new file mode 100644 index 000000000..b66f9a350 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered_powering.png differ diff --git a/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powering.png b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powering.png new file mode 100644 index 000000000..b53af1393 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powering.png differ