diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 342abde45..0bf66a51d 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,6 +1,10 @@ 16539ad12ee9e1ee004dec3fd62122b3e17c8e77 assets\create\blockstates\acacia_window.json f0d6baaabda94151134f569246d61a6e710c35a9 assets\create\blockstates\acacia_window_pane.json +55d57354040f4b5cefa2a9bfaf1cb777350fd699 assets\create\blockstates\adjustable_crate.json 029e6fbb2760f5a93575981372f394ed3f12ce7f assets\create\blockstates\adjustable_pulley.json +79c50afcea3a360783a5b3c73de9823511e9aed9 assets\create\blockstates\adjustable_pulse_repeater.json +1d730df54c9eae94063e37396d224fb3c87517e0 assets\create\blockstates\adjustable_repeater.json +9dd79bf5430f674e7d3e3fc7d59edee3d66e241e assets\create\blockstates\analog_lever.json 585481e97c5066af63ea12fa5dd658798844d64c assets\create\blockstates\andesite_bricks.json 4e8d61aa2c8490301317ef747f67f0169ebfc2ed assets\create\blockstates\andesite_bricks_slab.json da63a8be3191d6d72afef6c79e3aea3f607631f9 assets\create\blockstates\andesite_bricks_stairs.json @@ -13,6 +17,8 @@ a579c40c43dc2174afb66f42d00d0c4a0efaaeee assets\create\blockstates\andesite_bric 9210df936a886dc4727deec204f06359dd1f14e9 assets\create\blockstates\andesite_pillar.json f9fa6aa530eb0891a74eadfbebc663172a57147a assets\create\blockstates\basin.json 96a4fae5883eda130f8ec1a57d34534f6d0793c4 assets\create\blockstates\belt.json +40d10934934ea142d71fc6ce598b1455c3ad47b4 assets\create\blockstates\belt_observer.json +4325605fbdea60d5f54286c309c825bebcd74b95 assets\create\blockstates\belt_tunnel.json cf9045eb16e5299a1d917c4cb536289f49411276 assets\create\blockstates\birch_window.json 94a1a91403eb4b035fec48071e7fcae57a8a6abd assets\create\blockstates\birch_window_pane.json 8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets\create\blockstates\brass_block.json @@ -31,6 +37,7 @@ f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets\create\blockstates\copper_block. cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets\create\blockstates\copper_casing.json 3355a852cdc717e257ca19b3db836068964733e3 assets\create\blockstates\copper_ore.json dc76bca1fdd41c8e6ada27fd59a2b73d7adc9596 assets\create\blockstates\copper_shingles.json +3df0d5d5170a2f6cbab0f8a9bc8f2d64229589af assets\create\blockstates\creative_crate.json f0031f5e970b3d5695472ed384950b8631b015ed assets\create\blockstates\creative_motor.json 46af6c7d1e9041e44f5ea495b0b61dcf662b9b70 assets\create\blockstates\crushing_wheel.json a1dd6cb3daa97ea871290ef7b178d28b564ee2a2 assets\create\blockstates\crushing_wheel_controller.json @@ -71,6 +78,7 @@ f63a5816d4bfe643aa098d03c3b54462dd06fe19 assets\create\blockstates\dolomite_cobb 7b1c40891b07c8f3238537625d9e25c8627e7333 assets\create\blockstates\encased_belt.json 7b2b836649e729feafa60972bf95e3afb2143131 assets\create\blockstates\encased_fan.json 373ac3c29b553322291599e93eac12000c4a87f8 assets\create\blockstates\encased_shaft.json +1442ff1a0e404f99263ba99d734da1dfed03d4e3 assets\create\blockstates\extractor.json a774e815376a67e2a2de44e39af0a1a0b4406932 assets\create\blockstates\fancy_andesite_bricks.json 180be26a75834cf9cdb881f969f77906e91cc36a assets\create\blockstates\fancy_andesite_bricks_slab.json d5d7762b80952052d0a7adf3081967cac3f3ba6c assets\create\blockstates\fancy_andesite_bricks_stairs.json @@ -110,6 +118,7 @@ b2a7c321b1795f20e7433f81a55ce4683de081b8 assets\create\blockstates\fancy_weather e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets\create\blockstates\flywheel.json ac00d40e1ef50a37041c0481afa1a23a14dea78e assets\create\blockstates\framed_glass.json 61df7769fa61f6dd2868a4377e54320fdd473b4e assets\create\blockstates\framed_glass_pane.json +3cc74c51eb8fc2bbe9285ad0ae640ece0a602bae assets\create\blockstates\funnel.json 3cf49f4812732f00f578fa73785e14ffdf340f21 assets\create\blockstates\furnace_engine.json f512b70d7fd0ca10184f21f5bfb71c83ab11f8ef assets\create\blockstates\gabbro.json d2358eb3d9337741f55339f0b94b2e81d73965c8 assets\create\blockstates\gabbro_bricks.json @@ -159,6 +168,8 @@ e7c7b952137c4cb615988ea59b9f14303c9a4dfe assets\create\blockstates\limestone_bri 43532aec1893f7d2f37798d5dbb11ecde0a3bfab assets\create\blockstates\limestone_cobblestone_stairs.json 17c5a6c1dd094c9201ed90fdcebde620a8a39900 assets\create\blockstates\limestone_cobblestone_wall.json 48e4d5bce99d9aa2f629c3413f59ce1469da7e07 assets\create\blockstates\limestone_pillar.json +c793ab3aa6cf09d8d6d4136757629689f0365771 assets\create\blockstates\linked_extractor.json +c5422866667331f1d5cf6753c0889747ee02762b assets\create\blockstates\linked_transposer.json ddcf4bb281e046fbb1026b8f46a2cf12448598df assets\create\blockstates\mechanical_bearing.json 5586beef2d9183dc34d8e8d2723620c0569592ae assets\create\blockstates\mechanical_crafter.json d9afcfa27c42df5fd54a7b783acb0eb45ddf5aa5 assets\create\blockstates\mechanical_mixer.json @@ -255,10 +266,15 @@ c8467d55bc22d2e2256b8b732c06c9fdc64d336f assets\create\blockstates\polished_weat acec6cdebe772ca72de94a85d98199e827495acb assets\create\blockstates\polished_weathered_limestone_stairs.json f42ad32aefcfa7ccc6287f57ee1a5f092b65126f assets\create\blockstates\polished_weathered_limestone_wall.json b7829c2ef2c47188713f8cab21b2c9bc7f9c5b79 assets\create\blockstates\portable_storage_interface.json +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 +8929677f2cc5354aa19ef182af69f9f0b41eb242 assets\create\blockstates\redstone_contact.json +c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets\create\blockstates\redstone_link.json e2990fe70ad5d10437a376e70e167d1856277cc1 assets\create\blockstates\rope.json e14d5f7252105934295b4e156ec0e6d62d3d6b1c assets\create\blockstates\rope_pulley.json -c9f668eba43bb6deb536883f33a5b63d2f2cbbd6 assets\create\blockstates\rotation_chassis.json +e069278f8fb93cd4bb6afab3848e6f1560a04303 assets\create\blockstates\rotation_chassis.json cc4cf3420fa290cb844f9cf4dfdd836aa9b70500 assets\create\blockstates\rotation_speed_controller.json 56b63575c87065bc82eb9410175c501cdf959c66 assets\create\blockstates\saw.json 36592a6542332b35445931e8e9531adf786b63ba assets\create\blockstates\schematicannon.json @@ -279,14 +295,21 @@ e815bfd854c2653f10828bb11950f7fb991d7efc assets\create\blockstates\speedometer.j d62b7908119fa4f51715a186d0882b388bb25cab assets\create\blockstates\spruce_window.json 8d7dfa60630a8b4bae4e8eca5c66e1cfa34dda1f assets\create\blockstates\spruce_window_pane.json 3d93eabbb327aecc526beae9c62283f1d43eb710 assets\create\blockstates\sticky_mechanical_piston.json +f385988cb6fa9c48b5d59a6942ec50ed2b60c8bf assets\create\blockstates\stockpile_switch.json e815bfd854c2653f10828bb11950f7fb991d7efc assets\create\blockstates\stressometer.json 8b0c2c7ac72529565b3339aa8df7565858100afa assets\create\blockstates\tiled_glass.json a2454400b1cf9889f70aebdc89c52a1be25f543c assets\create\blockstates\tiled_glass_pane.json eb3bb63c9ca4ac2dda80a4afbcf5c2f5dd4950da assets\create\blockstates\translation_chassis.json 53725e7de23cc0bb49b12705441c4b12e5d72dfb assets\create\blockstates\translation_chassis_secondary.json +e122bf687d991dd2d7a05670039da7937f96ca05 assets\create\blockstates\transposer.json a8094531617e27a545c4815ab2062bf0ffca3633 assets\create\blockstates\turntable.json +d45450255fd7a64cfd2bd8856fd4cff01a49cc8d assets\create\blockstates\vertical_extractor.json 69dfe8afaa8eb6105dae9f76ab8b7847bf90b8c6 assets\create\blockstates\vertical_framed_glass.json c4db76b9d36cfb098df0d158cb6f8b82768ebe14 assets\create\blockstates\vertical_framed_glass_pane.json +3ecf6ddcf6d31a04b98e1d9a46a1db04278041d9 assets\create\blockstates\vertical_funnel.json +0ecc57db2487ed6b370b9cc43d2a873c61d7c37e assets\create\blockstates\vertical_linked_extractor.json +751b99625aca1b4122a0333bfaf93325d37eb003 assets\create\blockstates\vertical_linked_transposer.json +02199afb5b6ebcbc8e11567df05f39eface39e39 assets\create\blockstates\vertical_transposer.json d995547bcd71603ba7378d8998098e462030bfd0 assets\create\blockstates\water_wheel.json f182669f7547964f9f2ef67916568556870def7b assets\create\blockstates\weathered_limestone.json 27e6740834c0f673acc3531371512daa6dcab025 assets\create\blockstates\weathered_limestone_bricks.json @@ -300,8 +323,8 @@ c60c3115fd6eeaa3a696428a87a74d184ab7d62d assets\create\blockstates\weathered_lim 7e2476ffff93d0eedee5314e5692fcbf5692bffc assets\create\blockstates\weathered_limestone_pillar.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json -2b653a2b4e363bc91c4a56b082483fa9326d142e assets\create\lang\en_ud.json -a38c07513ebb78240dd4d8362dec06beadb057a5 assets\create\lang\en_us.json +efa942851f247891194d2c6ecdd8724a23b05aa0 assets\create\lang\en_ud.json +f2331719165149b6b3c90ca97f230a0138d20612 assets\create\lang\en_us.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json @@ -318,6 +341,12 @@ e4cf5269494e614eaa699b0ed104ca5829e86f26 assets\create\models\block\adjustable_p d190170ebddb64c7874ef18e380dc6ece8f46007 assets\create\models\block\adjustable_pulley_middle_vertical_powered.json 9eff0ff2df8f7baf5ad3c0f47730f6d260822e99 assets\create\models\block\adjustable_pulley_single.json 7f731fe96ca538256fb98ba77e8857edb5cd2306 assets\create\models\block\adjustable_pulley_single_powered.json +68ad5cab7a32235aabf060f05d72d5a2dcfd0e74 assets\create\models\block\adjustable_pulse_repeater_powered.json +415d9426fae5e6db7d09c9813d96db940e383eb7 assets\create\models\block\adjustable_pulse_repeater_powered_powering.json +cda6f9761431c5b8538f746db2dc55e5fb57bf01 assets\create\models\block\adjustable_pulse_repeater_powering.json +ce5e0cd1598cf2228bb77a68c304dd210f3848f8 assets\create\models\block\adjustable_repeater_powered.json +c82a31943f5adb4a64c6db4c48c94cbce5d95bc4 assets\create\models\block\adjustable_repeater_powered_powering.json +51cf61f8bc25cf62b0e0c0705c75512809358ff0 assets\create\models\block\adjustable_repeater_powering.json 4d412de3eb98dfee548a0dcdbae5d0168ac67123 assets\create\models\block\andesite_bricks.json 054ef3fff7f146dbf8adc92dc2b6d169c2bdb7a5 assets\create\models\block\andesite_bricks_slab.json 8784414839f6a5786bf43d6a7dff6c27bdf7fe46 assets\create\models\block\andesite_bricks_slab_top.json @@ -336,6 +365,22 @@ a033fbac3129bba9211c6c4a0e16c905643afa39 assets\create\models\block\andesite_cob 1c574ee47aeb6fcb305bfc95dd131e153b795a0e assets\create\models\block\andesite_cobblestone_wall_post.json 0ed983628e8868f77301bea1111570d3631f24fb assets\create\models\block\andesite_cobblestone_wall_side.json b1d0bb538fc8285b7d3fd77a977d78a104b83b62 assets\create\models\block\andesite_pillar.json +e8bfb63e0a4426f9d95cd111640169b218dead1b assets\create\models\block\belt_observer\detect.json +a2e63810eceb028484b193ddf4315e1811950dc8 assets\create\models\block\belt_observer\detect_belt.json +034c308d46def892e6638ac0b3374849a6a88a26 assets\create\models\block\belt_observer\detect_belt_powered.json +0bddcf5449e18abbc11e984f4b125141b14baaf7 assets\create\models\block\belt_observer\detect_powered.json +c521e51b557f4643027fe7a8ec9d4f6a4ade1279 assets\create\models\block\belt_observer\eject.json +79863633fc1fec21241650a5eb3203cf4d3fd210 assets\create\models\block\belt_observer\eject_belt.json +a6d8262629371113147f8b13986a6f72c51fc100 assets\create\models\block\belt_observer\eject_belt_powered.json +2dad3c6bd49c4b608ad7c30567bb3e5845c46cf8 assets\create\models\block\belt_observer\eject_powered.json +e1b801f2f37a78f18a787f4484f7b8ec57671c4f assets\create\models\block\belt_observer\pulse.json +fc6dd3e43af11ede6ef5d402d30715ebf69dac2e assets\create\models\block\belt_observer\pulse_belt.json +7d2490e4228ce4f0ee8875d5ac5fef92eea68015 assets\create\models\block\belt_observer\pulse_belt_powered.json +fa79580db6187c864bc8148a41987ecdd1eb03b7 assets\create\models\block\belt_observer\pulse_powered.json +4f14a279e486242a65b4d6dbcdfc33db9b71942b assets\create\models\block\belt_observer\split.json +670adf5eee3f7a4b99267bd837334be6a8173e4e assets\create\models\block\belt_observer\split_belt.json +819d3107908ce21220ad45b0ae3e1c92c13c601d assets\create\models\block\belt_observer\split_belt_powered.json +76078947044ca9fc7860708ae9717a0ae47ebb1e assets\create\models\block\belt_observer\split_powered.json 87f90e8256060683b834d57d3c11248d5ea84e34 assets\create\models\block\birch_window.json 94317904054cbf651846716d8af3bca618d3130f assets\create\models\block\birch_window_pane_noside.json 7a4cae5b075c4ac96a3113afafa391d024fc117f assets\create\models\block\birch_window_pane_noside_alt.json @@ -352,6 +397,16 @@ ac07568fa7b2d3fa84d0fe89a498514d30514291 assets\create\models\block\chiseled_sco ecb2b85ee210dce329d2be66b98d0f0d4e6fc223 assets\create\models\block\chiseled_weathered_limestone.json f9a3f0939ea43b404eb2826b94211a25fca5ebc2 assets\create\models\block\clockwork_bearing.json 70406933cc4fa5471af6e562fd84a397347dba17 assets\create\models\block\copper_casing.json +1ef7060b0ca7e9c0bfc8151f98ca08da31862cda assets\create\models\block\crate\brass\bottom.json +4ef2c7c3018f2d219f159a3ce58ceb00610b9c5d assets\create\models\block\crate\brass\left.json +c76cfec1279d307c52f9502fdba3425f38219168 assets\create\models\block\crate\brass\right.json +9e55a49ecb99841627f5c2560e5b3c67310919ee assets\create\models\block\crate\brass\single.json +a09f639bde4c61d68592eb06c807e7a6791ff950 assets\create\models\block\crate\brass\top.json +917914f6b8aa9234bbffb434ba07f706c5d1232a assets\create\models\block\crate\creative\bottom.json +03a56c112a947735ff1682d5d9c3202e7796bce9 assets\create\models\block\crate\creative\left.json +7635211e4d833748acaea37ea48b1f749c32ea5f assets\create\models\block\crate\creative\right.json +a123e3c8a9e2ea1665f268cf3991aa7e4b3119c6 assets\create\models\block\crate\creative\single.json +29ab5cfe7aed1271ede125e91bf78c1372b5f96e assets\create\models\block\crate\creative\top.json 57e70af1da4e971eca075616b787b70104189d60 assets\create\models\block\dark_oak_window.json c7b06bc1688f3f9417d38c492d83069f493df78e assets\create\models\block\dark_oak_window_pane_noside.json 3cf8adcb5d1c8f53d2144e1a85bebe593522a34e assets\create\models\block\dark_oak_window_pane_noside_alt.json @@ -755,6 +810,12 @@ e4e00e01fa479c6fc9aa450a2e7999ce94504987 assets\create\models\block\polished_sco 97c066d14c3ee37ce4f580d25d3c29ac94a6adf4 assets\create\models\block\polished_weathered_limestone_stairs_outer.json 6d690b231f60496f9b3103e71adda09f8e649158 assets\create\models\block\polished_weathered_limestone_wall_post.json ba4e86079668f2c03070c99b8d8ef642b60fd634 assets\create\models\block\polished_weathered_limestone_wall_side.json +1c5e97ce8e5b3f5b320873120a4f3084915c0af7 assets\create\models\block\powered_latch.json +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 +622239a3a09fcac7235b9670eb395a530839a59b assets\create\models\block\pulse_repeater_powered.json +0102e253c941904f12de7acdd46b0079ee3ccf69 assets\create\models\block\pulse_repeater_pulsing.json ba83f3402d6426173ee5ac3848d705164b7a3ee9 assets\create\models\block\rotation_chassis_side_x.json da79afd97a2e299cddc93befecc3e8d522835cc5 assets\create\models\block\rotation_chassis_side_x_sticky.json 78ed83b3d0471d617f828577e767f062e8fc08ba assets\create\models\block\rotation_chassis_side_y.json @@ -785,6 +846,13 @@ f39904a8a73a25e440d6a35fad931f8ce7ef165e assets\create\models\block\spruce_windo f15dfc9e4e6b991ee9fe10e8af3d9c98cb3d7e47 assets\create\models\block\spruce_window_pane_post.json 0e8be4d143d1fd8300c00ce709139a0e577cdec3 assets\create\models\block\spruce_window_pane_side.json aea7061aed39bc8c9ab51c8d7d0d86b11fc9e6b4 assets\create\models\block\spruce_window_pane_side_alt.json +3bda065e24a71b82b92b9c805790ba6d1791ef6a assets\create\models\block\stockpile_switch_0.json +335d6bc2b19d3cdbc9ed8b344142e2e3aa397994 assets\create\models\block\stockpile_switch_1.json +655d5cd249291a550bb3508c97f5a7a3606a7848 assets\create\models\block\stockpile_switch_2.json +cd8242a881e78831f6573c1fef99f9941ecf6ef7 assets\create\models\block\stockpile_switch_3.json +ad1950ba333cb2095c0dba5c0c020517acbfeb28 assets\create\models\block\stockpile_switch_4.json +ba22751c2d11fbe0ee03d90d408250edb4148080 assets\create\models\block\stockpile_switch_5.json +d6a49bf3c26ab83de70190db5f8a9c6dca85df52 assets\create\models\block\stockpile_switch_6.json 43d5aec0654274af2202374a77aab0e74ea7182c assets\create\models\block\tiled_glass.json 57ba644714ec486df776d75692b1793b2bda25db assets\create\models\block\tiled_glass_pane_noside.json 886fa013d1fd3bdefbc1aadf0b62e2777ceff4c9 assets\create\models\block\tiled_glass_pane_noside_alt.json @@ -827,7 +895,11 @@ c94c60d1d77404af7d74a29a094c7bdf7501b385 assets\create\models\block\zinc_block.j a3ff06384fff574ac4cd6c253259f0734b025cab assets\create\models\block\zinc_ore.json 67ef6fd6ec26fc216fa5319b8538beb223da1530 assets\create\models\item\acacia_window.json cbc0ebadda4497663437f99622914de678d0ffaf assets\create\models\item\acacia_window_pane.json +06d8b6e8f050b8ec0bef88b7633f3741baad4571 assets\create\models\item\adjustable_crate.json 10aba4b84af792048d27d3befb42d44b523b5f7d assets\create\models\item\adjustable_pulley.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 a513af38f164a48fd44693b70a93012f3546caff assets\create\models\item\andesite_bricks.json 851090d21c6e6c67444324d975c6b3270eaf4ff2 assets\create\models\item\andesite_bricks_slab.json d283f86cd05ed378efd82ce46cf49bc83783069b assets\create\models\item\andesite_bricks_stairs.json @@ -839,6 +911,8 @@ b0f664dd6de3d0ee9afcb6223fbcd53b97fa0d65 assets\create\models\item\andesite_cobb 4856d13a72ec0af9f10226b4a4bf0567eb580b9a assets\create\models\item\andesite_cobblestone_wall.json 75b8b00c2418b9660d35a7fabd0774925cf1c02f assets\create\models\item\andesite_pillar.json bf1fc6bdf7fca6f1958a2d3e96202c1cecb50669 assets\create\models\item\basin.json +695a69d5854e2eb134b55d855bd2b7b18808a01d assets\create\models\item\belt_observer.json +5006164d5bdb17cc5ec9759d7cdaf218e2b45f04 assets\create\models\item\belt_tunnel.json 9044243882cfd49a2827e1b910a4c9b0e46daa47 assets\create\models\item\birch_window.json 6ed49f59ea91068ef68720f43e67a9237594bdf0 assets\create\models\item\birch_window_pane.json 17d340c3678bd24cb085ba49490b2b4cb341a9e7 assets\create\models\item\brass_block.json @@ -857,6 +931,7 @@ dcb09deae110077bcddf090996b51cc66e9a7de3 assets\create\models\item\cogwheel.json 759bcb5fe7dfdd628716f9b4ff19a5ab00393381 assets\create\models\item\copper_casing.json 51be7da59368681522de870f1e09036dac55aa77 assets\create\models\item\copper_ore.json d7cb2f7bac8fae893fc5179af8140786a908f3f5 assets\create\models\item\copper_shingles.json +7b333dea353afaa27b182aedc647c9e9e34e92ef assets\create\models\item\creative_crate.json 5b39403f6c81f05e566b621b62e267267de47c41 assets\create\models\item\creative_motor.json 823c91f63565db54ec3944a1e90e7aee18e41062 assets\create\models\item\crushing_wheel.json dae5cffa4e1263d6a113469f79fba8695fa8232a assets\create\models\item\cuckoo_clock.json @@ -896,6 +971,7 @@ a2b3820eb87b5e3eaf0c315c4482ba24d9ebd610 assets\create\models\item\drill.json f2d6b88c3174de01e16da555236727efc33b490c assets\create\models\item\encased_belt.json 250bd0716cc1f04b03892ab74eb0b3a0f32a6158 assets\create\models\item\encased_fan.json e0f9ad7e7d790e9e21a38fa57395fd3ff892359b assets\create\models\item\encased_shaft.json +956646df2a75ed651eabb403a3f9e1024538cd56 assets\create\models\item\extractor.json efcbd30ad7a7658c02a3dc3de5fa0f21d7f49b54 assets\create\models\item\fancy_andesite_bricks.json 7ccd312084128c356307c7ca6e52c65d0a18907b assets\create\models\item\fancy_andesite_bricks_slab.json c8eee9d8df7af227eba051e4b9a7e48a79e682df assets\create\models\item\fancy_andesite_bricks_stairs.json @@ -935,6 +1011,7 @@ ce6ee1fe4a92e26af75c2eaebd5055efdbdff169 assets\create\models\item\fancy_scoria_ 8707332c0cb6ee123e7962d08536a60725c64ce8 assets\create\models\item\flywheel.json d62b93d3c274d280f3eec22a28b5175943411d25 assets\create\models\item\framed_glass.json 1041d462c6e856f7f3f2365c299c0599703d1ed7 assets\create\models\item\framed_glass_pane.json +2dc08da54182756cd3520f1420d0506ab50063e1 assets\create\models\item\funnel.json 0bee2855dc9bad52e941153b87e9c35797c246ee assets\create\models\item\furnace_engine.json 2c1608c114ccc285a84e936dc3f1233c535e1a26 assets\create\models\item\gabbro.json c35900cae8508c292a73239e560cebae17980f96 assets\create\models\item\gabbro_bricks.json @@ -984,6 +1061,8 @@ c26a0887356e9e55a0bdc3d885838e4722e0c0c2 assets\create\models\item\limestone_cob ebdf23b99b7895e347c29057c8070a6e16e56beb assets\create\models\item\limestone_cobblestone_stairs.json 8cd46904fd9709377d514e0faf9150ca317f6a9f assets\create\models\item\limestone_cobblestone_wall.json 8065de871ad2fbaed711735561b8ed91a2ce0004 assets\create\models\item\limestone_pillar.json +eb0053df13e362e0a05be65252944f0c94eab3db assets\create\models\item\linked_extractor.json +0242f25a8eb02b25f8b03344a1dfaf9ad0ab192c assets\create\models\item\linked_transposer.json 49dcc373c33f6fc3760add10eb51bd96cd4fd028 assets\create\models\item\mechanical_bearing.json 65ac4f19973ddeb1bb4d672f57319130e736e116 assets\create\models\item\mechanical_crafter.json 06553037470a5ca5386c0d0bb1011d20580c0e76 assets\create\models\item\mechanical_mixer.json @@ -1078,6 +1157,11 @@ e95125318055b8557afd7d108488cf0bdd81fe49 assets\create\models\item\polished_scor 6d92ee7112aa20e8a1adfe73d8933031c299bed1 assets\create\models\item\polished_weathered_limestone_stairs.json b4995fb4799f33508cd6bf2ded80c0b3e866ad43 assets\create\models\item\polished_weathered_limestone_wall.json ef2c9dcd5f6385a0f0cdc2e9120c984827863100 assets\create\models\item\portable_storage_interface.json +1e501c1f2e9250aaaadcf17db62646d08177d4e1 assets\create\models\item\powered_latch.json +3a6dfc7f36e31ebfcd650c3144a7f2210e8a4f9f assets\create\models\item\powered_toggle_latch.json +4b8a27ff05ed5331889dfc4b0b4562f3e94b0dfe assets\create\models\item\pulse_repeater.json +b9a4ac219a27e60a82f55129f2df5ae6183981e2 assets\create\models\item\redstone_contact.json +52e561abeb954d0349e640566de92ef80ccbf919 assets\create\models\item\redstone_link.json 6daff6b82b33374d7add65e352e05ecb2fd9ebdd assets\create\models\item\rope_pulley.json 1c76eabeac012b18ef0b7cf2ec7ed794877c1d98 assets\create\models\item\rotation_chassis.json acfbf487ee65c2c58d89cb2644e33fda75751fde assets\create\models\item\rotation_speed_controller.json @@ -1100,11 +1184,13 @@ d6fb0d38b1b5bcc199b52ac8889eaecd167f6725 assets\create\models\item\speedometer.j b305e81f1dc5272634745b6e822af40955a2ef28 assets\create\models\item\spruce_window.json 5f622bca8386b8dd077310647e39ac3abb80c6a1 assets\create\models\item\spruce_window_pane.json 891abc24593d53d282773eca5534065056d89b4c assets\create\models\item\sticky_mechanical_piston.json +bbb5773adc23128c70174bfc531af936e6e063e3 assets\create\models\item\stockpile_switch.json bab8f78c319b2a79ed55c5d2a94b521ddaa44996 assets\create\models\item\stressometer.json b1d3d00ff05908feacad06a86800da96cc9bc65d assets\create\models\item\tiled_glass.json 8a2a81a8cbc52b6021e57107d79a32f73b82d8fe assets\create\models\item\tiled_glass_pane.json f368a48b20fa0948a4dc61cb7169f2a4c8720d65 assets\create\models\item\translation_chassis.json 2b7e6213706c9f107a74971818bafad8902c081c assets\create\models\item\translation_chassis_secondary.json +a9f6592275a4c8592e3c88a95fbe88bd93de67c6 assets\create\models\item\transposer.json fb24881c4e92bbb7ffa54a71e0af6b1c66d84829 assets\create\models\item\turntable.json 32f49b724af10c8d7e2ed5a3c82280e83b75f789 assets\create\models\item\vertical_framed_glass.json 5e331da9d4086412f5722923e3008246ed286a00 assets\create\models\item\vertical_framed_glass_pane.json @@ -1165,7 +1251,10 @@ ff5f41874304e709d6f3a59da00edd033047b81b data\create\advancements\upgraded_zappe d9bc04a6d11fb4fac6ed43982d3db5d34e8bdc65 data\create\advancements\zapper.json aa22b35bb0564055114dcec6dca8a2d603de2481 data\create\loot_tables\blocks\acacia_window.json 6bd966ac4678affb255d64fe0aea7fc0f2448757 data\create\loot_tables\blocks\acacia_window_pane.json +191b117d0a25940248ed54d419ea0bb0afb482d0 data\create\loot_tables\blocks\adjustable_crate.json 3e1314b2ccb1eade4f8ff7caa429ce4b327f0d6b data\create\loot_tables\blocks\adjustable_pulley.json +417da41ebd0520ae22ddc3541eb490daf2af95dd data\create\loot_tables\blocks\adjustable_pulse_repeater.json +d0ba402852cea164f6d279a9b37cc38ac3958574 data\create\loot_tables\blocks\adjustable_repeater.json 0d139e302f4a11438b0acd664c0df15b41040f69 data\create\loot_tables\blocks\analog_lever.json 1d04146c468ce4bf898b596c171b3ba3146d7d66 data\create\loot_tables\blocks\andesite_bricks.json b67ea51eaed1e847317829636cbf5967522e73d1 data\create\loot_tables\blocks\andesite_bricks_slab.json @@ -1179,7 +1268,7 @@ cb36b039a511aca643fe674a63de8d6ad8478256 data\create\loot_tables\blocks\andesite 6908f62c809ea2105bc92765d84d5655197346ab data\create\loot_tables\blocks\andesite_pillar.json 14bf1764b9313893b6a6f57094f9506ac9fa71a8 data\create\loot_tables\blocks\basin.json c7f81e30c31837a287d6d6040cdb02c7dec11441 data\create\loot_tables\blocks\belt.json -d412419824ca0938d6047169b3f97491363c3519 data\create\loot_tables\blocks\belt_funnel.json +1104e323abb2a8c25769c47dc5d1154965113cc9 data\create\loot_tables\blocks\belt_observer.json f2acadb49cac3aa6347cae606536cbbde89f0a5f data\create\loot_tables\blocks\belt_tunnel.json 1818b0b62c1e2ad8b030638a59fd7132a4b7bd0a data\create\loot_tables\blocks\birch_window.json 151728f0001f3e890bf05535075224c25caa775c data\create\loot_tables\blocks\birch_window_pane.json @@ -1195,7 +1284,6 @@ adde89e46b12de1eee6fd0c5cb98c5f45feefc15 data\create\loot_tables\blocks\chiseled 778b53c36d73b6e9c78fd6c091c9c3535c3c18f7 data\create\loot_tables\blocks\clockwork_bearing.json d76113310fc56eca6382d44df174096f2210d416 data\create\loot_tables\blocks\clutch.json 673ba3a5deae9133b917d16c9eb87fe4c2873c8a data\create\loot_tables\blocks\cogwheel.json -875c9a31f4d0b99589b3aac4072bef1d68dd739b data\create\loot_tables\blocks\contact.json f38802b919c49f162f102d6e5d94113f05bf4ab1 data\create\loot_tables\blocks\copper_block.json 5a65a18ea787130ac7b8f5652bfa5ed187446649 data\create\loot_tables\blocks\copper_casing.json 31a51237763c374b7cdf39b9b62c14e965871047 data\create\loot_tables\blocks\copper_ore.json @@ -1241,8 +1329,7 @@ a99446c05e1896f3a280e17b47ec4d4b0e81987d data\create\loot_tables\blocks\drill.js 503a93787537b46f462d32b0382c3396f42bb1f6 data\create\loot_tables\blocks\encased_belt.json 9055d82b983b673e1638d17b712b9fcd1f5a52e6 data\create\loot_tables\blocks\encased_fan.json b3849bece65e13128fdeb033b156cf6615bc72f8 data\create\loot_tables\blocks\encased_shaft.json -ba8b644744aad24b6e64340e6d38779fcf04f1f5 data\create\loot_tables\blocks\entity_detector.json -5a47c1535c866184b4ffca65763f5676f319e0aa data\create\loot_tables\blocks\extractor.json +205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\extractor.json ddfc4764a6039d771e03af815ac4493da80d2e6b data\create\loot_tables\blocks\fancy_andesite_bricks.json 31f2e6932505c68b28e92221a37144f69161c376 data\create\loot_tables\blocks\fancy_andesite_bricks_slab.json 413c8bb80954679796cd9d18f808c28a7bdbe681 data\create\loot_tables\blocks\fancy_andesite_bricks_stairs.json @@ -1279,12 +1366,10 @@ a919a7333a2309392ba6908cd2330d014c0b44da data\create\loot_tables\blocks\fancy_li e4d0fe35d3441a5815bd4e1357329b284e63ecd8 data\create\loot_tables\blocks\fancy_weathered_limestone_bricks_slab.json 1be3aae5c0aa8b3c3750db79699e9350adb12231 data\create\loot_tables\blocks\fancy_weathered_limestone_bricks_stairs.json 6bb505bad78cbb01a5cb5a069435bf4ed0e62adf data\create\loot_tables\blocks\fancy_weathered_limestone_bricks_wall.json -b46ba25047a3abd3efc6ca66fda9036d2aa4670b data\create\loot_tables\blocks\flexcrate.json -85f8074f009acc2229f3098e11751aabdf97c6bd data\create\loot_tables\blocks\flexpeater.json -bd7bcf6af7044c4c08f4dee85755c9b528b89e08 data\create\loot_tables\blocks\flexpulsepeater.json f37526c092c645045c22674dea6c7b1ec503c9c3 data\create\loot_tables\blocks\flywheel.json 8fbd865f350c615031ec3f56eb98b51ce3008de3 data\create\loot_tables\blocks\framed_glass.json 44c8bc7271fa367ff052bef242e1ae26fb435175 data\create\loot_tables\blocks\framed_glass_pane.json +205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\funnel.json 4063880eda871fe63a4eb549a19daecabce849e5 data\create\loot_tables\blocks\furnace_engine.json 1070cba1c0f46cf7ebe31089f35333f5eadda6e4 data\create\loot_tables\blocks\gabbro.json 0356e003d8890d31b89d0ad98e32aae892da71f9 data\create\loot_tables\blocks\gabbro_bricks.json @@ -1335,7 +1420,7 @@ cb315814960850b5080598b89ee94c833b5048f7 data\create\loot_tables\blocks\limeston 92fb16606f289ad33860270d098fad2522b24e09 data\create\loot_tables\blocks\limestone_cobblestone_wall.json 371115e5ceb08c07a9ab2371509960c31e0baa8a data\create\loot_tables\blocks\limestone_pillar.json dac789cf53b00eed34308848b5e267b7ccec090c data\create\loot_tables\blocks\linked_extractor.json -7af5a13c9e10903b11732fbc01ae3299328216f0 data\create\loot_tables\blocks\linked_transposer.json +205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\linked_transposer.json 90ddf7b5c3b61758a4ad12a1e6ef16fe6ebf7794 data\create\loot_tables\blocks\mechanical_bearing.json e93872a90e4f4642a003539e7db28fdacfdcd114 data\create\loot_tables\blocks\mechanical_crafter.json b12efeeef5682966016ce6ea2d171eecd33d9667 data\create\loot_tables\blocks\mechanical_mixer.json @@ -1432,10 +1517,12 @@ c7029af40b6f5dd2cd8f2ae7dfb89b37074624e6 data\create\loot_tables\blocks\polished 6ef650c723d409c7a678ffac45212e22e37581c0 data\create\loot_tables\blocks\polished_weathered_limestone_stairs.json 58715bc033e4740dbb754f91c93a22b9d06828e6 data\create\loot_tables\blocks\polished_weathered_limestone_wall.json fbe98efcb1a5970b6795fdbbb671fee704c0945f data\create\loot_tables\blocks\portable_storage_interface.json +6a46f00d9de7050eb9748d5dbed182caa6b29949 data\create\loot_tables\blocks\powered_latch.json +a3fb7d3e3bf9dc73ce754002f10c469d57db1f71 data\create\loot_tables\blocks\powered_toggle_latch.json 205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\pulley_magnet.json e8fb62c91226ac107dee45c5ebc54c8dd0aee224 data\create\loot_tables\blocks\pulse_repeater.json -c1f37a81f7bef557e7814e6d6e8ba2cab3a7ecaf data\create\loot_tables\blocks\redstone_bridge.json -96278b9e2a3eaf01a58975eca87e6fa8e74c7726 data\create\loot_tables\blocks\redstone_latch.json +f5907a694206facc01f61f3428f72488486761c7 data\create\loot_tables\blocks\redstone_contact.json +886a0c1386fb12104b736a15689030aaff771270 data\create\loot_tables\blocks\redstone_link.json 205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\rope.json cecaac07bd275bb1ae9e302f0bf44b581e74105d data\create\loot_tables\blocks\rope_pulley.json 464bea346c5a747b1227f4c28930ff019a737c14 data\create\loot_tables\blocks\rotation_chassis.json @@ -1459,14 +1546,13 @@ b127cb6920e6d7d9c8b2402cb186402a9a8dd3fc data\create\loot_tables\blocks\shaft.js de7b316679373e65101819aaa869a943a5d50c5e data\create\loot_tables\blocks\spruce_window.json d43db633e13e073a7e255495ed9fec0cb0e4917d data\create\loot_tables\blocks\spruce_window_pane.json 8d2970acd61b96844a4308d87e858b1612d5862e data\create\loot_tables\blocks\sticky_mechanical_piston.json -23d01336968c748272f597d8925663cce0cfed1e data\create\loot_tables\blocks\stockswitch.json +ec2889e712702644092197a4b41a682fb953817d data\create\loot_tables\blocks\stockpile_switch.json 3479775008a256bc35f98b31655975f7d5c836b2 data\create\loot_tables\blocks\stressometer.json 05e843ca6eb5e299bf41de123977a1045c120ad4 data\create\loot_tables\blocks\tiled_glass.json 2082f3fb39185cb65555ab93178081a2f53f6046 data\create\loot_tables\blocks\tiled_glass_pane.json -8e5c0cec6e9ea59767d8e0fffe590cffd4a058b0 data\create\loot_tables\blocks\toggle_latch.json d95e09420ef7580779c71888d043aa5b4c56c725 data\create\loot_tables\blocks\translation_chassis.json 7c70f942b2ffb58a3fb894e57ce4e445b9007be2 data\create\loot_tables\blocks\translation_chassis_secondary.json -b201436ae6d2ad5a7d47dca0ee8c7016b4c28fa5 data\create\loot_tables\blocks\transposer.json +205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\transposer.json 7b66ad2c48449bafd0cdbd086ac41218cb73a814 data\create\loot_tables\blocks\turntable.json eb3086010565ff1e83e30aa3712f82819bcc0e99 data\create\loot_tables\blocks\vertical_framed_glass.json 15019b1b2b77e6be8a0f4ccd20f35ebb4a82a090 data\create\loot_tables\blocks\vertical_framed_glass_pane.json diff --git a/src/generated/resources/assets/create/blockstates/adjustable_crate.json b/src/generated/resources/assets/create/blockstates/adjustable_crate.json new file mode 100644 index 000000000..f34e3aaf6 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/adjustable_crate.json @@ -0,0 +1,42 @@ +{ + "variants": { + "double=false,facing=down": { + "model": "create:block/crate/brass/single" + }, + "double=true,facing=down": { + "model": "create:block/crate/brass/top" + }, + "double=false,facing=up": { + "model": "create:block/crate/brass/single" + }, + "double=true,facing=up": { + "model": "create:block/crate/brass/bottom" + }, + "double=false,facing=north": { + "model": "create:block/crate/brass/single" + }, + "double=true,facing=north": { + "model": "create:block/crate/brass/right" + }, + "double=false,facing=south": { + "model": "create:block/crate/brass/single" + }, + "double=true,facing=south": { + "model": "create:block/crate/brass/left" + }, + "double=false,facing=west": { + "model": "create:block/crate/brass/single" + }, + "double=true,facing=west": { + "model": "create:block/crate/brass/left", + "y": 90 + }, + "double=false,facing=east": { + "model": "create:block/crate/brass/single" + }, + "double=true,facing=east": { + "model": "create:block/crate/brass/right", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/adjustable_pulse_repeater.json b/src/generated/resources/assets/create/blockstates/adjustable_pulse_repeater.json new file mode 100644 index 000000000..111089cfb --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/adjustable_pulse_repeater.json @@ -0,0 +1,64 @@ +{ + "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/adjustable_repeater.json new file mode 100644 index 000000000..357a10e08 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/adjustable_repeater.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=north,powered=false,powering=false": { + "model": "create:block/diodes/adjustable_repeater", + "y": 180 + }, + "facing=south,powered=false,powering=false": { + "model": "create:block/diodes/adjustable_repeater" + }, + "facing=west,powered=false,powering=false": { + "model": "create:block/diodes/adjustable_repeater", + "y": 90 + }, + "facing=east,powered=false,powering=false": { + "model": "create:block/diodes/adjustable_repeater", + "y": 270 + }, + "facing=north,powered=true,powering=false": { + "model": "create:block/adjustable_repeater_powered", + "y": 180 + }, + "facing=south,powered=true,powering=false": { + "model": "create:block/adjustable_repeater_powered" + }, + "facing=west,powered=true,powering=false": { + "model": "create:block/adjustable_repeater_powered", + "y": 90 + }, + "facing=east,powered=true,powering=false": { + "model": "create:block/adjustable_repeater_powered", + "y": 270 + }, + "facing=north,powered=false,powering=true": { + "model": "create:block/adjustable_repeater_powering", + "y": 180 + }, + "facing=south,powered=false,powering=true": { + "model": "create:block/adjustable_repeater_powering" + }, + "facing=west,powered=false,powering=true": { + "model": "create:block/adjustable_repeater_powering", + "y": 90 + }, + "facing=east,powered=false,powering=true": { + "model": "create:block/adjustable_repeater_powering", + "y": 270 + }, + "facing=north,powered=true,powering=true": { + "model": "create:block/adjustable_repeater_powered_powering", + "y": 180 + }, + "facing=south,powered=true,powering=true": { + "model": "create:block/adjustable_repeater_powered_powering" + }, + "facing=west,powered=true,powering=true": { + "model": "create:block/adjustable_repeater_powered_powering", + "y": 90 + }, + "facing=east,powered=true,powering=true": { + "model": "create:block/adjustable_repeater_powered_powering", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/analog_lever.json b/src/generated/resources/assets/create/blockstates/analog_lever.json new file mode 100644 index 000000000..a20c14925 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/analog_lever.json @@ -0,0 +1,57 @@ +{ + "variants": { + "face=floor,facing=north": { + "model": "create:block/analog_lever/block" + }, + "face=wall,facing=north": { + "model": "create:block/analog_lever/block", + "x": 90 + }, + "face=ceiling,facing=north": { + "model": "create:block/analog_lever/block", + "x": 180, + "y": 180 + }, + "face=floor,facing=south": { + "model": "create:block/analog_lever/block", + "y": 180 + }, + "face=wall,facing=south": { + "model": "create:block/analog_lever/block", + "x": 90, + "y": 180 + }, + "face=ceiling,facing=south": { + "model": "create:block/analog_lever/block", + "x": 180 + }, + "face=floor,facing=west": { + "model": "create:block/analog_lever/block", + "y": 270 + }, + "face=wall,facing=west": { + "model": "create:block/analog_lever/block", + "x": 90, + "y": 270 + }, + "face=ceiling,facing=west": { + "model": "create:block/analog_lever/block", + "x": 180, + "y": 90 + }, + "face=floor,facing=east": { + "model": "create:block/analog_lever/block", + "y": 90 + }, + "face=wall,facing=east": { + "model": "create:block/analog_lever/block", + "x": 90, + "y": 90 + }, + "face=ceiling,facing=east": { + "model": "create:block/analog_lever/block", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/belt_observer.json b/src/generated/resources/assets/create/blockstates/belt_observer.json new file mode 100644 index 000000000..218931245 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/belt_observer.json @@ -0,0 +1,244 @@ +{ + "variants": { + "belt=false,facing=north,mode=detect,powered=false": { + "model": "create:block/belt_observer/detect", + "y": 180 + }, + "belt=true,facing=north,mode=detect,powered=false": { + "model": "create:block/belt_observer/detect_belt", + "y": 180 + }, + "belt=false,facing=south,mode=detect,powered=false": { + "model": "create:block/belt_observer/detect" + }, + "belt=true,facing=south,mode=detect,powered=false": { + "model": "create:block/belt_observer/detect_belt" + }, + "belt=false,facing=west,mode=detect,powered=false": { + "model": "create:block/belt_observer/detect", + "y": 90 + }, + "belt=true,facing=west,mode=detect,powered=false": { + "model": "create:block/belt_observer/detect_belt", + "y": 90 + }, + "belt=false,facing=east,mode=detect,powered=false": { + "model": "create:block/belt_observer/detect", + "y": 270 + }, + "belt=true,facing=east,mode=detect,powered=false": { + "model": "create:block/belt_observer/detect_belt", + "y": 270 + }, + "belt=false,facing=north,mode=pulse,powered=false": { + "model": "create:block/belt_observer/pulse", + "y": 180 + }, + "belt=true,facing=north,mode=pulse,powered=false": { + "model": "create:block/belt_observer/pulse_belt", + "y": 180 + }, + "belt=false,facing=south,mode=pulse,powered=false": { + "model": "create:block/belt_observer/pulse" + }, + "belt=true,facing=south,mode=pulse,powered=false": { + "model": "create:block/belt_observer/pulse_belt" + }, + "belt=false,facing=west,mode=pulse,powered=false": { + "model": "create:block/belt_observer/pulse", + "y": 90 + }, + "belt=true,facing=west,mode=pulse,powered=false": { + "model": "create:block/belt_observer/pulse_belt", + "y": 90 + }, + "belt=false,facing=east,mode=pulse,powered=false": { + "model": "create:block/belt_observer/pulse", + "y": 270 + }, + "belt=true,facing=east,mode=pulse,powered=false": { + "model": "create:block/belt_observer/pulse_belt", + "y": 270 + }, + "belt=false,facing=north,mode=eject,powered=false": { + "model": "create:block/belt_observer/eject", + "y": 180 + }, + "belt=true,facing=north,mode=eject,powered=false": { + "model": "create:block/belt_observer/eject_belt", + "y": 180 + }, + "belt=false,facing=south,mode=eject,powered=false": { + "model": "create:block/belt_observer/eject" + }, + "belt=true,facing=south,mode=eject,powered=false": { + "model": "create:block/belt_observer/eject_belt" + }, + "belt=false,facing=west,mode=eject,powered=false": { + "model": "create:block/belt_observer/eject", + "y": 90 + }, + "belt=true,facing=west,mode=eject,powered=false": { + "model": "create:block/belt_observer/eject_belt", + "y": 90 + }, + "belt=false,facing=east,mode=eject,powered=false": { + "model": "create:block/belt_observer/eject", + "y": 270 + }, + "belt=true,facing=east,mode=eject,powered=false": { + "model": "create:block/belt_observer/eject_belt", + "y": 270 + }, + "belt=false,facing=north,mode=split,powered=false": { + "model": "create:block/belt_observer/split", + "y": 180 + }, + "belt=true,facing=north,mode=split,powered=false": { + "model": "create:block/belt_observer/split_belt", + "y": 180 + }, + "belt=false,facing=south,mode=split,powered=false": { + "model": "create:block/belt_observer/split" + }, + "belt=true,facing=south,mode=split,powered=false": { + "model": "create:block/belt_observer/split_belt" + }, + "belt=false,facing=west,mode=split,powered=false": { + "model": "create:block/belt_observer/split", + "y": 90 + }, + "belt=true,facing=west,mode=split,powered=false": { + "model": "create:block/belt_observer/split_belt", + "y": 90 + }, + "belt=false,facing=east,mode=split,powered=false": { + "model": "create:block/belt_observer/split", + "y": 270 + }, + "belt=true,facing=east,mode=split,powered=false": { + "model": "create:block/belt_observer/split_belt", + "y": 270 + }, + "belt=false,facing=north,mode=detect,powered=true": { + "model": "create:block/belt_observer/detect_powered", + "y": 180 + }, + "belt=true,facing=north,mode=detect,powered=true": { + "model": "create:block/belt_observer/detect_belt_powered", + "y": 180 + }, + "belt=false,facing=south,mode=detect,powered=true": { + "model": "create:block/belt_observer/detect_powered" + }, + "belt=true,facing=south,mode=detect,powered=true": { + "model": "create:block/belt_observer/detect_belt_powered" + }, + "belt=false,facing=west,mode=detect,powered=true": { + "model": "create:block/belt_observer/detect_powered", + "y": 90 + }, + "belt=true,facing=west,mode=detect,powered=true": { + "model": "create:block/belt_observer/detect_belt_powered", + "y": 90 + }, + "belt=false,facing=east,mode=detect,powered=true": { + "model": "create:block/belt_observer/detect_powered", + "y": 270 + }, + "belt=true,facing=east,mode=detect,powered=true": { + "model": "create:block/belt_observer/detect_belt_powered", + "y": 270 + }, + "belt=false,facing=north,mode=pulse,powered=true": { + "model": "create:block/belt_observer/pulse_powered", + "y": 180 + }, + "belt=true,facing=north,mode=pulse,powered=true": { + "model": "create:block/belt_observer/pulse_belt_powered", + "y": 180 + }, + "belt=false,facing=south,mode=pulse,powered=true": { + "model": "create:block/belt_observer/pulse_powered" + }, + "belt=true,facing=south,mode=pulse,powered=true": { + "model": "create:block/belt_observer/pulse_belt_powered" + }, + "belt=false,facing=west,mode=pulse,powered=true": { + "model": "create:block/belt_observer/pulse_powered", + "y": 90 + }, + "belt=true,facing=west,mode=pulse,powered=true": { + "model": "create:block/belt_observer/pulse_belt_powered", + "y": 90 + }, + "belt=false,facing=east,mode=pulse,powered=true": { + "model": "create:block/belt_observer/pulse_powered", + "y": 270 + }, + "belt=true,facing=east,mode=pulse,powered=true": { + "model": "create:block/belt_observer/pulse_belt_powered", + "y": 270 + }, + "belt=false,facing=north,mode=eject,powered=true": { + "model": "create:block/belt_observer/eject_powered", + "y": 180 + }, + "belt=true,facing=north,mode=eject,powered=true": { + "model": "create:block/belt_observer/eject_belt_powered", + "y": 180 + }, + "belt=false,facing=south,mode=eject,powered=true": { + "model": "create:block/belt_observer/eject_powered" + }, + "belt=true,facing=south,mode=eject,powered=true": { + "model": "create:block/belt_observer/eject_belt_powered" + }, + "belt=false,facing=west,mode=eject,powered=true": { + "model": "create:block/belt_observer/eject_powered", + "y": 90 + }, + "belt=true,facing=west,mode=eject,powered=true": { + "model": "create:block/belt_observer/eject_belt_powered", + "y": 90 + }, + "belt=false,facing=east,mode=eject,powered=true": { + "model": "create:block/belt_observer/eject_powered", + "y": 270 + }, + "belt=true,facing=east,mode=eject,powered=true": { + "model": "create:block/belt_observer/eject_belt_powered", + "y": 270 + }, + "belt=false,facing=north,mode=split,powered=true": { + "model": "create:block/belt_observer/split_powered", + "y": 180 + }, + "belt=true,facing=north,mode=split,powered=true": { + "model": "create:block/belt_observer/split_belt_powered", + "y": 180 + }, + "belt=false,facing=south,mode=split,powered=true": { + "model": "create:block/belt_observer/split_powered" + }, + "belt=true,facing=south,mode=split,powered=true": { + "model": "create:block/belt_observer/split_belt_powered" + }, + "belt=false,facing=west,mode=split,powered=true": { + "model": "create:block/belt_observer/split_powered", + "y": 90 + }, + "belt=true,facing=west,mode=split,powered=true": { + "model": "create:block/belt_observer/split_belt_powered", + "y": 90 + }, + "belt=false,facing=east,mode=split,powered=true": { + "model": "create:block/belt_observer/split_powered", + "y": 270 + }, + "belt=true,facing=east,mode=split,powered=true": { + "model": "create:block/belt_observer/split_belt_powered", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/belt_tunnel.json b/src/generated/resources/assets/create/blockstates/belt_tunnel.json new file mode 100644 index 000000000..b3f8cbd90 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/belt_tunnel.json @@ -0,0 +1,53 @@ +{ + "variants": { + "axis=x,shape=straight": { + "model": "create:block/belt_tunnel/straight" + }, + "axis=z,shape=straight": { + "model": "create:block/belt_tunnel/straight", + "y": 90 + }, + "axis=x,shape=window": { + "model": "create:block/belt_tunnel/window" + }, + "axis=z,shape=window": { + "model": "create:block/belt_tunnel/window", + "y": 90 + }, + "axis=x,shape=halfshade": { + "model": "create:block/belt_tunnel/halfshade" + }, + "axis=z,shape=halfshade": { + "model": "create:block/belt_tunnel/halfshade", + "y": 90 + }, + "axis=x,shape=fullshade": { + "model": "create:block/belt_tunnel/fullshade" + }, + "axis=z,shape=fullshade": { + "model": "create:block/belt_tunnel/fullshade", + "y": 90 + }, + "axis=x,shape=t_left": { + "model": "create:block/belt_tunnel/t_left" + }, + "axis=z,shape=t_left": { + "model": "create:block/belt_tunnel/t_left", + "y": 90 + }, + "axis=x,shape=t_right": { + "model": "create:block/belt_tunnel/t_right" + }, + "axis=z,shape=t_right": { + "model": "create:block/belt_tunnel/t_right", + "y": 90 + }, + "axis=x,shape=cross": { + "model": "create:block/belt_tunnel/cross" + }, + "axis=z,shape=cross": { + "model": "create:block/belt_tunnel/cross", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/creative_crate.json b/src/generated/resources/assets/create/blockstates/creative_crate.json new file mode 100644 index 000000000..89413592c --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/creative_crate.json @@ -0,0 +1,42 @@ +{ + "variants": { + "double=false,facing=down": { + "model": "create:block/crate/creative/single" + }, + "double=true,facing=down": { + "model": "create:block/crate/creative/top" + }, + "double=false,facing=up": { + "model": "create:block/crate/creative/single" + }, + "double=true,facing=up": { + "model": "create:block/crate/creative/bottom" + }, + "double=false,facing=north": { + "model": "create:block/crate/creative/single" + }, + "double=true,facing=north": { + "model": "create:block/crate/creative/right" + }, + "double=false,facing=south": { + "model": "create:block/crate/creative/single" + }, + "double=true,facing=south": { + "model": "create:block/crate/creative/left" + }, + "double=false,facing=west": { + "model": "create:block/crate/creative/single" + }, + "double=true,facing=west": { + "model": "create:block/crate/creative/left", + "y": 90 + }, + "double=false,facing=east": { + "model": "create:block/crate/creative/single" + }, + "double=true,facing=east": { + "model": "create:block/crate/creative/right", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/extractor.json b/src/generated/resources/assets/create/blockstates/extractor.json new file mode 100644 index 000000000..54ff46fbc --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/extractor.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,powered=false": { + "model": "create:block/extractor/horizontal" + }, + "facing=south,powered=false": { + "model": "create:block/extractor/horizontal", + "y": 180 + }, + "facing=west,powered=false": { + "model": "create:block/extractor/horizontal", + "y": 270 + }, + "facing=east,powered=false": { + "model": "create:block/extractor/horizontal", + "y": 90 + }, + "facing=north,powered=true": { + "model": "create:block/extractor/horizontal_powered" + }, + "facing=south,powered=true": { + "model": "create:block/extractor/horizontal_powered", + "y": 180 + }, + "facing=west,powered=true": { + "model": "create:block/extractor/horizontal_powered", + "y": 270 + }, + "facing=east,powered=true": { + "model": "create:block/extractor/horizontal_powered", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/funnel.json b/src/generated/resources/assets/create/blockstates/funnel.json new file mode 100644 index 000000000..303155a12 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/funnel.json @@ -0,0 +1,34 @@ +{ + "variants": { + "belt=false,facing=north": { + "model": "create:block/funnel/horizontal" + }, + "belt=true,facing=north": { + "model": "create:block/funnel/horizontal_belt" + }, + "belt=false,facing=south": { + "model": "create:block/funnel/horizontal", + "y": 180 + }, + "belt=true,facing=south": { + "model": "create:block/funnel/horizontal_belt", + "y": 180 + }, + "belt=false,facing=west": { + "model": "create:block/funnel/horizontal", + "y": 270 + }, + "belt=true,facing=west": { + "model": "create:block/funnel/horizontal_belt", + "y": 270 + }, + "belt=false,facing=east": { + "model": "create:block/funnel/horizontal", + "y": 90 + }, + "belt=true,facing=east": { + "model": "create:block/funnel/horizontal_belt", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/linked_extractor.json b/src/generated/resources/assets/create/blockstates/linked_extractor.json new file mode 100644 index 000000000..98ae3be24 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/linked_extractor.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,powered=false": { + "model": "create:block/extractor/horizontal_linked" + }, + "facing=south,powered=false": { + "model": "create:block/extractor/horizontal_linked", + "y": 180 + }, + "facing=west,powered=false": { + "model": "create:block/extractor/horizontal_linked", + "y": 270 + }, + "facing=east,powered=false": { + "model": "create:block/extractor/horizontal_linked", + "y": 90 + }, + "facing=north,powered=true": { + "model": "create:block/extractor/horizontal_linked_powered" + }, + "facing=south,powered=true": { + "model": "create:block/extractor/horizontal_linked_powered", + "y": 180 + }, + "facing=west,powered=true": { + "model": "create:block/extractor/horizontal_linked_powered", + "y": 270 + }, + "facing=east,powered=true": { + "model": "create:block/extractor/horizontal_linked_powered", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/linked_transposer.json b/src/generated/resources/assets/create/blockstates/linked_transposer.json new file mode 100644 index 000000000..1d9f3dd92 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/linked_transposer.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,powered=false": { + "model": "create:block/transposer/horizontal_linked" + }, + "facing=south,powered=false": { + "model": "create:block/transposer/horizontal_linked", + "y": 180 + }, + "facing=west,powered=false": { + "model": "create:block/transposer/horizontal_linked", + "y": 270 + }, + "facing=east,powered=false": { + "model": "create:block/transposer/horizontal_linked", + "y": 90 + }, + "facing=north,powered=true": { + "model": "create:block/transposer/horizontal_linked_powered" + }, + "facing=south,powered=true": { + "model": "create:block/transposer/horizontal_linked_powered", + "y": 180 + }, + "facing=west,powered=true": { + "model": "create:block/transposer/horizontal_linked_powered", + "y": 270 + }, + "facing=east,powered=true": { + "model": "create:block/transposer/horizontal_linked_powered", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/powered_latch.json b/src/generated/resources/assets/create/blockstates/powered_latch.json new file mode 100644 index 000000000..34fff0296 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/powered_latch.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=north,powered=false,powered_side=false,powering=false": { + "model": "create:block/powered_latch", + "y": 180 + }, + "facing=south,powered=false,powered_side=false,powering=false": { + "model": "create:block/powered_latch" + }, + "facing=west,powered=false,powered_side=false,powering=false": { + "model": "create:block/powered_latch", + "y": 90 + }, + "facing=east,powered=false,powered_side=false,powering=false": { + "model": "create:block/powered_latch", + "y": 270 + }, + "facing=north,powered=true,powered_side=false,powering=false": { + "model": "create:block/powered_latch", + "y": 180 + }, + "facing=south,powered=true,powered_side=false,powering=false": { + "model": "create:block/powered_latch" + }, + "facing=west,powered=true,powered_side=false,powering=false": { + "model": "create:block/powered_latch", + "y": 90 + }, + "facing=east,powered=true,powered_side=false,powering=false": { + "model": "create:block/powered_latch", + "y": 270 + }, + "facing=north,powered=false,powered_side=true,powering=false": { + "model": "create:block/powered_latch", + "y": 180 + }, + "facing=south,powered=false,powered_side=true,powering=false": { + "model": "create:block/powered_latch" + }, + "facing=west,powered=false,powered_side=true,powering=false": { + "model": "create:block/powered_latch", + "y": 90 + }, + "facing=east,powered=false,powered_side=true,powering=false": { + "model": "create:block/powered_latch", + "y": 270 + }, + "facing=north,powered=true,powered_side=true,powering=false": { + "model": "create:block/powered_latch", + "y": 180 + }, + "facing=south,powered=true,powered_side=true,powering=false": { + "model": "create:block/powered_latch" + }, + "facing=west,powered=true,powered_side=true,powering=false": { + "model": "create:block/powered_latch", + "y": 90 + }, + "facing=east,powered=true,powered_side=true,powering=false": { + "model": "create:block/powered_latch", + "y": 270 + }, + "facing=north,powered=false,powered_side=false,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 180 + }, + "facing=south,powered=false,powered_side=false,powering=true": { + "model": "create:block/powered_latch_powered" + }, + "facing=west,powered=false,powered_side=false,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 90 + }, + "facing=east,powered=false,powered_side=false,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 270 + }, + "facing=north,powered=true,powered_side=false,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 180 + }, + "facing=south,powered=true,powered_side=false,powering=true": { + "model": "create:block/powered_latch_powered" + }, + "facing=west,powered=true,powered_side=false,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 90 + }, + "facing=east,powered=true,powered_side=false,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 270 + }, + "facing=north,powered=false,powered_side=true,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 180 + }, + "facing=south,powered=false,powered_side=true,powering=true": { + "model": "create:block/powered_latch_powered" + }, + "facing=west,powered=false,powered_side=true,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 90 + }, + "facing=east,powered=false,powered_side=true,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 270 + }, + "facing=north,powered=true,powered_side=true,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 180 + }, + "facing=south,powered=true,powered_side=true,powering=true": { + "model": "create:block/powered_latch_powered" + }, + "facing=west,powered=true,powered_side=true,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 90 + }, + "facing=east,powered=true,powered_side=true,powering=true": { + "model": "create:block/powered_latch_powered", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/powered_toggle_latch.json b/src/generated/resources/assets/create/blockstates/powered_toggle_latch.json new file mode 100644 index 000000000..ed39f54e7 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/powered_toggle_latch.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=north,powered=false,powering=false": { + "model": "create:block/diodes/latch_off", + "y": 180 + }, + "facing=south,powered=false,powering=false": { + "model": "create:block/diodes/latch_off" + }, + "facing=west,powered=false,powering=false": { + "model": "create:block/diodes/latch_off", + "y": 90 + }, + "facing=east,powered=false,powering=false": { + "model": "create:block/diodes/latch_off", + "y": 270 + }, + "facing=north,powered=true,powering=false": { + "model": "create:block/powered_toggle_latch_off_powered", + "y": 180 + }, + "facing=south,powered=true,powering=false": { + "model": "create:block/powered_toggle_latch_off_powered" + }, + "facing=west,powered=true,powering=false": { + "model": "create:block/powered_toggle_latch_off_powered", + "y": 90 + }, + "facing=east,powered=true,powering=false": { + "model": "create:block/powered_toggle_latch_off_powered", + "y": 270 + }, + "facing=north,powered=false,powering=true": { + "model": "create:block/diodes/latch_on", + "y": 180 + }, + "facing=south,powered=false,powering=true": { + "model": "create:block/diodes/latch_on" + }, + "facing=west,powered=false,powering=true": { + "model": "create:block/diodes/latch_on", + "y": 90 + }, + "facing=east,powered=false,powering=true": { + "model": "create:block/diodes/latch_on", + "y": 270 + }, + "facing=north,powered=true,powering=true": { + "model": "create:block/powered_toggle_latch_on_powered", + "y": 180 + }, + "facing=south,powered=true,powering=true": { + "model": "create:block/powered_toggle_latch_on_powered" + }, + "facing=west,powered=true,powering=true": { + "model": "create:block/powered_toggle_latch_on_powered", + "y": 90 + }, + "facing=east,powered=true,powering=true": { + "model": "create:block/powered_toggle_latch_on_powered", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/pulse_repeater.json b/src/generated/resources/assets/create/blockstates/pulse_repeater.json new file mode 100644 index 000000000..fe93a99de --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/pulse_repeater.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=north,powered=false,pulsing=false": { + "model": "create:block/diodes/pulse_repeater", + "y": 180 + }, + "facing=south,powered=false,pulsing=false": { + "model": "create:block/diodes/pulse_repeater" + }, + "facing=west,powered=false,pulsing=false": { + "model": "create:block/diodes/pulse_repeater", + "y": 90 + }, + "facing=east,powered=false,pulsing=false": { + "model": "create:block/diodes/pulse_repeater", + "y": 270 + }, + "facing=north,powered=true,pulsing=false": { + "model": "create:block/pulse_repeater_powered", + "y": 180 + }, + "facing=south,powered=true,pulsing=false": { + "model": "create:block/pulse_repeater_powered" + }, + "facing=west,powered=true,pulsing=false": { + "model": "create:block/pulse_repeater_powered", + "y": 90 + }, + "facing=east,powered=true,pulsing=false": { + "model": "create:block/pulse_repeater_powered", + "y": 270 + }, + "facing=north,powered=false,pulsing=true": { + "model": "create:block/pulse_repeater_pulsing", + "y": 180 + }, + "facing=south,powered=false,pulsing=true": { + "model": "create:block/pulse_repeater_pulsing" + }, + "facing=west,powered=false,pulsing=true": { + "model": "create:block/pulse_repeater_pulsing", + "y": 90 + }, + "facing=east,powered=false,pulsing=true": { + "model": "create:block/pulse_repeater_pulsing", + "y": 270 + }, + "facing=north,powered=true,pulsing=true": { + "model": "create:block/pulse_repeater_pulsing", + "y": 180 + }, + "facing=south,powered=true,pulsing=true": { + "model": "create:block/pulse_repeater_pulsing" + }, + "facing=west,powered=true,pulsing=true": { + "model": "create:block/pulse_repeater_pulsing", + "y": 90 + }, + "facing=east,powered=true,pulsing=true": { + "model": "create:block/pulse_repeater_pulsing", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/redstone_contact.json b/src/generated/resources/assets/create/blockstates/redstone_contact.json new file mode 100644 index 000000000..6f8031cab --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/redstone_contact.json @@ -0,0 +1,56 @@ +{ + "variants": { + "facing=down,powered=false": { + "model": "create:block/redstone_contact/block", + "x": 180 + }, + "facing=up,powered=false": { + "model": "create:block/redstone_contact/block" + }, + "facing=north,powered=false": { + "model": "create:block/redstone_contact/block", + "x": 90 + }, + "facing=south,powered=false": { + "model": "create:block/redstone_contact/block", + "x": 90, + "y": 180 + }, + "facing=west,powered=false": { + "model": "create:block/redstone_contact/block", + "x": 90, + "y": 270 + }, + "facing=east,powered=false": { + "model": "create:block/redstone_contact/block", + "x": 90, + "y": 90 + }, + "facing=down,powered=true": { + "model": "create:block/redstone_contact/block_powered", + "x": 180 + }, + "facing=up,powered=true": { + "model": "create:block/redstone_contact/block_powered" + }, + "facing=north,powered=true": { + "model": "create:block/redstone_contact/block_powered", + "x": 90 + }, + "facing=south,powered=true": { + "model": "create:block/redstone_contact/block_powered", + "x": 90, + "y": 180 + }, + "facing=west,powered=true": { + "model": "create:block/redstone_contact/block_powered", + "x": 90, + "y": 270 + }, + "facing=east,powered=true": { + "model": "create:block/redstone_contact/block_powered", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/redstone_link.json b/src/generated/resources/assets/create/blockstates/redstone_link.json new file mode 100644 index 000000000..81498cfb2 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/redstone_link.json @@ -0,0 +1,116 @@ +{ + "variants": { + "facing=down,powered=false,receiver=false": { + "model": "create:block/redstone_link/transmitter", + "x": 180, + "y": 180 + }, + "facing=up,powered=false,receiver=false": { + "model": "create:block/redstone_link/transmitter", + "y": 180 + }, + "facing=north,powered=false,receiver=false": { + "model": "create:block/redstone_link/transmitter_vertical", + "x": 270, + "y": 180 + }, + "facing=south,powered=false,receiver=false": { + "model": "create:block/redstone_link/transmitter_vertical", + "x": 270 + }, + "facing=west,powered=false,receiver=false": { + "model": "create:block/redstone_link/transmitter_vertical", + "x": 270, + "y": 90 + }, + "facing=east,powered=false,receiver=false": { + "model": "create:block/redstone_link/transmitter_vertical", + "x": 270, + "y": 270 + }, + "facing=down,powered=true,receiver=false": { + "model": "create:block/redstone_link/transmitter_powered", + "x": 180, + "y": 180 + }, + "facing=up,powered=true,receiver=false": { + "model": "create:block/redstone_link/transmitter_powered", + "y": 180 + }, + "facing=north,powered=true,receiver=false": { + "model": "create:block/redstone_link/transmitter_vertical_powered", + "x": 270, + "y": 180 + }, + "facing=south,powered=true,receiver=false": { + "model": "create:block/redstone_link/transmitter_vertical_powered", + "x": 270 + }, + "facing=west,powered=true,receiver=false": { + "model": "create:block/redstone_link/transmitter_vertical_powered", + "x": 270, + "y": 90 + }, + "facing=east,powered=true,receiver=false": { + "model": "create:block/redstone_link/transmitter_vertical_powered", + "x": 270, + "y": 270 + }, + "facing=down,powered=false,receiver=true": { + "model": "create:block/redstone_link/receiver", + "x": 180, + "y": 180 + }, + "facing=up,powered=false,receiver=true": { + "model": "create:block/redstone_link/receiver", + "y": 180 + }, + "facing=north,powered=false,receiver=true": { + "model": "create:block/redstone_link/receiver_vertical", + "x": 270, + "y": 180 + }, + "facing=south,powered=false,receiver=true": { + "model": "create:block/redstone_link/receiver_vertical", + "x": 270 + }, + "facing=west,powered=false,receiver=true": { + "model": "create:block/redstone_link/receiver_vertical", + "x": 270, + "y": 90 + }, + "facing=east,powered=false,receiver=true": { + "model": "create:block/redstone_link/receiver_vertical", + "x": 270, + "y": 270 + }, + "facing=down,powered=true,receiver=true": { + "model": "create:block/redstone_link/receiver_powered", + "x": 180, + "y": 180 + }, + "facing=up,powered=true,receiver=true": { + "model": "create:block/redstone_link/receiver_powered", + "y": 180 + }, + "facing=north,powered=true,receiver=true": { + "model": "create:block/redstone_link/receiver_vertical_powered", + "x": 270, + "y": 180 + }, + "facing=south,powered=true,receiver=true": { + "model": "create:block/redstone_link/receiver_vertical_powered", + "x": 270 + }, + "facing=west,powered=true,receiver=true": { + "model": "create:block/redstone_link/receiver_vertical_powered", + "x": 270, + "y": 90 + }, + "facing=east,powered=true,receiver=true": { + "model": "create:block/redstone_link/receiver_vertical_powered", + "x": 270, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/rotation_chassis.json b/src/generated/resources/assets/create/blockstates/rotation_chassis.json index 98cbb8d30..87a1ea2eb 100644 --- a/src/generated/resources/assets/create/blockstates/rotation_chassis.json +++ b/src/generated/resources/assets/create/blockstates/rotation_chassis.json @@ -207,8 +207,8 @@ }, { "when": { - "sticky_east": "true", - "axis": "x" + "axis": "x", + "sticky_east": "true" }, "apply": { "model": "create:block/rotation_chassis_side_x_sticky", @@ -217,8 +217,8 @@ }, { "when": { - "sticky_east": "true", - "axis": "y" + "axis": "y", + "sticky_east": "true" }, "apply": { "model": "create:block/rotation_chassis_side_y_sticky", @@ -227,8 +227,8 @@ }, { "when": { - "sticky_east": "true", - "axis": "z" + "axis": "z", + "sticky_east": "true" }, "apply": { "model": "create:block/rotation_chassis_side_z_sticky" @@ -236,8 +236,8 @@ }, { "when": { - "sticky_east": "false", - "axis": "x" + "axis": "x", + "sticky_east": "false" }, "apply": { "model": "create:block/rotation_chassis_side_x", @@ -246,8 +246,8 @@ }, { "when": { - "sticky_east": "false", - "axis": "y" + "axis": "y", + "sticky_east": "false" }, "apply": { "model": "create:block/rotation_chassis_side_y", @@ -256,8 +256,8 @@ }, { "when": { - "sticky_east": "false", - "axis": "z" + "axis": "z", + "sticky_east": "false" }, "apply": { "model": "create:block/rotation_chassis_side_z" diff --git a/src/generated/resources/assets/create/blockstates/stockpile_switch.json b/src/generated/resources/assets/create/blockstates/stockpile_switch.json new file mode 100644 index 000000000..c5f9e6ae3 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/stockpile_switch.json @@ -0,0 +1,109 @@ +{ + "variants": { + "facing=north,indicator=0": { + "model": "create:block/stockpile_switch_0" + }, + "facing=south,indicator=0": { + "model": "create:block/stockpile_switch_0", + "y": 180 + }, + "facing=west,indicator=0": { + "model": "create:block/stockpile_switch_0", + "y": 270 + }, + "facing=east,indicator=0": { + "model": "create:block/stockpile_switch_0", + "y": 90 + }, + "facing=north,indicator=1": { + "model": "create:block/stockpile_switch_1" + }, + "facing=south,indicator=1": { + "model": "create:block/stockpile_switch_1", + "y": 180 + }, + "facing=west,indicator=1": { + "model": "create:block/stockpile_switch_1", + "y": 270 + }, + "facing=east,indicator=1": { + "model": "create:block/stockpile_switch_1", + "y": 90 + }, + "facing=north,indicator=2": { + "model": "create:block/stockpile_switch_2" + }, + "facing=south,indicator=2": { + "model": "create:block/stockpile_switch_2", + "y": 180 + }, + "facing=west,indicator=2": { + "model": "create:block/stockpile_switch_2", + "y": 270 + }, + "facing=east,indicator=2": { + "model": "create:block/stockpile_switch_2", + "y": 90 + }, + "facing=north,indicator=3": { + "model": "create:block/stockpile_switch_3" + }, + "facing=south,indicator=3": { + "model": "create:block/stockpile_switch_3", + "y": 180 + }, + "facing=west,indicator=3": { + "model": "create:block/stockpile_switch_3", + "y": 270 + }, + "facing=east,indicator=3": { + "model": "create:block/stockpile_switch_3", + "y": 90 + }, + "facing=north,indicator=4": { + "model": "create:block/stockpile_switch_4" + }, + "facing=south,indicator=4": { + "model": "create:block/stockpile_switch_4", + "y": 180 + }, + "facing=west,indicator=4": { + "model": "create:block/stockpile_switch_4", + "y": 270 + }, + "facing=east,indicator=4": { + "model": "create:block/stockpile_switch_4", + "y": 90 + }, + "facing=north,indicator=5": { + "model": "create:block/stockpile_switch_5" + }, + "facing=south,indicator=5": { + "model": "create:block/stockpile_switch_5", + "y": 180 + }, + "facing=west,indicator=5": { + "model": "create:block/stockpile_switch_5", + "y": 270 + }, + "facing=east,indicator=5": { + "model": "create:block/stockpile_switch_5", + "y": 90 + }, + "facing=north,indicator=6": { + "model": "create:block/stockpile_switch_6" + }, + "facing=south,indicator=6": { + "model": "create:block/stockpile_switch_6", + "y": 180 + }, + "facing=west,indicator=6": { + "model": "create:block/stockpile_switch_6", + "y": 270 + }, + "facing=east,indicator=6": { + "model": "create:block/stockpile_switch_6", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/transposer.json b/src/generated/resources/assets/create/blockstates/transposer.json new file mode 100644 index 000000000..eb3395290 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/transposer.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=north,powered=false": { + "model": "create:block/transposer/block" + }, + "facing=south,powered=false": { + "model": "create:block/transposer/block", + "y": 180 + }, + "facing=west,powered=false": { + "model": "create:block/transposer/block", + "y": 270 + }, + "facing=east,powered=false": { + "model": "create:block/transposer/block", + "y": 90 + }, + "facing=north,powered=true": { + "model": "create:block/transposer/block_powered" + }, + "facing=south,powered=true": { + "model": "create:block/transposer/block_powered", + "y": 180 + }, + "facing=west,powered=true": { + "model": "create:block/transposer/block_powered", + "y": 270 + }, + "facing=east,powered=true": { + "model": "create:block/transposer/block_powered", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/vertical_extractor.json b/src/generated/resources/assets/create/blockstates/vertical_extractor.json new file mode 100644 index 000000000..3f3455bb7 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/vertical_extractor.json @@ -0,0 +1,72 @@ +{ + "variants": { + "facing=north,powered=false,upward=false": { + "model": "create:block/extractor/vertical" + }, + "facing=south,powered=false,upward=false": { + "model": "create:block/extractor/vertical", + "y": 180 + }, + "facing=west,powered=false,upward=false": { + "model": "create:block/extractor/vertical", + "y": 270 + }, + "facing=east,powered=false,upward=false": { + "model": "create:block/extractor/vertical", + "y": 90 + }, + "facing=north,powered=true,upward=false": { + "model": "create:block/extractor/vertical_powered" + }, + "facing=south,powered=true,upward=false": { + "model": "create:block/extractor/vertical_powered", + "y": 180 + }, + "facing=west,powered=true,upward=false": { + "model": "create:block/extractor/vertical_powered", + "y": 270 + }, + "facing=east,powered=true,upward=false": { + "model": "create:block/extractor/vertical_powered", + "y": 90 + }, + "facing=north,powered=false,upward=true": { + "model": "create:block/extractor/vertical", + "x": 180, + "y": 180 + }, + "facing=south,powered=false,upward=true": { + "model": "create:block/extractor/vertical", + "x": 180 + }, + "facing=west,powered=false,upward=true": { + "model": "create:block/extractor/vertical", + "x": 180, + "y": 90 + }, + "facing=east,powered=false,upward=true": { + "model": "create:block/extractor/vertical", + "x": 180, + "y": 270 + }, + "facing=north,powered=true,upward=true": { + "model": "create:block/extractor/vertical_powered", + "x": 180, + "y": 180 + }, + "facing=south,powered=true,upward=true": { + "model": "create:block/extractor/vertical_powered", + "x": 180 + }, + "facing=west,powered=true,upward=true": { + "model": "create:block/extractor/vertical_powered", + "x": 180, + "y": 90 + }, + "facing=east,powered=true,upward=true": { + "model": "create:block/extractor/vertical_powered", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/vertical_funnel.json b/src/generated/resources/assets/create/blockstates/vertical_funnel.json new file mode 100644 index 000000000..2b4f2a6f2 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/vertical_funnel.json @@ -0,0 +1,42 @@ +{ + "variants": { + "facing=north,upward=false": { + "model": "create:block/funnel/vertical", + "x": 90, + "y": 180 + }, + "facing=south,upward=false": { + "model": "create:block/funnel/vertical", + "x": 90 + }, + "facing=west,upward=false": { + "model": "create:block/funnel/vertical", + "x": 90, + "y": 90 + }, + "facing=east,upward=false": { + "model": "create:block/funnel/vertical", + "x": 90, + "y": 270 + }, + "facing=north,upward=true": { + "model": "create:block/funnel/vertical", + "x": 270 + }, + "facing=south,upward=true": { + "model": "create:block/funnel/vertical", + "x": 270, + "y": 180 + }, + "facing=west,upward=true": { + "model": "create:block/funnel/vertical", + "x": 270, + "y": 270 + }, + "facing=east,upward=true": { + "model": "create:block/funnel/vertical", + "x": 270, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/vertical_linked_extractor.json b/src/generated/resources/assets/create/blockstates/vertical_linked_extractor.json new file mode 100644 index 000000000..5175ae7bc --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/vertical_linked_extractor.json @@ -0,0 +1,72 @@ +{ + "variants": { + "facing=north,powered=false,upward=false": { + "model": "create:block/extractor/vertical_linked" + }, + "facing=south,powered=false,upward=false": { + "model": "create:block/extractor/vertical_linked", + "y": 180 + }, + "facing=west,powered=false,upward=false": { + "model": "create:block/extractor/vertical_linked", + "y": 270 + }, + "facing=east,powered=false,upward=false": { + "model": "create:block/extractor/vertical_linked", + "y": 90 + }, + "facing=north,powered=true,upward=false": { + "model": "create:block/extractor/vertical_linked_powered" + }, + "facing=south,powered=true,upward=false": { + "model": "create:block/extractor/vertical_linked_powered", + "y": 180 + }, + "facing=west,powered=true,upward=false": { + "model": "create:block/extractor/vertical_linked_powered", + "y": 270 + }, + "facing=east,powered=true,upward=false": { + "model": "create:block/extractor/vertical_linked_powered", + "y": 90 + }, + "facing=north,powered=false,upward=true": { + "model": "create:block/extractor/vertical_linked", + "x": 180, + "y": 180 + }, + "facing=south,powered=false,upward=true": { + "model": "create:block/extractor/vertical_linked", + "x": 180 + }, + "facing=west,powered=false,upward=true": { + "model": "create:block/extractor/vertical_linked", + "x": 180, + "y": 90 + }, + "facing=east,powered=false,upward=true": { + "model": "create:block/extractor/vertical_linked", + "x": 180, + "y": 270 + }, + "facing=north,powered=true,upward=true": { + "model": "create:block/extractor/vertical_linked_powered", + "x": 180, + "y": 180 + }, + "facing=south,powered=true,upward=true": { + "model": "create:block/extractor/vertical_linked_powered", + "x": 180 + }, + "facing=west,powered=true,upward=true": { + "model": "create:block/extractor/vertical_linked_powered", + "x": 180, + "y": 90 + }, + "facing=east,powered=true,upward=true": { + "model": "create:block/extractor/vertical_linked_powered", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/vertical_linked_transposer.json b/src/generated/resources/assets/create/blockstates/vertical_linked_transposer.json new file mode 100644 index 000000000..a21f0e4a7 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/vertical_linked_transposer.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,powered=false,upward=false": { + "model": "create:block/transposer/vertical_linked", + "x": 90, + "y": 180 + }, + "facing=south,powered=false,upward=false": { + "model": "create:block/transposer/vertical_linked", + "x": 90 + }, + "facing=west,powered=false,upward=false": { + "model": "create:block/transposer/vertical_linked", + "x": 90, + "y": 90 + }, + "facing=east,powered=false,upward=false": { + "model": "create:block/transposer/vertical_linked", + "x": 90, + "y": 270 + }, + "facing=north,powered=true,upward=false": { + "model": "create:block/transposer/vertical_linked_powered", + "x": 90, + "y": 180 + }, + "facing=south,powered=true,upward=false": { + "model": "create:block/transposer/vertical_linked_powered", + "x": 90 + }, + "facing=west,powered=true,upward=false": { + "model": "create:block/transposer/vertical_linked_powered", + "x": 90, + "y": 90 + }, + "facing=east,powered=true,upward=false": { + "model": "create:block/transposer/vertical_linked_powered", + "x": 90, + "y": 270 + }, + "facing=north,powered=false,upward=true": { + "model": "create:block/transposer/vertical_linked", + "x": 270 + }, + "facing=south,powered=false,upward=true": { + "model": "create:block/transposer/vertical_linked", + "x": 270, + "y": 180 + }, + "facing=west,powered=false,upward=true": { + "model": "create:block/transposer/vertical_linked", + "x": 270, + "y": 270 + }, + "facing=east,powered=false,upward=true": { + "model": "create:block/transposer/vertical_linked", + "x": 270, + "y": 90 + }, + "facing=north,powered=true,upward=true": { + "model": "create:block/transposer/vertical_linked_powered", + "x": 270 + }, + "facing=south,powered=true,upward=true": { + "model": "create:block/transposer/vertical_linked_powered", + "x": 270, + "y": 180 + }, + "facing=west,powered=true,upward=true": { + "model": "create:block/transposer/vertical_linked_powered", + "x": 270, + "y": 270 + }, + "facing=east,powered=true,upward=true": { + "model": "create:block/transposer/vertical_linked_powered", + "x": 270, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/vertical_transposer.json b/src/generated/resources/assets/create/blockstates/vertical_transposer.json new file mode 100644 index 000000000..c3f42fadb --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/vertical_transposer.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,powered=false,upward=false": { + "model": "create:block/transposer/block", + "x": 90, + "y": 180 + }, + "facing=south,powered=false,upward=false": { + "model": "create:block/transposer/block", + "x": 90 + }, + "facing=west,powered=false,upward=false": { + "model": "create:block/transposer/block", + "x": 90, + "y": 90 + }, + "facing=east,powered=false,upward=false": { + "model": "create:block/transposer/block", + "x": 90, + "y": 270 + }, + "facing=north,powered=true,upward=false": { + "model": "create:block/transposer/block_powered", + "x": 90, + "y": 180 + }, + "facing=south,powered=true,upward=false": { + "model": "create:block/transposer/block_powered", + "x": 90 + }, + "facing=west,powered=true,upward=false": { + "model": "create:block/transposer/block_powered", + "x": 90, + "y": 90 + }, + "facing=east,powered=true,upward=false": { + "model": "create:block/transposer/block_powered", + "x": 90, + "y": 270 + }, + "facing=north,powered=false,upward=true": { + "model": "create:block/transposer/block", + "x": 270 + }, + "facing=south,powered=false,upward=true": { + "model": "create:block/transposer/block", + "x": 270, + "y": 180 + }, + "facing=west,powered=false,upward=true": { + "model": "create:block/transposer/block", + "x": 270, + "y": 270 + }, + "facing=east,powered=false,upward=true": { + "model": "create:block/transposer/block", + "x": 270, + "y": 90 + }, + "facing=north,powered=true,upward=true": { + "model": "create:block/transposer/block_powered", + "x": 270 + }, + "facing=south,powered=true,upward=true": { + "model": "create:block/transposer/block_powered", + "x": 270, + "y": 180 + }, + "facing=west,powered=true,upward=true": { + "model": "create:block/transposer/block_powered", + "x": 270, + "y": 270 + }, + "facing=east,powered=true,upward=true": { + "model": "create:block/transposer/block_powered", + "x": 270, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index a5f63cdb5..a7c591e39 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -1,7 +1,11 @@ { "block.create.acacia_window": "\u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", "block.create.acacia_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0250\u0131\u0254\u0250\u0254\u2C6F", + "block.create.adjustable_crate": "\u01DD\u0287\u0250\u0279\u0186 \u01DD\u05DFq\u0250\u0287sn\u0638p\u2C6F", "block.create.adjustable_pulley": "\u028E\u01DD\u05DF\u05DFn\u0500 \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_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", @@ -14,6 +18,8 @@ "block.create.andesite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.basin": "u\u0131s\u0250\u15FA", "block.create.belt": "\u0287\u05DF\u01DD\u15FA", + "block.create.belt_observer": "\u0279\u01DD\u028C\u0279\u01DDsqO \u0287\u05DF\u01DD\u15FA", + "block.create.belt_tunnel": "\u05DF\u01DDuun\u27D8 \u0287\u05DF\u01DD\u15FA", "block.create.birch_window": "\u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA", "block.create.birch_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA", "block.create.brass_block": "\u029E\u0254o\u05DF\u15FA ss\u0250\u0279\u15FA", @@ -32,6 +38,7 @@ "block.create.copper_casing": "bu\u0131s\u0250\u0186 \u0279\u01DDddo\u0186", "block.create.copper_ore": "\u01DD\u0279O \u0279\u01DDddo\u0186", "block.create.copper_shingles": "s\u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186", + "block.create.creative_crate": "\u01DD\u0287\u0250\u0279\u0186 \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "block.create.creative_motor": "\u0279o\u0287oW \u01DD\u028C\u0131\u0287\u0250\u01DD\u0279\u0186", "block.create.crushing_wheel": "\u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", "block.create.crushing_wheel_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 \u05DF\u01DD\u01DD\u0265M bu\u0131\u0265sn\u0279\u0186", @@ -72,6 +79,7 @@ "block.create.encased_belt": "\u0287\u05DF\u01DD\u15FA p\u01DDs\u0250\u0254u\u018E", "block.create.encased_fan": "u\u0250\u2132 p\u01DDs\u0250\u0254u\u018E", "block.create.encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E", + "block.create.extractor": "\u0279o\u0287\u0254\u0250\u0279\u0287x\u018E", "block.create.fancy_andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F \u028E\u0254u\u0250\u2132", "block.create.fancy_andesite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F \u028E\u0254u\u0250\u2132", "block.create.fancy_andesite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F \u028E\u0254u\u0250\u2132", @@ -111,6 +119,7 @@ "block.create.flywheel": "\u05DF\u01DD\u01DD\u0265\u028D\u028E\u05DF\u2132", "block.create.framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132", "block.create.framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132", + "block.create.funnel": "\u05DF\u01DDuun\u2132", "block.create.furnace_engine": "\u01DDu\u0131bu\u018E \u01DD\u0254\u0250u\u0279n\u2132", "block.create.gabbro": "o\u0279qq\u0250\u2141", "block.create.gabbro_bricks": "s\u029E\u0254\u0131\u0279\u15FA o\u0279qq\u0250\u2141", @@ -160,6 +169,8 @@ "block.create.limestone_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", "block.create.limestone_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", "block.create.limestone_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780", + "block.create.linked_extractor": "\u0279o\u0287\u0254\u0250\u0279\u0287x\u018E p\u01DD\u029Eu\u0131\uA780", + "block.create.linked_transposer": "\u0279\u01DDsodsu\u0250\u0279\u27D8 p\u01DD\u029Eu\u0131\uA780", "block.create.mechanical_bearing": "bu\u0131\u0279\u0250\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.mechanical_crafter": "\u0279\u01DD\u0287\u025F\u0250\u0279\u0186 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.mechanical_mixer": "\u0279\u01DDx\u0131W \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", @@ -256,7 +267,12 @@ "block.create.polished_weathered_limestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u0265s\u0131\u05DFo\u0500", "block.create.polished_weathered_limestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u0265s\u0131\u05DFo\u0500", "block.create.portable_storage_interface": "\u01DD\u0254\u0250\u025F\u0279\u01DD\u0287uI \u01DDb\u0250\u0279o\u0287S \u01DD\u05DFq\u0250\u0287\u0279o\u0500", + "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_repeater": "\u0279\u01DD\u0287\u0250\u01DDd\u01DD\u1D1A \u01DDs\u05DFn\u0500", + "block.create.redstone_contact": "\u0287\u0254\u0250\u0287uo\u0186 \u01DDuo\u0287sp\u01DD\u1D1A", + "block.create.redstone_link": "\u029Eu\u0131\uA780 \u01DDuo\u0287sp\u01DD\u1D1A", "block.create.rope": "\u01DDdo\u1D1A", "block.create.rope_pulley": "\u028E\u01DD\u05DF\u05DFn\u0500 \u01DDdo\u1D1A", "block.create.rotation_chassis": "s\u0131ss\u0250\u0265\u0186 \u05DF\u0250\u0131p\u0250\u1D1A", @@ -280,14 +296,21 @@ "block.create.spruce_window": "\u028Dopu\u0131M \u01DD\u0254n\u0279dS", "block.create.spruce_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u01DD\u0254n\u0279dS", "block.create.sticky_mechanical_piston": "uo\u0287s\u0131\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW \u028E\u029E\u0254\u0131\u0287S", + "block.create.stockpile_switch": "\u0265\u0254\u0287\u0131\u028DS \u01DD\u05DF\u0131d\u029E\u0254o\u0287S", "block.create.stressometer": "\u0279\u01DD\u0287\u01DD\u026Foss\u01DD\u0279\u0287S", "block.create.tiled_glass": "ss\u0250\u05DF\u2141 p\u01DD\u05DF\u0131\u27D8", "block.create.tiled_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u05DF\u0131\u27D8", "block.create.translation_chassis": "s\u0131ss\u0250\u0265\u0186 \u0279\u0250\u01DDu\u0131\uA780", "block.create.translation_chassis_secondary": "s\u0131ss\u0250\u0265\u0186 \u0279\u0250\u01DDu\u0131\uA780 \u028E\u0279\u0250puo\u0254\u01DDS", + "block.create.transposer": "\u0279\u01DDsodsu\u0250\u0279\u27D8", "block.create.turntable": "\u01DD\u05DFq\u0250\u0287u\u0279n\u27D8", + "block.create.vertical_extractor": "\u0279o\u0287\u0254\u0250\u0279\u0287x\u018E \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.vertical_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.vertical_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", + "block.create.vertical_funnel": "\u05DF\u01DDuun\u2132 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", + "block.create.vertical_linked_extractor": "\u0279o\u0287\u0254\u0250\u0279\u0287x\u018E p\u01DD\u029Eu\u0131\uA780 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", + "block.create.vertical_linked_transposer": "\u0279\u01DDsodsu\u0250\u0279\u27D8 p\u01DD\u029Eu\u0131\uA780 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", + "block.create.vertical_transposer": "\u0279\u01DDsodsu\u0250\u0279\u27D8 \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B", "block.create.water_wheel": "\u05DF\u01DD\u01DD\u0265M \u0279\u01DD\u0287\u0250M", "block.create.weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", "block.create.weathered_limestone_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 06202f1c7..414693270 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1,7 +1,11 @@ { "block.create.acacia_window": "Acacia Window", "block.create.acacia_window_pane": "Acacia Window Pane", + "block.create.adjustable_crate": "Adjustable Crate", "block.create.adjustable_pulley": "Adjustable Pulley", + "block.create.adjustable_pulse_repeater": "Adjustable Pulse Repeater", + "block.create.adjustable_repeater": "Adjustable Repeater", + "block.create.analog_lever": "Analog Lever", "block.create.andesite_bricks": "Andesite Bricks", "block.create.andesite_bricks_slab": "Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "Andesite Bricks Stairs", @@ -14,6 +18,8 @@ "block.create.andesite_pillar": "Andesite Pillar", "block.create.basin": "Basin", "block.create.belt": "Belt", + "block.create.belt_observer": "Belt Observer", + "block.create.belt_tunnel": "Belt Tunnel", "block.create.birch_window": "Birch Window", "block.create.birch_window_pane": "Birch Window Pane", "block.create.brass_block": "Brass Block", @@ -32,6 +38,7 @@ "block.create.copper_casing": "Copper Casing", "block.create.copper_ore": "Copper Ore", "block.create.copper_shingles": "Copper Shingles", + "block.create.creative_crate": "Creative Crate", "block.create.creative_motor": "Creative Motor", "block.create.crushing_wheel": "Crushing Wheel", "block.create.crushing_wheel_controller": "Crushing Wheel Controller", @@ -72,6 +79,7 @@ "block.create.encased_belt": "Encased Belt", "block.create.encased_fan": "Encased Fan", "block.create.encased_shaft": "Encased Shaft", + "block.create.extractor": "Extractor", "block.create.fancy_andesite_bricks": "Fancy Andesite Bricks", "block.create.fancy_andesite_bricks_slab": "Fancy Andesite Bricks Slab", "block.create.fancy_andesite_bricks_stairs": "Fancy Andesite Bricks Stairs", @@ -111,6 +119,7 @@ "block.create.flywheel": "Flywheel", "block.create.framed_glass": "Framed Glass", "block.create.framed_glass_pane": "Framed Glass Pane", + "block.create.funnel": "Funnel", "block.create.furnace_engine": "Furnace Engine", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Gabbro Bricks", @@ -160,6 +169,8 @@ "block.create.limestone_cobblestone_stairs": "Limestone Cobblestone Stairs", "block.create.limestone_cobblestone_wall": "Limestone Cobblestone Wall", "block.create.limestone_pillar": "Limestone Pillar", + "block.create.linked_extractor": "Linked Extractor", + "block.create.linked_transposer": "Linked Transposer", "block.create.mechanical_bearing": "Mechanical Bearing", "block.create.mechanical_crafter": "Mechanical Crafter", "block.create.mechanical_mixer": "Mechanical Mixer", @@ -256,7 +267,12 @@ "block.create.polished_weathered_limestone_stairs": "Polished Weathered Limestone Stairs", "block.create.polished_weathered_limestone_wall": "Polished Weathered Limestone Wall", "block.create.portable_storage_interface": "Portable Storage Interface", + "block.create.powered_latch": "Powered Latch", + "block.create.powered_toggle_latch": "Powered Toggle Latch", "block.create.pulley_magnet": "Pulley Magnet", + "block.create.pulse_repeater": "Pulse Repeater", + "block.create.redstone_contact": "Redstone Contact", + "block.create.redstone_link": "Redstone Link", "block.create.rope": "Rope", "block.create.rope_pulley": "Rope Pulley", "block.create.rotation_chassis": "Radial Chassis", @@ -280,14 +296,21 @@ "block.create.spruce_window": "Spruce Window", "block.create.spruce_window_pane": "Spruce Window Pane", "block.create.sticky_mechanical_piston": "Sticky Mechanical Piston", + "block.create.stockpile_switch": "Stockpile Switch", "block.create.stressometer": "Stressometer", "block.create.tiled_glass": "Tiled Glass", "block.create.tiled_glass_pane": "Tiled Glass Pane", "block.create.translation_chassis": "Linear Chassis", "block.create.translation_chassis_secondary": "Secondary Linear Chassis", + "block.create.transposer": "Transposer", "block.create.turntable": "Turntable", + "block.create.vertical_extractor": "Vertical Extractor", "block.create.vertical_framed_glass": "Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "Vertical Framed Glass Pane", + "block.create.vertical_funnel": "Vertical Funnel", + "block.create.vertical_linked_extractor": "Vertical Linked Extractor", + "block.create.vertical_linked_transposer": "Vertical Linked Transposer", + "block.create.vertical_transposer": "Vertical Transposer", "block.create.water_wheel": "Water Wheel", "block.create.weathered_limestone": "Weathered Limestone", "block.create.weathered_limestone_bricks": "Weathered Limestone Bricks", 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 new file mode 100644 index 000000000..f1bbd00c2 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powered.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 000000000..ef5b064df --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powered_powering.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/adjustable_pulse_repeater", + "textures": { + "torch": "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 new file mode 100644 index 000000000..47a6aa3b9 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_pulse_repeater_powering.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/adjustable_pulse_repeater", + "textures": { + "torch": "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 new file mode 100644 index 000000000..0022dae18 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_repeater_powered.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 000000000..8e6df4836 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_repeater_powered_powering.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/adjustable_repeater", + "textures": { + "torch": "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 new file mode 100644 index 000000000..9f5cc8a40 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/adjustable_repeater_powering.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/adjustable_repeater", + "textures": { + "torch": "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/belt_observer/detect.json b/src/generated/resources/assets/create/models/block/belt_observer/detect.json new file mode 100644 index 000000000..2d895145a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/detect.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base", + "textures": { + "texture": "create:block/belt_observer_detect" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/detect_belt.json b/src/generated/resources/assets/create/models/block/belt_observer/detect_belt.json new file mode 100644 index 000000000..457f5d21d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/detect_belt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_belt", + "textures": { + "texture": "create:block/belt_observer_detect" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/detect_belt_powered.json b/src/generated/resources/assets/create/models/block/belt_observer/detect_belt_powered.json new file mode 100644 index 000000000..a0b2b28d3 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/detect_belt_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_belt_powered", + "textures": { + "texture": "create:block/belt_observer_detect_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/detect_powered.json b/src/generated/resources/assets/create/models/block/belt_observer/detect_powered.json new file mode 100644 index 000000000..5e47b062d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/detect_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_powered", + "textures": { + "texture": "create:block/belt_observer_detect_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/eject.json b/src/generated/resources/assets/create/models/block/belt_observer/eject.json new file mode 100644 index 000000000..b3ca66e24 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/eject.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base", + "textures": { + "texture": "create:block/belt_observer_eject" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/eject_belt.json b/src/generated/resources/assets/create/models/block/belt_observer/eject_belt.json new file mode 100644 index 000000000..a9f7029e7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/eject_belt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_belt", + "textures": { + "texture": "create:block/belt_observer_eject" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/eject_belt_powered.json b/src/generated/resources/assets/create/models/block/belt_observer/eject_belt_powered.json new file mode 100644 index 000000000..77cc7bee9 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/eject_belt_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_belt_powered", + "textures": { + "texture": "create:block/belt_observer_eject_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/eject_powered.json b/src/generated/resources/assets/create/models/block/belt_observer/eject_powered.json new file mode 100644 index 000000000..ba74df7ba --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/eject_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_powered", + "textures": { + "texture": "create:block/belt_observer_eject_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/pulse.json b/src/generated/resources/assets/create/models/block/belt_observer/pulse.json new file mode 100644 index 000000000..96053ebdd --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/pulse.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base", + "textures": { + "texture": "create:block/belt_observer_pulse" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/pulse_belt.json b/src/generated/resources/assets/create/models/block/belt_observer/pulse_belt.json new file mode 100644 index 000000000..17c00b4d2 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/pulse_belt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_belt", + "textures": { + "texture": "create:block/belt_observer_pulse" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/pulse_belt_powered.json b/src/generated/resources/assets/create/models/block/belt_observer/pulse_belt_powered.json new file mode 100644 index 000000000..5b36ec7ed --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/pulse_belt_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_belt_powered", + "textures": { + "texture": "create:block/belt_observer_pulse_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/pulse_powered.json b/src/generated/resources/assets/create/models/block/belt_observer/pulse_powered.json new file mode 100644 index 000000000..316f2a16f --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/pulse_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_powered", + "textures": { + "texture": "create:block/belt_observer_pulse_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/split.json b/src/generated/resources/assets/create/models/block/belt_observer/split.json new file mode 100644 index 000000000..2c36d0dce --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/split.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base", + "textures": { + "texture": "create:block/belt_observer_split" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/split_belt.json b/src/generated/resources/assets/create/models/block/belt_observer/split_belt.json new file mode 100644 index 000000000..d6e303816 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/split_belt.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_belt", + "textures": { + "texture": "create:block/belt_observer_split" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/split_belt_powered.json b/src/generated/resources/assets/create/models/block/belt_observer/split_belt_powered.json new file mode 100644 index 000000000..1ae9418ca --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/split_belt_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_belt_powered", + "textures": { + "texture": "create:block/belt_observer_split_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/belt_observer/split_powered.json b/src/generated/resources/assets/create/models/block/belt_observer/split_powered.json new file mode 100644 index 000000000..3b2229601 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/belt_observer/split_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/belt_observer/base_powered", + "textures": { + "texture": "create:block/belt_observer_split_powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/bottom.json b/src/generated/resources/assets/create/models/block/crate/brass/bottom.json new file mode 100644 index 000000000..8c93e8863 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/brass/bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/bottom", + "textures": { + "crate": "create:block/crate_brass", + "side": "create:block/crate_brass_side", + "casing": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/left.json b/src/generated/resources/assets/create/models/block/crate/brass/left.json new file mode 100644 index 000000000..bd7d013c7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/brass/left.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/left", + "textures": { + "crate": "create:block/crate_brass", + "side": "create:block/crate_brass_side", + "casing": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/right.json b/src/generated/resources/assets/create/models/block/crate/brass/right.json new file mode 100644 index 000000000..ab12b0aa2 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/brass/right.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/right", + "textures": { + "crate": "create:block/crate_brass", + "side": "create:block/crate_brass_side", + "casing": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/single.json b/src/generated/resources/assets/create/models/block/crate/brass/single.json new file mode 100644 index 000000000..6e294b01c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/brass/single.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/single", + "textures": { + "crate": "create:block/crate_brass", + "side": "create:block/crate_brass_side", + "casing": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/brass/top.json b/src/generated/resources/assets/create/models/block/crate/brass/top.json new file mode 100644 index 000000000..752b38aee --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/brass/top.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/top", + "textures": { + "crate": "create:block/crate_brass", + "side": "create:block/crate_brass_side", + "casing": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/creative/bottom.json b/src/generated/resources/assets/create/models/block/crate/creative/bottom.json new file mode 100644 index 000000000..15f1b28f5 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/creative/bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/bottom", + "textures": { + "crate": "create:block/crate_creative", + "side": "create:block/crate_creative_side", + "casing": "create:block/creative_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/creative/left.json b/src/generated/resources/assets/create/models/block/crate/creative/left.json new file mode 100644 index 000000000..5e007e01e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/creative/left.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/left", + "textures": { + "crate": "create:block/crate_creative", + "side": "create:block/crate_creative_side", + "casing": "create:block/creative_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/creative/right.json b/src/generated/resources/assets/create/models/block/crate/creative/right.json new file mode 100644 index 000000000..39700ec5a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/creative/right.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/right", + "textures": { + "crate": "create:block/crate_creative", + "side": "create:block/crate_creative_side", + "casing": "create:block/creative_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/creative/single.json b/src/generated/resources/assets/create/models/block/crate/creative/single.json new file mode 100644 index 000000000..c0d8d8a20 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/creative/single.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/single", + "textures": { + "crate": "create:block/crate_creative", + "side": "create:block/crate_creative_side", + "casing": "create:block/creative_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/crate/creative/top.json b/src/generated/resources/assets/create/models/block/crate/creative/top.json new file mode 100644 index 000000000..1529b7f37 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/crate/creative/top.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/crate/top", + "textures": { + "crate": "create:block/crate_creative", + "side": "create:block/crate_creative_side", + "casing": "create:block/creative_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/powered_latch.json b/src/generated/resources/assets/create/models/block/powered_latch.json new file mode 100644 index 000000000..dc18c5658 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/powered_latch.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/diodes/latch_off", + "textures": { + "top": "create:block/diodes/powered_latch/idle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/powered_latch_powered.json b/src/generated/resources/assets/create/models/block/powered_latch_powered.json new file mode 100644 index 000000000..004e6db09 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/powered_latch_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/diodes/latch_on", + "textures": { + "top": "create:block/diodes/powered_latch/powering" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/powered_toggle_latch_off_powered.json b/src/generated/resources/assets/create/models/block/powered_toggle_latch_off_powered.json new file mode 100644 index 000000000..551c5da9a --- /dev/null +++ b/src/generated/resources/assets/create/models/block/powered_toggle_latch_off_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/diodes/latch_off", + "textures": { + "top": "create:block/diodes/powered_toggle_latch/powered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/powered_toggle_latch_on_powered.json b/src/generated/resources/assets/create/models/block/powered_toggle_latch_on_powered.json new file mode 100644 index 000000000..6ab16a422 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/powered_toggle_latch_on_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/diodes/latch_on", + "textures": { + "top": "create:block/diodes/powered_toggle_latch/powered_powering" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/pulse_repeater_powered.json b/src/generated/resources/assets/create/models/block/pulse_repeater_powered.json new file mode 100644 index 000000000..d3b0c2ff0 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/pulse_repeater_powered.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/diodes/pulse_repeater", + "textures": { + "top": "create:block/diodes/pulse_repeater/powered" + } +} \ 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 new file mode 100644 index 000000000..c748152eb --- /dev/null +++ b/src/generated/resources/assets/create/models/block/pulse_repeater_pulsing.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/diodes/pulse_repeater", + "textures": { + "top": "create:block/diodes/pulse_repeater/powered", + "torch": "block/redstone_torch" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/stockpile_switch_0.json b/src/generated/resources/assets/create/models/block/stockpile_switch_0.json new file mode 100644 index 000000000..4d1b9b70e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/stockpile_switch_0.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/stockpile_switch", + "textures": { + "indicator": "create:block/indicator/0" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/stockpile_switch_1.json b/src/generated/resources/assets/create/models/block/stockpile_switch_1.json new file mode 100644 index 000000000..288dc2927 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/stockpile_switch_1.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/stockpile_switch", + "textures": { + "indicator": "create:block/indicator/1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/stockpile_switch_2.json b/src/generated/resources/assets/create/models/block/stockpile_switch_2.json new file mode 100644 index 000000000..8b0da8a21 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/stockpile_switch_2.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/stockpile_switch", + "textures": { + "indicator": "create:block/indicator/2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/stockpile_switch_3.json b/src/generated/resources/assets/create/models/block/stockpile_switch_3.json new file mode 100644 index 000000000..fc3e40132 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/stockpile_switch_3.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/stockpile_switch", + "textures": { + "indicator": "create:block/indicator/3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/stockpile_switch_4.json b/src/generated/resources/assets/create/models/block/stockpile_switch_4.json new file mode 100644 index 000000000..2194e2c69 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/stockpile_switch_4.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/stockpile_switch", + "textures": { + "indicator": "create:block/indicator/4" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/stockpile_switch_5.json b/src/generated/resources/assets/create/models/block/stockpile_switch_5.json new file mode 100644 index 000000000..eb0f8298c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/stockpile_switch_5.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/stockpile_switch", + "textures": { + "indicator": "create:block/indicator/5" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/stockpile_switch_6.json b/src/generated/resources/assets/create/models/block/stockpile_switch_6.json new file mode 100644 index 000000000..58a83e646 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/stockpile_switch_6.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/stockpile_switch", + "textures": { + "indicator": "create:block/indicator/6" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/adjustable_crate.json b/src/generated/resources/assets/create/models/item/adjustable_crate.json new file mode 100644 index 000000000..619cce82a --- /dev/null +++ b/src/generated/resources/assets/create/models/item/adjustable_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/crate/brass/single" +} \ 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 new file mode 100644 index 000000000..b5bf8a30a --- /dev/null +++ b/src/generated/resources/assets/create/models/item/adjustable_pulse_repeater.json @@ -0,0 +1,6 @@ +{ + "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 new file mode 100644 index 000000000..075f54798 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/adjustable_repeater.json @@ -0,0 +1,6 @@ +{ + "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/analog_lever.json b/src/generated/resources/assets/create/models/item/analog_lever.json new file mode 100644 index 000000000..894c4617e --- /dev/null +++ b/src/generated/resources/assets/create/models/item/analog_lever.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/analog_lever/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/belt_observer.json b/src/generated/resources/assets/create/models/item/belt_observer.json new file mode 100644 index 000000000..84c140675 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/belt_observer.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/belt_observer/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/belt_tunnel.json b/src/generated/resources/assets/create/models/item/belt_tunnel.json new file mode 100644 index 000000000..e47d5d8df --- /dev/null +++ b/src/generated/resources/assets/create/models/item/belt_tunnel.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/belt_tunnel/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/creative_crate.json b/src/generated/resources/assets/create/models/item/creative_crate.json new file mode 100644 index 000000000..51efc3bf4 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/creative_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/crate/creative/single" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/extractor.json b/src/generated/resources/assets/create/models/item/extractor.json new file mode 100644 index 000000000..b1020a4b7 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/extractor.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/extractor/horizontal" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/funnel.json b/src/generated/resources/assets/create/models/item/funnel.json new file mode 100644 index 000000000..2092f1ffc --- /dev/null +++ b/src/generated/resources/assets/create/models/item/funnel.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/funnel/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/linked_extractor.json b/src/generated/resources/assets/create/models/item/linked_extractor.json new file mode 100644 index 000000000..496b86e3f --- /dev/null +++ b/src/generated/resources/assets/create/models/item/linked_extractor.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/extractor/horizontal_linked" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/linked_transposer.json b/src/generated/resources/assets/create/models/item/linked_transposer.json new file mode 100644 index 000000000..6cee96fc1 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/linked_transposer.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/transposer/horizontal_linked" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/powered_latch.json b/src/generated/resources/assets/create/models/item/powered_latch.json new file mode 100644 index 000000000..dffbc022c --- /dev/null +++ b/src/generated/resources/assets/create/models/item/powered_latch.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/powered_latch" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/powered_toggle_latch.json b/src/generated/resources/assets/create/models/item/powered_toggle_latch.json new file mode 100644 index 000000000..35206088f --- /dev/null +++ b/src/generated/resources/assets/create/models/item/powered_toggle_latch.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/diodes/latch_off" +} \ 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 new file mode 100644 index 000000000..bb648b0e5 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/pulse_repeater.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/diodes/pulse_repeater" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/redstone_contact.json b/src/generated/resources/assets/create/models/item/redstone_contact.json new file mode 100644 index 000000000..2f4a05429 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/redstone_contact.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/redstone_contact/block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/redstone_link.json b/src/generated/resources/assets/create/models/item/redstone_link.json new file mode 100644 index 000000000..c49dfb365 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/redstone_link.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/redstone_link/transmitter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/stockpile_switch.json b/src/generated/resources/assets/create/models/item/stockpile_switch.json new file mode 100644 index 000000000..3e623a7d5 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/stockpile_switch.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/stockpile_switch" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/transposer.json b/src/generated/resources/assets/create/models/item/transposer.json new file mode 100644 index 000000000..0fedb1b93 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/transposer.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/transposer/block" +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/entity_detector.json b/src/generated/resources/data/create/loot_tables/blocks/adjustable_crate.json similarity index 85% rename from src/generated/resources/data/create/loot_tables/blocks/entity_detector.json rename to src/generated/resources/data/create/loot_tables/blocks/adjustable_crate.json index ba7d1826c..af4517d40 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/entity_detector.json +++ b/src/generated/resources/data/create/loot_tables/blocks/adjustable_crate.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:entity_detector" + "name": "create:adjustable_crate" } ], "conditions": [ 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 new file mode 100644 index 000000000..a8155e67d --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/adjustable_pulse_repeater.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:adjustable_pulse_repeater" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ 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/adjustable_repeater.json new file mode 100644 index 000000000..c4475c7e1 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/adjustable_repeater.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:adjustable_repeater" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json b/src/generated/resources/data/create/loot_tables/blocks/belt_observer.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json rename to src/generated/resources/data/create/loot_tables/blocks/belt_observer.json index 2015decf2..3919e58e4 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/belt_funnel.json +++ b/src/generated/resources/data/create/loot_tables/blocks/belt_observer.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:belt_funnel" + "name": "create:belt_observer" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/extractor.json b/src/generated/resources/data/create/loot_tables/blocks/extractor.json index 3a44e834b..78793172c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/extractor.json +++ b/src/generated/resources/data/create/loot_tables/blocks/extractor.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:extractor" + "name": "minecraft:air" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/flexpulsepeater.json b/src/generated/resources/data/create/loot_tables/blocks/flexpulsepeater.json deleted file mode 100644 index 79cb57dc4..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/flexpulsepeater.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "create:flexpulsepeater" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/contact.json b/src/generated/resources/data/create/loot_tables/blocks/funnel.json similarity index 88% rename from src/generated/resources/data/create/loot_tables/blocks/contact.json rename to src/generated/resources/data/create/loot_tables/blocks/funnel.json index ad689eee1..78793172c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/contact.json +++ b/src/generated/resources/data/create/loot_tables/blocks/funnel.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:contact" + "name": "minecraft:air" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json b/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json index 31ecac893..78793172c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json +++ b/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:linked_transposer" + "name": "minecraft:air" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/flexpeater.json b/src/generated/resources/data/create/loot_tables/blocks/powered_latch.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/flexpeater.json rename to src/generated/resources/data/create/loot_tables/blocks/powered_latch.json index f197c10a5..3e5189a57 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/flexpeater.json +++ b/src/generated/resources/data/create/loot_tables/blocks/powered_latch.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:flexpeater" + "name": "create:powered_latch" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/powered_toggle_latch.json b/src/generated/resources/data/create/loot_tables/blocks/powered_toggle_latch.json new file mode 100644 index 000000000..54d3cc72c --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/powered_toggle_latch.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:powered_toggle_latch" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/redstone_bridge.json b/src/generated/resources/data/create/loot_tables/blocks/redstone_bridge.json deleted file mode 100644 index 74b60e308..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/redstone_bridge.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "create:redstone_bridge" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/redstone_contact.json b/src/generated/resources/data/create/loot_tables/blocks/redstone_contact.json new file mode 100644 index 000000000..06c256e8f --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/redstone_contact.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:redstone_contact" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/redstone_latch.json b/src/generated/resources/data/create/loot_tables/blocks/redstone_latch.json deleted file mode 100644 index 527015d65..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/redstone_latch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "create:redstone_latch" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/flexcrate.json b/src/generated/resources/data/create/loot_tables/blocks/redstone_link.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/flexcrate.json rename to src/generated/resources/data/create/loot_tables/blocks/redstone_link.json index 5ec74ffcf..adb163fdc 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/flexcrate.json +++ b/src/generated/resources/data/create/loot_tables/blocks/redstone_link.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:flexcrate" + "name": "create:redstone_link" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/stockpile_switch.json b/src/generated/resources/data/create/loot_tables/blocks/stockpile_switch.json new file mode 100644 index 000000000..be2e38027 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/stockpile_switch.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:stockpile_switch" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/stockswitch.json b/src/generated/resources/data/create/loot_tables/blocks/stockswitch.json deleted file mode 100644 index d0ac2042a..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/stockswitch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "create:stockswitch" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/toggle_latch.json b/src/generated/resources/data/create/loot_tables/blocks/toggle_latch.json deleted file mode 100644 index 3d2ba3f49..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/toggle_latch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "create:toggle_latch" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/transposer.json b/src/generated/resources/data/create/loot_tables/blocks/transposer.json index 846ecd381..78793172c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/transposer.json +++ b/src/generated/resources/data/create/loot_tables/blocks/transposer.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:transposer" + "name": "minecraft:air" } ], "conditions": [ diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index 10d874f67..b249653fb 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -52,7 +52,7 @@ public enum AllBlockPartials { ANALOG_LEVER_INDICATOR("analog_lever/indicator"), BELT_TUNNEL_FLAP("belt_tunnel/flap"), BELT_TUNNEL_INDICATOR("belt_tunnel/indicator"), - FLEXPEATER_INDICATOR("repeaters/flexpeater_indicator"), + FLEXPEATER_INDICATOR("diodes/indicator"), FLYWHEEL("flywheel/wheel"), FLYWHEEL_UPPER_ROTATING("flywheel/upper_rotating_connector"), FLYWHEEL_LOWER_ROTATING("flywheel/lower_rotating_connector"), diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 0013c4182..cde435aea 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -10,23 +10,6 @@ import com.simibubi.create.foundation.block.ProperStairsBlock; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.data.ITaggable; import com.simibubi.create.modules.Sections; -import com.simibubi.create.modules.contraptions.redstone.AnalogLeverBlock; -import com.simibubi.create.modules.contraptions.redstone.ContactBlock; -import com.simibubi.create.modules.logistics.block.RedstoneLinkBlock; -import com.simibubi.create.modules.logistics.block.StockswitchBlock; -import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverBlock; -import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelBlock; -import com.simibubi.create.modules.logistics.block.diodes.FlexpeaterBlock; -import com.simibubi.create.modules.logistics.block.diodes.LatchBlock; -import com.simibubi.create.modules.logistics.block.diodes.PulseRepeaterBlock; -import com.simibubi.create.modules.logistics.block.diodes.ToggleLatchBlock; -import com.simibubi.create.modules.logistics.block.extractor.ExtractorBlock; -import com.simibubi.create.modules.logistics.block.extractor.LinkedExtractorBlock; -import com.simibubi.create.modules.logistics.block.funnel.FunnelBlock; -import com.simibubi.create.modules.logistics.block.inventories.CreativeCrateBlock; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateBlock; -import com.simibubi.create.modules.logistics.block.transposer.LinkedTransposerBlock; -import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.providers.ProviderType; @@ -39,7 +22,6 @@ import com.tterrag.registrate.util.nullness.NonNullSupplier; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import net.minecraft.block.Block; -import net.minecraft.block.Block.Properties; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.FenceBlock; @@ -122,29 +104,34 @@ public enum AllBlocks implements NonNullSupplier { _2_(Sections.LOGISTICS), - CONTACT(ContactBlock::new), - REDSTONE_BRIDGE(RedstoneLinkBlock::new), - STOCKSWITCH(StockswitchBlock::new), - FLEXCRATE(FlexcrateBlock::new), - CREATIVE_CRATE(() -> new CreativeCrateBlock(Properties.from(Blocks.CHEST))), - EXTRACTOR(ExtractorBlock::new), - VERTICAL_EXTRACTOR(ExtractorBlock.Vertical::new, ComesWith.NO_BLOCKITEM), - LINKED_EXTRACTOR(LinkedExtractorBlock::new), - VERTICAL_LINKED_EXTRACTOR(LinkedExtractorBlock.Vertical::new, ComesWith.NO_BLOCKITEM), - TRANSPOSER(TransposerBlock::new), - VERTICAL_TRANSPOSER(TransposerBlock.Vertical::new, ComesWith.NO_BLOCKITEM), - LINKED_TRANSPOSER(LinkedTransposerBlock::new), - VERTICAL_LINKED_TRANSPOSER(LinkedTransposerBlock.Vertical::new, ComesWith.NO_BLOCKITEM), - BELT_FUNNEL(FunnelBlock::new), - VERTICAL_FUNNEL(FunnelBlock.Vertical::new, ComesWith.NO_BLOCKITEM), - BELT_TUNNEL(BeltTunnelBlock::new), - ENTITY_DETECTOR(BeltObserverBlock::new), - ANALOG_LEVER(AnalogLeverBlock::new), - PULSE_REPEATER(PulseRepeaterBlock::new), - FLEXPEATER(FlexpeaterBlock::new), - FLEXPULSEPEATER(FlexpeaterBlock::new), - REDSTONE_LATCH(LatchBlock::new), - TOGGLE_LATCH(ToggleLatchBlock::new), +// CONTACT(ContactBlock::new), +// REDSTONE_BRIDGE(RedstoneLinkBlock::new), +// STOCKSWITCH(StockpileSwitchBlock::new), +// FLEXCRATE(FlexcrateBlock::new), +// CREATIVE_CRATE(() -> new CreativeCrateBlock(Properties.from(Blocks.CHEST))), + +// EXTRACTOR(ExtractorBlock::new), +// VERTICAL_EXTRACTOR(ExtractorBlock.Vertical::new, ComesWith.NO_BLOCKITEM), +// LINKED_EXTRACTOR(LinkedExtractorBlock::new), +// VERTICAL_LINKED_EXTRACTOR(LinkedExtractorBlock.Vertical::new, ComesWith.NO_BLOCKITEM), + +// TRANSPOSER(TransposerBlock::new), +// VERTICAL_TRANSPOSER(TransposerBlock.Vertical::new, ComesWith.NO_BLOCKITEM), +// LINKED_TRANSPOSER(LinkedTransposerBlock::new), +// VERTICAL_LINKED_TRANSPOSER(LinkedTransposerBlock.Vertical::new, ComesWith.NO_BLOCKITEM), + +// BELT_FUNNEL(FunnelBlock::new), +// VERTICAL_FUNNEL(FunnelBlock.Vertical::new, ComesWith.NO_BLOCKITEM), + +// BELT_TUNNEL(BeltTunnelBlock::new), +// ENTITY_DETECTOR(BeltObserverBlock::new), +// ANALOG_LEVER(AnalogLeverBlock::new), + +// PULSE_REPEATER(PulseRepeaterBlock::new), +// FLEXPEATER(FlexpeaterBlock::new), +// FLEXPULSEPEATER(FlexpeaterBlock::new), +// REDSTONE_LATCH(LatchBlock::new), +// TOGGLE_LATCH(ToggleLatchBlock::new), _3_(Sections.MATERIALS), diff --git a/src/main/java/com/simibubi/create/AllBlocksNew.java b/src/main/java/com/simibubi/create/AllBlocksNew.java index 48cb2a22f..944492d32 100644 --- a/src/main/java/com/simibubi/create/AllBlocksNew.java +++ b/src/main/java/com/simibubi/create/AllBlocksNew.java @@ -52,6 +52,8 @@ import com.simibubi.create.modules.contraptions.components.saw.SawGenerator; import com.simibubi.create.modules.contraptions.components.turntable.TurntableBlock; import com.simibubi.create.modules.contraptions.components.waterwheel.WaterWheelBlock; import com.simibubi.create.modules.contraptions.processing.BasinBlock; +import com.simibubi.create.modules.contraptions.redstone.AnalogLeverBlock; +import com.simibubi.create.modules.contraptions.redstone.RedstoneContactBlock; import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerBlock; import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock; import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftGenerator; @@ -69,6 +71,30 @@ import com.simibubi.create.modules.contraptions.relays.encased.GearshiftBlock; import com.simibubi.create.modules.contraptions.relays.gauge.GaugeBlock; import com.simibubi.create.modules.contraptions.relays.gauge.GaugeGenerator; import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxBlock; +import com.simibubi.create.modules.logistics.block.RedstoneLinkBlock; +import com.simibubi.create.modules.logistics.block.RedstoneLinkGenerator; +import com.simibubi.create.modules.logistics.block.StockpileSwitchBlock; +import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverBlock; +import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelBlock; +import com.simibubi.create.modules.logistics.block.diodes.AbstractDiodeGenerator; +import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterBlock; +import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterGenerator; +import com.simibubi.create.modules.logistics.block.diodes.PoweredLatchBlock; +import com.simibubi.create.modules.logistics.block.diodes.PoweredLatchGenerator; +import com.simibubi.create.modules.logistics.block.diodes.PulseRepeaterBlock; +import com.simibubi.create.modules.logistics.block.diodes.PulseRepeaterGenerator; +import com.simibubi.create.modules.logistics.block.diodes.ToggleLatchBlock; +import com.simibubi.create.modules.logistics.block.diodes.ToggleLatchGenerator; +import com.simibubi.create.modules.logistics.block.extractor.ExtractorBlock; +import com.simibubi.create.modules.logistics.block.extractor.LinkedExtractorBlock; +import com.simibubi.create.modules.logistics.block.extractor.VerticalExtractorGenerator; +import com.simibubi.create.modules.logistics.block.funnel.FunnelBlock; +import com.simibubi.create.modules.logistics.block.funnel.VerticalFunnelGenerator; +import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateBlock; +import com.simibubi.create.modules.logistics.block.inventories.CreativeCrateBlock; +import com.simibubi.create.modules.logistics.block.transposer.LinkedTransposerBlock; +import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; +import com.simibubi.create.modules.logistics.block.transposer.VerticalTransposerGenerator; import com.simibubi.create.modules.schematics.block.SchematicTableBlock; import com.simibubi.create.modules.schematics.block.SchematicannonBlock; import com.tterrag.registrate.builders.BlockBuilder; @@ -89,6 +115,7 @@ import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; import net.minecraft.tags.TagCollection; +import net.minecraft.util.Direction.Axis; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.common.ToolType; @@ -127,13 +154,13 @@ public class AllBlocksNew { } public static final BlockEntry SHAFT = REGISTRATE.block("shaft", ShaftBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.axisBlockProvider(false)) .simpleItem() .register(); public static final BlockEntry COGWHEEL = REGISTRATE.block("cogwheel", CogWheelBlock::small) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .properties(p -> p.sound(SoundType.WOOD)) .blockstate(BlockStateGen.axisBlockProvider(false)) .item(CogwheelBlockItem::new) @@ -142,7 +169,7 @@ public class AllBlocksNew { public static final BlockEntry LARGE_COGWHEEL = REGISTRATE.block("large_cogwheel", CogWheelBlock::large) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .properties(p -> p.sound(SoundType.WOOD)) .blockstate(BlockStateGen.axisBlockProvider(false)) .item(CogwheelBlockItem::new) @@ -151,28 +178,32 @@ public class AllBlocksNew { public static final BlockEntry ENCASED_SHAFT = REGISTRATE.block("encased_shaft", EncasedShaftBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate(BlockStateGen.axisBlockProvider(true)) .item() .transform(customItemModel()) .register(); public static final BlockEntry GEARBOX = REGISTRATE.block("gearbox", GearboxBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate(BlockStateGen.axisBlockProvider(true)) .item() .transform(customItemModel()) .register(); public static final BlockEntry CLUTCH = REGISTRATE.block("clutch", ClutchBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate((c, p) -> BlockStateGen.axisBlock(c, p, AssetLookup.forPowered(c, p))) .item() .transform(customItemModel()) .register(); public static final BlockEntry GEARSHIFT = REGISTRATE.block("gearshift", GearshiftBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate((c, p) -> BlockStateGen.axisBlock(c, p, AssetLookup.forPowered(c, p))) .item() .transform(customItemModel()) @@ -180,7 +211,8 @@ public class AllBlocksNew { public static final BlockEntry ENCASED_BELT = REGISTRATE.block("encased_belt", EncasedBeltBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate((c, p) -> new EncasedBeltGenerator((state, suffix) -> p.models() .getExistingFile(p.modLoc("block/" + c.getName() + "/" + suffix))).generate(c, p)) .item() @@ -189,7 +221,8 @@ public class AllBlocksNew { public static final BlockEntry ADJUSTABLE_PULLEY = REGISTRATE.block("adjustable_pulley", AdjustablePulleyBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate((c, p) -> new EncasedBeltGenerator((state, suffix) -> { String powered = state.get(AdjustablePulleyBlock.POWERED) ? "_powered" : ""; return p.models() @@ -210,7 +243,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry CREATIVE_MOTOR = REGISTRATE.block("creative_motor", MotorBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(new MotorGenerator()::generate) .transform(StressConfigDefaults.setCapacity(16384.0)) .item() @@ -218,7 +251,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry WATER_WHEEL = REGISTRATE.block("water_wheel", WaterWheelBlock::new) - .initialProperties(SharedProperties::woodenKinetic) + .initialProperties(SharedProperties::wooden) .blockstate(BlockStateGen.horizontalWheelProvider(false)) .addLayer(() -> RenderType::getCutoutMipped) .transform(StressConfigDefaults.setCapacity(16.0)) @@ -226,7 +259,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry ENCASED_FAN = REGISTRATE.block("encased_fan", EncasedFanBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.directionalBlockProvider(true)) .addLayer(() -> RenderType::getCutoutMipped) .transform(StressConfigDefaults.setCapacity(16.0)) @@ -236,7 +269,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry NOZZLE = REGISTRATE.block("nozzle", NozzleBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.directionalBlockProvider(true)) .addLayer(() -> RenderType::getCutoutMipped) .item() @@ -244,14 +277,14 @@ public class AllBlocksNew { .register(); public static final BlockEntry TURNTABLE = REGISTRATE.block("turntable", TurntableBlock::new) - .initialProperties(SharedProperties::woodenKinetic) + .initialProperties(SharedProperties::wooden) .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.standardModel(c, p))) .transform(StressConfigDefaults.setImpact(4.0)) .simpleItem() .register(); public static final BlockEntry HAND_CRANK = REGISTRATE.block("hand_crank", HandCrankBlock::new) - .initialProperties(SharedProperties::woodenKinetic) + .initialProperties(SharedProperties::wooden) .blockstate(BlockStateGen.directionalBlockProvider(true)) .transform(StressConfigDefaults.setCapacity(32.0)) .item() @@ -270,7 +303,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry MILLSTONE = REGISTRATE.block("millstone", MillstoneBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) .transform(StressConfigDefaults.setImpact(4.0)) .item() @@ -279,7 +312,7 @@ public class AllBlocksNew { public static final BlockEntry CRUSHING_WHEEL = REGISTRATE.block("crushing_wheel", CrushingWheelBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.axisBlockProvider(false)) .addLayer(() -> RenderType::getCutoutMipped) .transform(StressConfigDefaults.setImpact(8.0)) @@ -298,7 +331,8 @@ public class AllBlocksNew { public static final BlockEntry MECHANICAL_PRESS = REGISTRATE.block("mechanical_press", MechanicalPressBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate(BlockStateGen.horizontalBlockProvider(true)) .transform(StressConfigDefaults.setImpact(8.0)) .item(BasinOperatorBlockItem::new) @@ -307,7 +341,8 @@ public class AllBlocksNew { public static final BlockEntry MECHANICAL_MIXER = REGISTRATE.block("mechanical_mixer", MechanicalMixerBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) .addLayer(() -> RenderType::getCutoutMipped) .transform(StressConfigDefaults.setImpact(4.0)) @@ -316,23 +351,23 @@ public class AllBlocksNew { .register(); public static final BlockEntry BASIN = REGISTRATE.block("basin", BasinBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.standardModel(ctx, prov))) .simpleItem() .register(); public static final BlockEntry SPEEDOMETER = REGISTRATE.block("speedometer", GaugeBlock::speed) - .initialProperties(SharedProperties::woodenKinetic) + .initialProperties(SharedProperties::wooden) .blockstate(new GaugeGenerator()::generate) .item() - .transform(ModelGen.customItemModel("gauge", "_")) + .transform(ModelGen.customItemModel("gauge", "_", "item")) .register(); public static final BlockEntry STRESSOMETER = REGISTRATE.block("stressometer", GaugeBlock::stress) - .initialProperties(SharedProperties::woodenKinetic) + .initialProperties(SharedProperties::wooden) .blockstate(new GaugeGenerator()::generate) .item() - .transform(ModelGen.customItemModel("gauge", "_")) + .transform(ModelGen.customItemModel("gauge", "_", "item")) .register(); public static final BlockEntry MECHANICAL_PISTON = @@ -374,7 +409,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry ROPE_PULLEY = REGISTRATE.block("rope_pulley", PulleyBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.horizontalAxisBlockProvider(true)) .transform(StressConfigDefaults.setImpact(4.0)) .item() @@ -390,14 +425,15 @@ public class AllBlocksNew { public static final BlockEntry PULLEY_MAGNET = REGISTRATE.block("pulley_magnet", PulleyBlock.MagnetBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() .getExistingFile(p.modLoc("block/rope_pulley/" + c.getName())))) .register(); public static final BlockEntry CART_ASSEMBLER = REGISTRATE.block("cart_assembler", CartAssemblerBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate(BlockStateGen.cartAssembler()) .addLayer(() -> RenderType::getCutoutMipped) .tag(BlockTags.RAILS) @@ -409,14 +445,14 @@ public class AllBlocksNew { public static final BlockEntry MINECART_ANCHOR = REGISTRATE.block("minecart_anchor", MinecartAnchorBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() .getExistingFile(p.modLoc("block/cart_assembler/" + c.getName())))) .register(); public static final BlockEntry LINEAR_CHASSIS = REGISTRATE.block("translation_chassis", LinearChassisBlock::new) - .initialProperties(SharedProperties::woodenKinetic) + .initialProperties(SharedProperties::wooden) .blockstate(BlockStateGen.linearChassis()) .transform(connectedTextures(new ChassisCTBehaviour())) .lang("Linear Chassis") @@ -425,7 +461,7 @@ public class AllBlocksNew { public static final BlockEntry LINEAR_CHASSIS_SECONDARY = REGISTRATE.block("translation_chassis_secondary", LinearChassisBlock::new) - .initialProperties(SharedProperties::woodenKinetic) + .initialProperties(SharedProperties::wooden) .blockstate(BlockStateGen.linearChassis()) .transform(connectedTextures(new ChassisCTBehaviour())) .lang("Secondary Linear Chassis") @@ -434,7 +470,7 @@ public class AllBlocksNew { public static final BlockEntry RADIAL_CHASSIS = REGISTRATE.block("rotation_chassis", RadialChassisBlock::new) - .initialProperties(SharedProperties::woodenKinetic) + .initialProperties(SharedProperties::wooden) .blockstate(BlockStateGen.radialChassis()) .lang("Radial Chassis") .item() @@ -446,7 +482,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry DRILL = REGISTRATE.block("drill", DrillBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.directionalBlockProvider(true)) .transform(StressConfigDefaults.setImpact(4.0)) .lang("Mechanical Drill") @@ -455,7 +491,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry SAW = REGISTRATE.block("saw", SawBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(new SawGenerator()::generate) .transform(StressConfigDefaults.setImpact(4.0)) .addLayer(() -> RenderType::getCutoutMipped) @@ -467,7 +503,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry DEPLOYER = REGISTRATE.block("deployer", DeployerBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.directionalAxisBlockProvider()) .transform(StressConfigDefaults.setImpact(4.0)) .item() @@ -476,13 +512,13 @@ public class AllBlocksNew { public static final BlockEntry PORTABLE_STORAGE_INTERFACE = REGISTRATE.block("portable_storage_interface", PortableStorageInterfaceBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.directionalBlockProvider(false)) .simpleItem() .register(); public static final BlockEntry HARVESTER = REGISTRATE.block("harvester", HarvesterBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.horizontalBlockProvider(true)) .addLayer(() -> RenderType::getCutoutMipped) .lang("Mechanical Harvester") @@ -491,7 +527,7 @@ public class AllBlocksNew { .register(); public static final BlockEntry PLOUGH = REGISTRATE.block("plough", PloughBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate(BlockStateGen.horizontalBlockProvider(false)) .lang("Mechanical Plough") .simpleItem() @@ -511,7 +547,7 @@ public class AllBlocksNew { public static final BlockEntry MECHANICAL_CRAFTER = REGISTRATE.block("mechanical_crafter", MechanicalCrafterBlock::new) - .initialProperties(SharedProperties::metalKinetic) + .initialProperties(SharedProperties::softMetal) .blockstate(BlockStateGen.horizontalBlockProvider(true)) .transform(StressConfigDefaults.setImpact(2.0)) .addLayer(() -> RenderType::getCutoutMipped) @@ -521,37 +557,227 @@ public class AllBlocksNew { public static final BlockEntry SEQUENCED_GEARSHIFT = REGISTRATE.block("sequenced_gearshift", SequencedGearshiftBlock::new) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate(new SequencedGearshiftGenerator()::generate) .item() .transform(customItemModel()) .register(); - public static final BlockEntry FLYWHEEL = - REGISTRATE.block("flywheel", FlywheelBlock::new) - .initialProperties(SharedProperties::metalKinetic) - .blockstate(new FlywheelGenerator()::generate) - .item() - .transform(customItemModel()) - .register(); - + public static final BlockEntry FLYWHEEL = REGISTRATE.block("flywheel", FlywheelBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new FlywheelGenerator()::generate) + .item() + .transform(customItemModel()) + .register(); + public static final BlockEntry FURNACE_ENGINE = REGISTRATE.block("furnace_engine", FurnaceEngineBlock::new) - .initialProperties(SharedProperties::metalKinetic) + .initialProperties(SharedProperties::softMetal) .blockstate(BlockStateGen.horizontalBlockProvider(true)) .transform(StressConfigDefaults.setCapacity(1024.0)) .item() .transform(customItemModel()) .register(); - + public static final BlockEntry ROTATION_SPEED_CONTROLLER = REGISTRATE.block("rotation_speed_controller", SpeedControllerBlock::new) - .initialProperties(SharedProperties::metalKinetic) + .initialProperties(SharedProperties::softMetal) .blockstate(BlockStateGen.horizontalAxisBlockProvider(true)) .item() .transform(customItemModel()) .register(); + // Logistics + + static { + REGISTRATE.startSection(Sections.LOGISTICS); + } + + public static final BlockEntry REDSTONE_CONTACT = + REGISTRATE.block("redstone_contact", RedstoneContactBlock::new) + .initialProperties(SharedProperties::stone) + .blockstate((c, p) -> p.directionalBlock(c.get(), AssetLookup.forPowered(c, p))) + .item() + .transform(customItemModel("_", "block")) + .register(); + + public static final BlockEntry REDSTONE_LINK = + REGISTRATE.block("redstone_link", RedstoneLinkBlock::new) + .initialProperties(SharedProperties::wooden) + .blockstate(new RedstoneLinkGenerator()::generate) + .addLayer(() -> RenderType::getCutoutMipped) + .item() + .transform(customItemModel("_", "transmitter")) + .register(); + + public static final BlockEntry STOCKPILE_SWITCH = + REGISTRATE.block("stockpile_switch", StockpileSwitchBlock::new) + .initialProperties(SharedProperties::stone) + .blockstate((c, p) -> p.horizontalBlock(c.get(), + AssetLookup.withIndicator(c, p, $ -> AssetLookup.standardModel(c, p), StockpileSwitchBlock.INDICATOR))) + .simpleItem() + .register(); + + public static final BlockEntry ADJUSTABLE_CRATE = + REGISTRATE.block("adjustable_crate", AdjustableCrateBlock::new) + .transform(BuilderTransformers.crate("brass")) + .register(); + + public static final BlockEntry CREATIVE_CRATE = + REGISTRATE.block("creative_crate", CreativeCrateBlock::new) + .transform(BuilderTransformers.crate("creative")) + .register(); + + public static final BlockEntry BELT_OBSERVER = + REGISTRATE.block("belt_observer", BeltObserverBlock::new) + .initialProperties(SharedProperties::stone) + .blockstate(BlockStateGen.beltObserver()) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry BELT_TUNNEL = REGISTRATE.block("belt_tunnel", BeltTunnelBlock::new) + .initialProperties(SharedProperties::stone) + .addLayer(() -> RenderType::getCutoutMipped) + .blockstate((c, p) -> p.getVariantBuilder(c.get()) + .forAllStates(state -> ConfiguredModel.builder() + .modelFile(p.models() + .getExistingFile(p.modLoc("block/belt_tunnel/" + state.get(BeltTunnelBlock.SHAPE) + .getName()))) + .rotationY(state.get(BeltTunnelBlock.HORIZONTAL_AXIS) == Axis.X ? 0 : 90) + .build())) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry EXTRACTOR = REGISTRATE.block("extractor", ExtractorBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate((c, p) -> p.horizontalBlock(c.get(), AssetLookup.forPowered(c, p, c.getName() + "/horizontal"))) + .item() + .transform(customItemModel("_", "horizontal")) + .register(); + + public static final BlockEntry VERTICAL_EXTRACTOR = + REGISTRATE.block("vertical_extractor", ExtractorBlock.Vertical::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new VerticalExtractorGenerator(false)::generate) + .register(); + + public static final BlockEntry LINKED_EXTRACTOR = + REGISTRATE.block("linked_extractor", LinkedExtractorBlock::new) + .initialProperties(SharedProperties::softMetal) + .addLayer(() -> RenderType::getCutoutMipped) + .blockstate( + (c, p) -> p.horizontalBlock(c.get(), AssetLookup.forPowered(c, p, "extractor/horizontal_linked"))) + .item() + .transform(customItemModel("extractor", "horizontal_linked")) + .register(); + + public static final BlockEntry VERTICAL_LINKED_EXTRACTOR = + REGISTRATE.block("vertical_linked_extractor", LinkedExtractorBlock.Vertical::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new VerticalExtractorGenerator(true)::generate) + .addLayer(() -> RenderType::getCutoutMipped) + .register(); + + public static final BlockEntry FUNNEL = REGISTRATE.block("funnel", FunnelBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate((c, p) -> p.horizontalBlock(c.get(), state -> p.models() + .getExistingFile(p.modLoc("block/funnel/horizontal" + (state.get(FunnelBlock.BELT) ? "_belt" : ""))))) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry VERTICAL_FUNNEL = + REGISTRATE.block("vertical_funnel", FunnelBlock.Vertical::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new VerticalFunnelGenerator()::generate) + .register(); + + public static final BlockEntry TRANSPOSER = REGISTRATE.block("transposer", TransposerBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate((c, p) -> p.horizontalBlock(c.get(), AssetLookup.forPowered(c, p, c.getName() + "/block"), 180)) + .item() + .transform(customItemModel("_", "block")) + .register(); + + public static final BlockEntry VERTICAL_TRANSPOSER = + REGISTRATE.block("vertical_transposer", TransposerBlock.Vertical::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new VerticalTransposerGenerator(false)::generate) + .register(); + + public static final BlockEntry LINKED_TRANSPOSER = REGISTRATE + .block("linked_transposer", LinkedTransposerBlock::new) + .initialProperties(SharedProperties::softMetal) + .addLayer(() -> RenderType::getCutoutMipped) + .blockstate( + (c, p) -> p.horizontalBlock(c.get(), AssetLookup.forPowered(c, p, "transposer/horizontal_linked"), 180)) + .item() + .transform(customItemModel("transposer", "horizontal_linked")) + .register(); + + public static final BlockEntry VERTICAL_LINKED_TRANSPOSER = + REGISTRATE.block("vertical_linked_transposer", LinkedTransposerBlock.Vertical::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(new VerticalTransposerGenerator(true)::generate) + .addLayer(() -> RenderType::getCutoutMipped) + .register(); + + public static final BlockEntry ANALOG_LEVER = + REGISTRATE.block("analog_lever", AnalogLeverBlock::new) + .initialProperties(() -> Blocks.LEVER) + .blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p))) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry PULSE_REPEATER = + REGISTRATE.block("pulse_repeater", PulseRepeaterBlock::new) + .initialProperties(() -> Blocks.REPEATER) + .blockstate(new PulseRepeaterGenerator()::generate) + .addLayer(() -> RenderType::getCutoutMipped) + .item() + .transform(customItemModel("diodes", "pulse_repeater")) + .register(); + + public static final BlockEntry ADJUSTABLE_REPEATER = + REGISTRATE.block("adjustable_repeater", AdjustableRepeaterBlock::new) + .initialProperties(() -> Blocks.REPEATER) + .blockstate(new AdjustableRepeaterGenerator()::generate) + .item() + .model(AbstractDiodeGenerator.diodeItemModel(true)) + .build() + .register(); + + public static final BlockEntry ADJUSTABLE_PULSE_REPEATER = + REGISTRATE.block("adjustable_pulse_repeater", AdjustableRepeaterBlock::new) + .initialProperties(() -> Blocks.REPEATER) + .blockstate(new AdjustableRepeaterGenerator()::generate) + .addLayer(() -> RenderType::getCutoutMipped) + .item() + .model(AbstractDiodeGenerator.diodeItemModel(true)) + .build() + .register(); + + public static final BlockEntry POWERED_LATCH = + REGISTRATE.block("powered_latch", PoweredLatchBlock::new) + .initialProperties(() -> Blocks.REPEATER) + .blockstate(new PoweredLatchGenerator()::generate) + .addLayer(() -> RenderType::getCutoutMipped) + .simpleItem() + .register(); + + public static final BlockEntry POWERED_TOGGLE_LATCH = + REGISTRATE.block("powered_toggle_latch", ToggleLatchBlock::new) + .initialProperties(() -> Blocks.REPEATER) + .blockstate(new ToggleLatchGenerator()::generate) + .addLayer(() -> RenderType::getCutoutMipped) + .item() + .transform(customItemModel("diodes", "latch_off")) + .register(); + // Materials static { diff --git a/src/main/java/com/simibubi/create/AllContainers.java b/src/main/java/com/simibubi/create/AllContainers.java index b2f971810..77d47e7fb 100644 --- a/src/main/java/com/simibubi/create/AllContainers.java +++ b/src/main/java/com/simibubi/create/AllContainers.java @@ -1,8 +1,8 @@ package com.simibubi.create; import com.simibubi.create.foundation.utility.Lang; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateContainer; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateScreen; +import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateContainer; +import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateScreen; import com.simibubi.create.modules.logistics.item.filter.AttributeFilterContainer; import com.simibubi.create.modules.logistics.item.filter.AttributeFilterScreen; import com.simibubi.create.modules.logistics.item.filter.FilterContainer; @@ -29,7 +29,7 @@ public enum AllContainers { SCHEMATIC_TABLE(SchematicTableContainer::new), SCHEMATICANNON(SchematicannonContainer::new), - FLEXCRATE(FlexcrateContainer::new), + FLEXCRATE(AdjustableCrateContainer::new), FILTER(FilterContainer::new), ATTRIBUTE_FILTER(AttributeFilterContainer::new), @@ -54,7 +54,7 @@ public enum AllContainers { public static void registerScreenFactories() { bind(SCHEMATIC_TABLE, SchematicTableScreen::new); bind(SCHEMATICANNON, SchematicannonScreen::new); - bind(FLEXCRATE, FlexcrateScreen::new); + bind(FLEXCRATE, AdjustableCrateScreen::new); bind(FILTER, FilterScreen::new); bind(ATTRIBUTE_FILTER, AttributeFilterScreen::new); } diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index 4c76b44c8..efc41b5a3 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -57,7 +57,7 @@ import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerT import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftTileEntity; import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntityRenderer; -import com.simibubi.create.modules.contraptions.relays.elementary.ShaftTileEntity; +import com.simibubi.create.modules.contraptions.relays.elementary.SimpleKineticTileEntity; import com.simibubi.create.modules.contraptions.relays.encased.AdjustablePulleyTileEntity; import com.simibubi.create.modules.contraptions.relays.encased.ClutchTileEntity; import com.simibubi.create.modules.contraptions.relays.encased.EncasedShaftTileEntity; @@ -71,19 +71,19 @@ import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxTileEntity import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxTileEntityRenderer; import com.simibubi.create.modules.contraptions.relays.gearbox.GearshiftTileEntity; import com.simibubi.create.modules.logistics.block.RedstoneLinkTileEntity; -import com.simibubi.create.modules.logistics.block.StockswitchTileEntity; +import com.simibubi.create.modules.logistics.block.StockpileSwitchTileEntity; import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverTileEntity; import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverTileEntityRenderer; import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelTileEntity; import com.simibubi.create.modules.logistics.block.belts.tunnel.BeltTunnelTileEntityRenderer; -import com.simibubi.create.modules.logistics.block.diodes.FlexPulsepeaterTileEntity; -import com.simibubi.create.modules.logistics.block.diodes.FlexpeaterTileEntity; -import com.simibubi.create.modules.logistics.block.diodes.FlexpeaterTileEntityRenderer; +import com.simibubi.create.modules.logistics.block.diodes.AdjustablePulseRepeaterTileEntity; +import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterRenderer; +import com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterTileEntity; import com.simibubi.create.modules.logistics.block.extractor.ExtractorTileEntity; import com.simibubi.create.modules.logistics.block.extractor.LinkedExtractorTileEntity; import com.simibubi.create.modules.logistics.block.funnel.FunnelTileEntity; +import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateTileEntity; import com.simibubi.create.modules.logistics.block.inventories.CreativeCrateTileEntity; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateTileEntity; import com.simibubi.create.modules.logistics.block.transposer.LinkedTransposerTileEntity; import com.simibubi.create.modules.logistics.block.transposer.TransposerTileEntity; import com.simibubi.create.modules.schematics.block.SchematicTableTileEntity; @@ -105,10 +105,10 @@ public enum AllTileEntities { // Schematics SCHEMATICANNON(SchematicannonTileEntity::new, AllBlocksNew.SCHEMATICANNON), - SCHEMATICTABLE(SchematicTableTileEntity::new, AllBlocksNew.SCHEMATIC_TABLE), + SCHEMATIC_TABLE(SchematicTableTileEntity::new, AllBlocksNew.SCHEMATIC_TABLE), // Kinetics - SHAFT(ShaftTileEntity::new, AllBlocksNew.SHAFT, AllBlocksNew.COGWHEEL, AllBlocksNew.LARGE_COGWHEEL, + SIMPLE_KINETIC(SimpleKineticTileEntity::new, AllBlocksNew.SHAFT, AllBlocksNew.COGWHEEL, AllBlocksNew.LARGE_COGWHEEL, AllBlocksNew.ENCASED_SHAFT), MOTOR(MotorTileEntity::new, AllBlocksNew.CREATIVE_MOTOR), GEARBOX(GearboxTileEntity::new, AllBlocksNew.GEARBOX), @@ -123,7 +123,7 @@ public enum AllTileEntities { CUCKOO_CLOCK(CuckooClockTileEntity::new, AllBlocksNew.CUCKOO_CLOCK, AllBlocksNew.MYSTERIOUS_CUCKOO_CLOCK), BELT(BeltTileEntity::new, AllBlocksNew.BELT), - BELT_TUNNEL(BeltTunnelTileEntity::new, AllBlocks.BELT_TUNNEL), + BELT_TUNNEL(BeltTunnelTileEntity::new, AllBlocksNew.BELT_TUNNEL), MECHANICAL_PISTON(MechanicalPistonTileEntity::new, AllBlocksNew.MECHANICAL_PISTON, AllBlocksNew.STICKY_MECHANICAL_PISTON), MECHANICAL_BEARING(MechanicalBearingTileEntity::new, AllBlocksNew.MECHANICAL_BEARING), @@ -148,25 +148,26 @@ public enum AllTileEntities { MECHANICAL_CRAFTER(MechanicalCrafterTileEntity::new, AllBlocksNew.MECHANICAL_CRAFTER), SEQUENCED_GEARSHIFT(SequencedGearshiftTileEntity::new, AllBlocksNew.SEQUENCED_GEARSHIFT), ROTATION_SPEED_CONTROLLER(SpeedControllerTileEntity::new, AllBlocksNew.ROTATION_SPEED_CONTROLLER), - SPEED_GAUGE(SpeedGaugeTileEntity::new, AllBlocksNew.SPEEDOMETER), - STRESS_GAUGE(StressGaugeTileEntity::new, AllBlocksNew.STRESSOMETER), - ANALOG_LEVER(AnalogLeverTileEntity::new, AllBlocks.ANALOG_LEVER), + SPEEDOMETER(SpeedGaugeTileEntity::new, AllBlocksNew.SPEEDOMETER), + STRESSOMETER(StressGaugeTileEntity::new, AllBlocksNew.STRESSOMETER), + ANALOG_LEVER(AnalogLeverTileEntity::new, AllBlocksNew.ANALOG_LEVER), CART_ASSEMBLER(CartAssemblerTileEntity::new, AllBlocksNew.CART_ASSEMBLER), // Logistics - REDSTONE_BRIDGE(RedstoneLinkTileEntity::new, AllBlocks.REDSTONE_BRIDGE), - STOCKSWITCH(StockswitchTileEntity::new, AllBlocks.STOCKSWITCH), - FLEXCRATE(FlexcrateTileEntity::new, AllBlocks.FLEXCRATE), - CREATIVE_CRATE(CreativeCrateTileEntity::new, AllBlocks.CREATIVE_CRATE), - EXTRACTOR(ExtractorTileEntity::new, AllBlocks.EXTRACTOR, AllBlocks.VERTICAL_EXTRACTOR), - LINKED_EXTRACTOR(LinkedExtractorTileEntity::new, AllBlocks.LINKED_EXTRACTOR, AllBlocks.VERTICAL_LINKED_EXTRACTOR), - TRANSPOSER(TransposerTileEntity::new, AllBlocks.TRANSPOSER, AllBlocks.VERTICAL_TRANSPOSER), - LINKED_TRANSPOSER(LinkedTransposerTileEntity::new, AllBlocks.LINKED_TRANSPOSER, - AllBlocks.VERTICAL_LINKED_TRANSPOSER), - BELT_FUNNEL(FunnelTileEntity::new, AllBlocks.BELT_FUNNEL, AllBlocks.VERTICAL_FUNNEL), - ENTITY_DETECTOR(BeltObserverTileEntity::new, AllBlocks.ENTITY_DETECTOR), - FLEXPEATER(FlexpeaterTileEntity::new, AllBlocks.FLEXPEATER), - FLEXPULSEPEATER(FlexPulsepeaterTileEntity::new, AllBlocks.FLEXPULSEPEATER), + REDSTONE_LINK(RedstoneLinkTileEntity::new, AllBlocksNew.REDSTONE_LINK), + STOCKPILE_SWITCH(StockpileSwitchTileEntity::new, AllBlocksNew.STOCKPILE_SWITCH), + ADJUSTABLE_CRATE(AdjustableCrateTileEntity::new, AllBlocksNew.ADJUSTABLE_CRATE), + CREATIVE_CRATE(CreativeCrateTileEntity::new, AllBlocksNew.CREATIVE_CRATE), + EXTRACTOR(ExtractorTileEntity::new, AllBlocksNew.EXTRACTOR, AllBlocksNew.VERTICAL_EXTRACTOR), + LINKED_EXTRACTOR(LinkedExtractorTileEntity::new, AllBlocksNew.LINKED_EXTRACTOR, + AllBlocksNew.VERTICAL_LINKED_EXTRACTOR), + TRANSPOSER(TransposerTileEntity::new, AllBlocksNew.TRANSPOSER, AllBlocksNew.VERTICAL_TRANSPOSER), + LINKED_TRANSPOSER(LinkedTransposerTileEntity::new, AllBlocksNew.LINKED_TRANSPOSER, + AllBlocksNew.VERTICAL_LINKED_TRANSPOSER), + FUNNEL(FunnelTileEntity::new, AllBlocksNew.FUNNEL, AllBlocksNew.VERTICAL_FUNNEL), + BELT_OBSERVER(BeltObserverTileEntity::new, AllBlocksNew.BELT_OBSERVER), + ADJUSTABLE_REPEATER(AdjustableRepeaterTileEntity::new, AllBlocksNew.ADJUSTABLE_REPEATER), + ADJUSTABLE_PULSE_REPEATER(AdjustablePulseRepeaterTileEntity::new, AllBlocksNew.ADJUSTABLE_PULSE_REPEATER), ; @@ -204,7 +205,7 @@ public enum AllTileEntities { public static void registerRenderers() { bind(SCHEMATICANNON, SchematicannonRenderer::new); - bind(SHAFT, KineticTileEntityRenderer::new); + bind(SIMPLE_KINETIC, KineticTileEntityRenderer::new); bind(TURNTABLE, KineticTileEntityRenderer::new); bind(MOTOR, MotorTileEntityRenderer::new); bind(ENCASED_SHAFT, EncasedShaftTileEntityRenderer::new); @@ -233,8 +234,8 @@ public enum AllTileEntities { bind(MECHANICAL_PRESS, MechanicalPressTileEntityRenderer::new); bind(MECHANICAL_MIXER, MechanicalMixerTileEntityRenderer::new); bind(MECHANICAL_CRAFTER, MechanicalCrafterTileEntityRenderer::new); - bind(SPEED_GAUGE, disp -> new GaugeTileEntityRenderer(disp, GaugeBlock.Type.SPEED)); - bind(STRESS_GAUGE, disp -> new GaugeTileEntityRenderer(disp, GaugeBlock.Type.STRESS)); + bind(SPEEDOMETER, disp -> new GaugeTileEntityRenderer(disp, GaugeBlock.Type.SPEED)); + bind(STRESSOMETER, disp -> new GaugeTileEntityRenderer(disp, GaugeBlock.Type.STRESS)); bind(BASIN, BasinTileEntityRenderer::new); bind(DEPLOYER, DeployerTileEntityRenderer::new); bind(FLYWHEEL, FlywheelRenderer::new); @@ -242,15 +243,16 @@ public enum AllTileEntities { bind(ROTATION_SPEED_CONTROLLER, SpeedControllerRenderer::new); bind(CREATIVE_CRATE, SmartTileEntityRenderer::new); - bind(REDSTONE_BRIDGE, SmartTileEntityRenderer::new); + bind(REDSTONE_LINK, SmartTileEntityRenderer::new); bind(EXTRACTOR, SmartTileEntityRenderer::new); bind(LINKED_EXTRACTOR, SmartTileEntityRenderer::new); bind(TRANSPOSER, SmartTileEntityRenderer::new); bind(LINKED_TRANSPOSER, SmartTileEntityRenderer::new); - bind(BELT_FUNNEL, SmartTileEntityRenderer::new); + bind(FUNNEL, SmartTileEntityRenderer::new); bind(BELT_TUNNEL, BeltTunnelTileEntityRenderer::new); - bind(ENTITY_DETECTOR, BeltObserverTileEntityRenderer::new); - bind(FLEXPEATER, FlexpeaterTileEntityRenderer::new); + bind(BELT_OBSERVER, BeltObserverTileEntityRenderer::new); + bind(ADJUSTABLE_REPEATER, AdjustableRepeaterRenderer::new); + bind(ADJUSTABLE_PULSE_REPEATER, AdjustableRepeaterRenderer::new); } @SuppressWarnings("unchecked") // TODO 1.15 this generic stuff is incompatible with the enum system - need diff --git a/src/main/java/com/simibubi/create/SharedProperties.java b/src/main/java/com/simibubi/create/SharedProperties.java index bb0042a89..31b800657 100644 --- a/src/main/java/com/simibubi/create/SharedProperties.java +++ b/src/main/java/com/simibubi/create/SharedProperties.java @@ -11,15 +11,15 @@ public class SharedProperties { public static Material beltMaterial = new Material(MaterialColor.GRAY, false, true, true, true, true, false, false, PushReaction.NORMAL); - public static Block kinetic() { + public static Block stone() { return Blocks.ANDESITE; } - public static Block metalKinetic() { + public static Block softMetal() { return Blocks.GOLD_BLOCK; } - public static Block woodenKinetic() { + public static Block wooden() { return Blocks.STRIPPED_SPRUCE_WOOD; } diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index 995e2fa3a..75c9f6707 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -26,7 +26,7 @@ import com.simibubi.create.compat.jei.category.SplashingCategory; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.modules.contraptions.components.mixer.MixingRecipe; import com.simibubi.create.modules.contraptions.components.press.MechanicalPressTileEntity; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateScreen; +import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateScreen; import com.simibubi.create.modules.schematics.block.SchematicannonScreen; import mezz.jei.api.IModPlugin; @@ -176,7 +176,7 @@ public class CreateJEI implements IModPlugin { @Override public void registerGuiHandlers(IGuiHandlerRegistration registration) { - registration.addGuiContainerHandler(FlexcrateScreen.class, new SlotMover<>()); + registration.addGuiContainerHandler(AdjustableCrateScreen.class, new SlotMover<>()); registration.addGuiContainerHandler(SchematicannonScreen.class, new SlotMover<>()); } diff --git a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/SynchronizedExtraction.java b/src/main/java/com/simibubi/create/foundation/behaviour/inventory/SynchronizedExtraction.java index 16f9b319a..d03a2d93a 100644 --- a/src/main/java/com/simibubi/create/foundation/behaviour/inventory/SynchronizedExtraction.java +++ b/src/main/java/com/simibubi/create/foundation/behaviour/inventory/SynchronizedExtraction.java @@ -3,9 +3,8 @@ package com.simibubi.create.foundation.behaviour.inventory; import java.util.ArrayList; import java.util.List; -import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateBlock; +import com.simibubi.create.modules.logistics.block.inventories.CrateBlock; import net.minecraft.block.BlockState; import net.minecraft.block.ChestBlock; @@ -47,10 +46,10 @@ public class SynchronizedExtraction { if (blockState.get(ChestBlock.TYPE) != ChestType.SINGLE) inventoryPositions.add(inventoryPos.offset(ChestBlock.getDirectionToAttached(blockState))); - // Sync across flexcrates - if (AllBlocks.FLEXCRATE.typeOf(blockState)) - if (blockState.get(FlexcrateBlock.DOUBLE)) - inventoryPositions.add(inventoryPos.offset(blockState.get(FlexcrateBlock.FACING))); + // Sync across crates + if (blockState.getBlock() instanceof CrateBlock) + if (blockState.get(CrateBlock.DOUBLE)) + inventoryPositions.add(inventoryPos.offset(blockState.get(CrateBlock.FACING))); for (BlockPos pos : inventoryPositions) { for (Direction direction : Direction.values()) { diff --git a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java b/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java index 2e6c70ca8..06c0d1bb4 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java +++ b/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java @@ -1,5 +1,6 @@ package com.simibubi.create.foundation.utility; +import static net.minecraft.util.Direction.NORTH; import static net.minecraft.util.Direction.SOUTH; import static net.minecraft.util.Direction.UP; @@ -21,60 +22,89 @@ public class AllShapes { public static final VoxelShaper CASING_14PX = shape(0, 0, 0, 16, 14, 16).forDirectional(), - CASING_12PX = shape(0, 0, 0, 16, 12, 16).forDirectional(), - CASING_11PX = shape(0, 0, 0, 16, 11, 16).forDirectional(), - MOTOR_BLOCK = shape(3, 0, 3, 13, 14, 13).forDirectional(), - FOUR_VOXEL_POLE = shape(6, 0, 6, 10, 16, 10).forAxis(), - SIX_VOXEL_POLE = shape(5, 0, 5, 11, 16, 11).forAxis(), - BELT_FUNNEL = shape(3, -4, 11, 13, 8, 17).forHorizontal(SOUTH), - FUNNEL = shape(1, 1, 13, 15, 15, 17).forDirectional(SOUTH), - EXTRACTOR = - shape(4, 2, 11, 12, 10, 17).forDirectional(SOUTH).withVerticalShapes(cuboid(4, 11, 4, 12, 17, 12)), - TRANSPOSER = - shape(4, 4, -1, 12, 12, 1).add(5, 5, 0, 11, 11, 16).add(4, 4, 11, 12, 12, 17).forDirectional(SOUTH), - FURNACE_ENGINE = shape(1, 1, 0, 15, 15, 16).add(0, 0, 9, 16, 16, 14).forHorizontal(Direction.SOUTH), - PORTABLE_STORAGE_INTERFACE = shape(0, 0, 0, 16, 12, 16).add(3, 12, 3, 13, 16, 13).forDirectional(), - PULLEY = shape(0, 0, 0, 16, 16, 2).add(1, 1, 2, 15, 15, 14).add(0, 0, 14, 16, 16, 16).forHorizontalAxis(), - SPEED_CONTROLLER = shape(0, 0, 0, 16, 2, 16).add(1, 1, 1, 15, 15, 15).erase(0, 8, 5, 16, 16, 11) - .add(2, 9, 2, 14, 14, 14).erase(6, 11, 0, 10, 16, 16).forHorizontalAxis(), - HARVESTER_BASE = shape(0, 2, 0, 16, 14, 3).forDirectional(SOUTH), - NOZZLE = shape(2, 0, 2, 14, 14, 14).add(1, 13, 1, 15, 15, 15).erase(3, 13, 3, 13, 15, 13).forDirectional(), - CRANK = shape(5, 0, 5, 11, 6, 11).add(1, 3, 1, 15, 8, 15).forDirectional(), - CART_ASSEMBLER = shape(VoxelShapes.fullCube()).add(-2, 0, 1, 18, 13, 15).forHorizontalAxis() + CASING_12PX = shape(0, 0, 0, 16, 12, 16).forDirectional(), + CASING_11PX = shape(0, 0, 0, 16, 11, 16).forDirectional(), + MOTOR_BLOCK = shape(3, 0, 3, 13, 14, 13).forDirectional(), + FOUR_VOXEL_POLE = shape(6, 0, 6, 10, 16, 10).forAxis(), SIX_VOXEL_POLE = shape(5, 0, 5, 11, 16, 11).forAxis(), + BELT_FUNNEL = shape(3, -4, 11, 13, 8, 17).forHorizontal(SOUTH), + FUNNEL = shape(1, 1, 13, 15, 15, 17).forDirectional(SOUTH), + EXTRACTOR = shape(4, 2, 11, 12, 10, 17).forDirectional(SOUTH) + .withVerticalShapes(cuboid(4, 11, 4, 12, 17, 12)), + TRANSPOSER = shape(4, 4, -1, 12, 12, 1).add(5, 5, 0, 11, 11, 16) + .add(4, 4, 11, 12, 12, 17) + .forDirectional(SOUTH), + FURNACE_ENGINE = shape(1, 1, 0, 15, 15, 16).add(0, 0, 9, 16, 16, 14) + .forHorizontal(Direction.SOUTH), + PORTABLE_STORAGE_INTERFACE = shape(0, 0, 0, 16, 12, 16).add(3, 12, 3, 13, 16, 13) + .forDirectional(), + PULLEY = shape(0, 0, 0, 16, 16, 2).add(1, 1, 2, 15, 15, 14) + .add(0, 0, 14, 16, 16, 16) + .forHorizontalAxis(), + SPEED_CONTROLLER = shape(0, 0, 0, 16, 2, 16).add(1, 1, 1, 15, 15, 15) + .erase(0, 8, 5, 16, 16, 11) + .add(2, 9, 2, 14, 14, 14) + .erase(6, 11, 0, 10, 16, 16) + .forHorizontalAxis(), + HARVESTER_BASE = shape(0, 2, 0, 16, 14, 3).forDirectional(SOUTH), + NOZZLE = shape(2, 0, 2, 14, 14, 14).add(1, 13, 1, 15, 15, 15) + .erase(3, 13, 3, 13, 15, 13) + .forDirectional(), + CRANK = shape(5, 0, 5, 11, 6, 11).add(1, 3, 1, 15, 8, 15) + .forDirectional(), + CART_ASSEMBLER = shape(VoxelShapes.fullCube()).add(-2, 0, 1, 18, 13, 15) + .forHorizontalAxis(), + STOCKPILE_SWITCH = shape(0, 0, 0, 16, 2, 16).add(1, 0, 1, 15, 16, 15) + .add(0, 14, 0, 16, 16, 16) + .add(3, 3, -1, 13, 13, 2) + .forHorizontal(NORTH) ; // Static Block Shapes public static final VoxelShape - BASIN_BLOCK_SHAPE = shape(0, 2, 0, 16, 13, 16).erase(2, 5, 2, 14, 14, 14).add(2, 0, 2, 14, 2, 14).build(), - CRUSHING_WHEEL_COLLISION_SHAPE = cuboid(0, 0, 0, 16, 22, 16), - MECHANICAL_PROCESSOR_SHAPE = shape(VoxelShapes.fullCube()).erase(4, 0, 4, 12, 16, 12).build(), - TURNTABLE_SHAPE = shape(1, 4, 1, 15, 8, 15).add(5, 0, 5, 11, 4, 11).build(), - CRATE_BLOCK_SHAPE = cuboid(1, 0, 1, 15, 14, 15), - TABLE_POLE_SHAPE = shape(4, 0, 4, 12, 2, 12).add(5, 2, 5, 11, 14, 11).build(), - BELT_COLLISION_MASK = cuboid(0, 0, 0, 16, 19, 16), - SCHEMATICANNON_SHAPE = shape(1, 0, 1, 15, 8, 15).add(0.5, 8, 0.5, 15.5, 11, 15.5).build(), - PULLEY_MAGNET = shape(3, 0, 3, 13, 2, 13).add(FOUR_VOXEL_POLE.get(UP)).build(), - MILLSTONE = shape(0, 0, 0, 16, 6, 16).add(2, 6, 2, 14, 13, 14).add(3, 13, 3, 13, 16, 13).build(), - CUCKOO_CLOCK = shape(1, 0, 1, 15, 19, 15).build(), - GAUGE_SHAPE_UP = shape(1, 0, 0, 15, 2, 16).add(2, 2, 1, 14, 14, 15).build() + BASIN_BLOCK_SHAPE = shape(0, 2, 0, 16, 13, 16).erase(2, 5, 2, 14, 14, 14) + .add(2, 0, 2, 14, 2, 14) + .build(), + CRUSHING_WHEEL_COLLISION_SHAPE = cuboid(0, 0, 0, 16, 22, 16), + MECHANICAL_PROCESSOR_SHAPE = shape(VoxelShapes.fullCube()).erase(4, 0, 4, 12, 16, 12) + .build(), + TURNTABLE_SHAPE = shape(1, 4, 1, 15, 8, 15).add(5, 0, 5, 11, 4, 11) + .build(), + CRATE_BLOCK_SHAPE = cuboid(1, 0, 1, 15, 14, 15), + TABLE_POLE_SHAPE = shape(4, 0, 4, 12, 2, 12).add(5, 2, 5, 11, 14, 11) + .build(), + BELT_COLLISION_MASK = cuboid(0, 0, 0, 16, 19, 16), + SCHEMATICANNON_SHAPE = shape(1, 0, 1, 15, 8, 15).add(0.5, 8, 0.5, 15.5, 11, 15.5) + .build(), + PULLEY_MAGNET = shape(3, 0, 3, 13, 2, 13).add(FOUR_VOXEL_POLE.get(UP)) + .build(), + MILLSTONE = shape(0, 0, 0, 16, 6, 16).add(2, 6, 2, 14, 13, 14) + .add(3, 13, 3, 13, 16, 13) + .build(), + CUCKOO_CLOCK = shape(1, 0, 1, 15, 19, 15).build(), + GAUGE_SHAPE_UP = shape(1, 0, 0, 15, 2, 16).add(2, 2, 1, 14, 14, 15) + .build() ; // Internally Shared Shapes private static final VoxelShape - PISTON_HEAD = - Blocks.PISTON_HEAD.getDefaultState().with(DirectionalBlock.FACING, UP).with(PistonHeadBlock.SHORT, true) - .getShape(null, null), - PISTON_EXTENDED = shape(CASING_12PX.get(UP)).add(FOUR_VOXEL_POLE.get(Axis.Y)).build(), - SMALL_GEAR_SHAPE = cuboid(2, 6, 2, 14, 10, 14), LARGE_GEAR_SHAPE = cuboid(0, 6, 0, 16, 10, 16), - VERTICAL_TABLET_SHAPE = cuboid(3, 1, -1, 13, 15, 3), SQUARE_TABLET_SHAPE = cuboid(2, 2, -1, 14, 14, 3), - LOGISTICS_TABLE_SLOPE = - shape(0, 10, 15, 16, 14, 10.667).add(0, 12, 10.667, 16, 16, 6.333).add(0, 14, 6.333, 16, 18, 2).build(), - SCHEMATICS_TABLE_SLOPE = - shape(0, 10, 16, 16, 14, 11).add(0, 12, 11, 16, 16, 6).add(0, 14, 6, 16, 18, 1).build() + PISTON_HEAD = Blocks.PISTON_HEAD.getDefaultState() + .with(DirectionalBlock.FACING, UP) + .with(PistonHeadBlock.SHORT, true) + .getShape(null, null), PISTON_EXTENDED = + shape(CASING_12PX.get(UP)).add(FOUR_VOXEL_POLE.get(Axis.Y)) + .build(), + SMALL_GEAR_SHAPE = cuboid(2, 6, 2, 14, 10, 14), LARGE_GEAR_SHAPE = cuboid(0, 6, 0, 16, 10, 16), + VERTICAL_TABLET_SHAPE = cuboid(3, 1, -1, 13, 15, 3), SQUARE_TABLET_SHAPE = cuboid(2, 2, -1, 14, 14, 3), + LOGISTICS_TABLE_SLOPE = shape(0, 10, 15, 16, 14, 10.667).add(0, 12, 10.667, 16, 16, 6.333) + .add(0, 14, 6.333, 16, 18, 2) + .build(), + SCHEMATICS_TABLE_SLOPE = shape(0, 10, 16, 16, 14, 11).add(0, 12, 11, 16, 16, 6) + .add(0, 14, 6, 16, 18, 1) + .build() ; @@ -82,14 +112,18 @@ public class AllShapes { public static final VoxelShaper MECHANICAL_PISTON_HEAD = shape(PISTON_HEAD).forDirectional(), MECHANICAL_PISTON = CASING_12PX, - MECHANICAL_PISTON_EXTENDED = shape(PISTON_EXTENDED).forDirectional(), - SMALL_GEAR = shape(SMALL_GEAR_SHAPE).add(SIX_VOXEL_POLE.get(Axis.Y)).forAxis(), - LARGE_GEAR = shape(LARGE_GEAR_SHAPE).add(SIX_VOXEL_POLE.get(Axis.Y)).forAxis(), - LOGISTICAL_CONTROLLER = shape(SQUARE_TABLET_SHAPE).forDirectional(SOUTH), - REDSTONE_BRIDGE = - shape(VERTICAL_TABLET_SHAPE).forDirectional(SOUTH).withVerticalShapes(LOGISTICAL_CONTROLLER.get(UP)), - LOGISTICS_TABLE = shape(TABLE_POLE_SHAPE).add(LOGISTICS_TABLE_SLOPE).forHorizontal(SOUTH), - SCHEMATICS_TABLE = shape(TABLE_POLE_SHAPE).add(SCHEMATICS_TABLE_SLOPE).forDirectional(SOUTH) + MECHANICAL_PISTON_EXTENDED = shape(PISTON_EXTENDED).forDirectional(), + SMALL_GEAR = shape(SMALL_GEAR_SHAPE).add(SIX_VOXEL_POLE.get(Axis.Y)) + .forAxis(), + LARGE_GEAR = shape(LARGE_GEAR_SHAPE).add(SIX_VOXEL_POLE.get(Axis.Y)) + .forAxis(), + LOGISTICAL_CONTROLLER = shape(SQUARE_TABLET_SHAPE).forDirectional(SOUTH), + REDSTONE_BRIDGE = shape(VERTICAL_TABLET_SHAPE).forDirectional(SOUTH) + .withVerticalShapes(LOGISTICAL_CONTROLLER.get(UP)), + LOGISTICS_TABLE = shape(TABLE_POLE_SHAPE).add(LOGISTICS_TABLE_SLOPE) + .forHorizontal(SOUTH), + SCHEMATICS_TABLE = shape(TABLE_POLE_SHAPE).add(SCHEMATICS_TABLE_SLOPE) + .forDirectional(SOUTH) ; diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/AssetLookup.java b/src/main/java/com/simibubi/create/foundation/utility/data/AssetLookup.java index c1d98acaa..8389f06f3 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/AssetLookup.java +++ b/src/main/java/com/simibubi/create/foundation/utility/data/AssetLookup.java @@ -10,7 +10,9 @@ import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.state.IntegerProperty; import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ModelFile; @@ -52,16 +54,16 @@ public class AssetLookup { /** * Generate item model inheriting from a seperate model in - * models/block/folders[0]/folders[1]/.../item.json - * "_" will be replaced by the item name + * models/block/folders[0]/folders[1]/.../item.json "_" will be replaced by the + * item name */ public static NonNullBiConsumer, RegistrateItemModelProvider> customItemModel( String... folders) { return (c, p) -> { - String path = "block/"; - for (String string : folders) - path += ("_".equals(string) ? c.getName() : string) + "/"; - p.withExistingParent(c.getName(), p.modLoc(path + "item")); + String path = "block"; + for (String string : folders) + path += "/" + ("_".equals(string) ? c.getName() : string); + p.withExistingParent(c.getName(), p.modLoc(path)); }; } @@ -71,6 +73,25 @@ public class AssetLookup { : partialBaseModel(ctx, prov); } + public static Function forPowered(DataGenContext ctx, + RegistrateBlockstateProvider prov, String path) { + return state -> prov.models() + .getExistingFile( + prov.modLoc("block/" + path + (state.get(BlockStateProperties.POWERED) ? "_powered" : ""))); + } + + public static Function withIndicator(DataGenContext ctx, + RegistrateBlockstateProvider prov, Function baseModelFunc, IntegerProperty property) { + return state -> { + ResourceLocation baseModel = baseModelFunc.apply(state) + .getLocation(); + Integer integer = state.get(property); + return prov.models() + .withExistingParent(ctx.getName() + "_" + integer, baseModel) + .texture("indicator", "block/indicator/" + integer); + }; + } + public static String getOxidizedModel(String name, int level) { return "block/oxidized/" + name + "_" + level; } diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/BlockStateGen.java b/src/main/java/com/simibubi/create/foundation/utility/data/BlockStateGen.java index ee2d1dea1..51d262c8f 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/BlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/utility/data/BlockStateGen.java @@ -1,6 +1,9 @@ package com.simibubi.create.foundation.utility.data; +import java.util.HashMap; +import java.util.IdentityHashMap; +import java.util.Map; import java.util.Vector; import java.util.function.BiFunction; import java.util.function.Function; @@ -11,6 +14,7 @@ import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock import com.simibubi.create.modules.contraptions.components.contraptions.chassis.LinearChassisBlock; import com.simibubi.create.modules.contraptions.components.contraptions.chassis.RadialChassisBlock; import com.simibubi.create.modules.contraptions.components.contraptions.mounted.CartAssemblerBlock; +import com.simibubi.create.modules.logistics.block.belts.observer.BeltObserverBlock; import com.simibubi.create.modules.palettes.PavedBlock; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.providers.DataGenContext; @@ -172,6 +176,48 @@ public class BlockStateGen { }); } + public static NonNullBiConsumer, RegistrateBlockstateProvider> beltObserver() { + return (c, p) -> { + + Map> models = new IdentityHashMap<>(); + Map baseModels = new HashMap<>(); + + for (boolean powered : Iterate.trueAndFalse) { + for (boolean belt : Iterate.trueAndFalse) { + String suffix = (belt ? "_belt" : "") + (powered ? "_powered" : ""); + baseModels.put(suffix, p.modLoc("block/belt_observer/base" + suffix)); + } + } + + for (BeltObserverBlock.Mode mode : BeltObserverBlock.Mode.values()) { + String modeName = mode.getName(); + HashMap map = new HashMap<>(); + for (boolean powered : Iterate.trueAndFalse) { + for (boolean belt : Iterate.trueAndFalse) { + String suffix = (belt ? "_belt" : "") + (powered ? "_powered" : ""); + map.put(suffix, p.models() + .withExistingParent("block/belt_observer/" + modeName + suffix, baseModels.get(suffix)) + .texture("texture", + p.modLoc("block/belt_observer_" + modeName + (powered ? "_powered" : "")))); + } + } + models.put(mode, map); + } + + p.getVariantBuilder(c.get()) + .forAllStates(state -> { + String suffix = (state.get(BeltObserverBlock.BELT) ? "_belt" : "") + + (state.get(BeltObserverBlock.POWERED) ? "_powered" : ""); + return ConfiguredModel.builder() + .modelFile(models.get(state.get(BeltObserverBlock.MODE)) + .get(suffix)) + .rotationY((int) state.get(BeltObserverBlock.HORIZONTAL_FACING) + .getHorizontalAngle()) + .build(); + }); + }; + } + public static NonNullBiConsumer, RegistrateBlockstateProvider> linearChassis() { return (c, p) -> { ResourceLocation side = p.modLoc("block/" + c.getName() + "_side"); diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/BuilderTransformers.java b/src/main/java/com/simibubi/create/foundation/utility/data/BuilderTransformers.java index 13458d645..b57806012 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/BuilderTransformers.java +++ b/src/main/java/com/simibubi/create/foundation/utility/data/BuilderTransformers.java @@ -2,6 +2,9 @@ package com.simibubi.create.foundation.utility.data; import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; +import java.util.HashMap; +import java.util.Map; + import com.simibubi.create.Create; import com.simibubi.create.SharedProperties; import com.simibubi.create.config.StressConfigDefaults; @@ -10,41 +13,47 @@ import com.simibubi.create.foundation.block.connected.StandardCTBehaviour; import com.simibubi.create.foundation.registrate.CreateRegistrate; import com.simibubi.create.modules.contraptions.CasingBlock; import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonGenerator; +import com.simibubi.create.modules.logistics.block.inventories.CrateBlock; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderType; import net.minecraft.state.properties.PistonType; +import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Direction.Axis; +import net.minecraftforge.client.model.generators.ConfiguredModel; +import net.minecraftforge.client.model.generators.ModelFile; public class BuilderTransformers { public static NonNullUnaryOperator> cuckooClock() { - return b -> b.initialProperties(SharedProperties::woodenKinetic) + return b -> b.initialProperties(SharedProperties::wooden) .blockstate((c, p) -> p.horizontalBlock(c.get(), p.models() .getExistingFile(p.modLoc("block/cuckoo_clock/block")))) .addLayer(() -> RenderType::getCutoutMipped) .transform(StressConfigDefaults.setImpact(1.0)) .item() - .transform(ModelGen.customItemModel("cuckoo_clock")); + .transform(ModelGen.customItemModel("cuckoo_clock", "item")); } public static NonNullUnaryOperator> casing( CTSpriteShiftEntry ct) { return b -> b.transform(connectedTextures(new StandardCTBehaviour(ct))) - .initialProperties(SharedProperties::kinetic) + .initialProperties(SharedProperties::stone) .blockstate((c, p) -> p.simpleBlock(c.get())) .simpleItem(); } public static NonNullUnaryOperator> mechanicalPiston(PistonType type) { - return b -> b.initialProperties(SharedProperties::kinetic) + return b -> b.initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate(new MechanicalPistonGenerator(type)::generate) .addLayer(() -> RenderType::getCutoutMipped) .transform(StressConfigDefaults.setImpact(4.0)) .item() - .transform(ModelGen.customItemModel("mechanical_piston", type.getName())); + .transform(ModelGen.customItemModel("mechanical_piston", type.getName(), "item")); } public static NonNullUnaryOperator> bearing(String prefix, @@ -53,7 +62,8 @@ public class BuilderTransformers { ResourceLocation baseItemModelLocation = Create.asResource("block/bearing/item"); ResourceLocation sideTextureLocation = Create.asResource("block/" + prefix + "_bearing_side"); ResourceLocation backTextureLocation = Create.asResource("block/" + backTexture); - return b -> b.initialProperties(SharedProperties::kinetic) + return b -> b.initialProperties(SharedProperties::stone) + .properties(p -> p.nonOpaque()) .blockstate((c, p) -> p.directionalBlock(c.get(), p.models() .withExistingParent(c.getName(), baseBlockModelLocation) .texture("side", sideTextureLocation) @@ -65,4 +75,60 @@ public class BuilderTransformers { .build(); } + public static NonNullUnaryOperator> crate(String type) { + return b -> b.initialProperties(SharedProperties::stone) + .blockstate((c, p) -> { + String[] variants = { "single", "top", "bottom", "left", "right" }; + Map models = new HashMap<>(); + + ResourceLocation crate = p.modLoc("block/crate_" + type); + ResourceLocation side = p.modLoc("block/crate_" + type + "_side"); + ResourceLocation casing = p.modLoc("block/" + type + "_casing"); + + for (String variant : variants) + models.put(variant, p.models() + .withExistingParent("block/crate/" + type + "/" + variant, p.modLoc("block/crate/" + variant)) + .texture("crate", crate) + .texture("side", side) + .texture("casing", casing)); + + p.getVariantBuilder(c.get()) + .forAllStates(state -> { + String variant = "single"; + int yRot = 0; + + if (state.get(CrateBlock.DOUBLE)) { + Direction direction = state.get(CrateBlock.FACING); + if (direction.getAxis() == Axis.X) + yRot = 90; + + switch (direction) { + case DOWN: + variant = "top"; + break; + case NORTH: + case EAST: + variant = "right"; + break; + case UP: + variant = "bottom"; + break; + case SOUTH: + case WEST: + default: + variant = "left"; + + } + } + + return ConfiguredModel.builder() + .modelFile(models.get(variant)) + .rotationY(yRot) + .build(); + }); + }) + .item() + .transform(ModelGen.customItemModel("crate", type, "single")); + } + } diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/ModelGen.java b/src/main/java/com/simibubi/create/foundation/utility/data/ModelGen.java index d3ed8e7c7..fb32d4278 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/ModelGen.java +++ b/src/main/java/com/simibubi/create/foundation/utility/data/ModelGen.java @@ -41,8 +41,8 @@ public class ModelGen { .build(); } - public static NonNullFunction, P> customItemModel(String... folders) { - return b -> b.model(AssetLookup.customItemModel(folders)) + public static NonNullFunction, P> customItemModel(String... path) { + return b -> b.model(AssetLookup.customItemModel(path)) .build(); } diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java b/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java index 7cecd7c71..5c2c3545d 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/utility/data/SpecialBlockStateGen.java @@ -5,6 +5,7 @@ import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.util.Direction; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ModelFile; @@ -15,12 +16,18 @@ public abstract class SpecialBlockStateGen { .forAllStates(state -> { return ConfiguredModel.builder() .modelFile(getModel(ctx, prov, state)) - .rotationX(getXRotation(state)) - .rotationY(getYRotation(state)) + .rotationX((getXRotation(state) + 360) % 360) + .rotationY((getYRotation(state) + 360) % 360) .build(); }); } + protected int horizontalAngle(Direction direction) { + if (direction.getAxis().isVertical()) + return 0; + return (int) direction.getHorizontalAngle(); + } + protected abstract int getXRotation(BlockState state); protected abstract int getYRotation(BlockState state); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/Contraption.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/Contraption.java index 354e305ec..0e50090b8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/Contraption.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/Contraption.java @@ -20,7 +20,6 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.foundation.utility.Iterate; @@ -40,9 +39,9 @@ import com.simibubi.create.modules.contraptions.components.contraptions.pulley.P import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock.RopeBlock; import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyTileEntity; import com.simibubi.create.modules.contraptions.components.saw.SawBlock; -import com.simibubi.create.modules.contraptions.redstone.ContactBlock; +import com.simibubi.create.modules.contraptions.redstone.RedstoneContactBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateBlock; +import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateBlock; import net.minecraft.block.AbstractButtonBlock; import net.minecraft.block.Block; @@ -176,8 +175,8 @@ public abstract class Contraption { if (isChassis(state) && !moveChassis(world, pos, forcedDirection, frontier, visited)) return false; - if (AllBlocks.FLEXCRATE.typeOf(state)) - FlexcrateBlock.splitCrate(world, pos); + if (AllBlocksNew.ADJUSTABLE_CRATE.has(state)) + AdjustableCrateBlock.splitCrate(world, pos); if (AllBlocksNew.BELT.has(state)) { BlockPos nextPos = BeltBlock.nextSegmentPosition(state, pos, true); BlockPos prevPos = BeltBlock.nextSegmentPosition(state, pos, false); @@ -323,10 +322,10 @@ public abstract class Contraption { blockstate = blockstate.with(SawBlock.RUNNING, true); if (blockstate.getBlock() instanceof ChestBlock) blockstate = blockstate.with(ChestBlock.TYPE, ChestType.SINGLE); - if (AllBlocks.FLEXCRATE.typeOf(blockstate)) - blockstate = blockstate.with(FlexcrateBlock.DOUBLE, false); - if (AllBlocks.CONTACT.typeOf(blockstate)) - blockstate = blockstate.with(ContactBlock.POWERED, true); + if (AllBlocksNew.ADJUSTABLE_CRATE.has(blockstate)) + blockstate = blockstate.with(AdjustableCrateBlock.DOUBLE, false); + if (AllBlocksNew.REDSTONE_CONTACT.has(blockstate)) + blockstate = blockstate.with(RedstoneContactBlock.POWERED, true); if (blockstate.getBlock() instanceof AbstractButtonBlock) { blockstate = blockstate.with(AbstractButtonBlock.POWERED, false); world.getPendingBlockTicks() diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MountedStorage.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MountedStorage.java index 3a1eccd0f..1432695f3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MountedStorage.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/MountedStorage.java @@ -1,7 +1,7 @@ package com.simibubi.create.modules.contraptions.components.contraptions; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateBlock; +import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateBlock; import net.minecraft.block.ChestBlock; import net.minecraft.item.ItemStack; @@ -43,9 +43,9 @@ public class MountedStorage { } // Split double flexcrates - if (te.getType() == AllTileEntities.FLEXCRATE.type) { - if (te.getBlockState().get(FlexcrateBlock.DOUBLE)) - te.getWorld().setBlockState(te.getPos(), te.getBlockState().with(FlexcrateBlock.DOUBLE, false)); + if (te.getType() == AllTileEntities.ADJUSTABLE_CRATE.type) { + if (te.getBlockState().get(AdjustableCrateBlock.DOUBLE)) + te.getWorld().setBlockState(te.getPos(), te.getBlockState().with(AdjustableCrateBlock.DOUBLE, false)); te.updateContainingBlockInfo(); } @@ -106,7 +106,7 @@ public class MountedStorage { if (te == null) return false; TileEntityType type = te.getType(); - if (type == AllTileEntities.FLEXCRATE.type) + if (type == AllTileEntities.ADJUSTABLE_CRATE.type) return true; if (te instanceof ShulkerBoxTileEntity) return true; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonGenerator.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonGenerator.java index c826a4bc7..1e97d0a38 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonGenerator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonGenerator.java @@ -32,7 +32,7 @@ public class MechanicalPistonGenerator extends SpecialBlockStateGen { protected int getYRotation(BlockState state) { Direction facing = state.get(MechanicalPistonBlock.FACING); return facing.getAxis() - .isVertical() ? 0 : ((int) facing.getHorizontalAngle() + 180 + 360) % 360; + .isVertical() ? 0 : horizontalAngle(facing) + 180; } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelGenerator.java b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelGenerator.java index 686c0ac92..dab1bad94 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelGenerator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelGenerator.java @@ -17,8 +17,7 @@ public class FlywheelGenerator extends SpecialBlockStateGen { @Override protected int getYRotation(BlockState state) { - return ((int) state.get(FlywheelBlock.HORIZONTAL_FACING) - .getHorizontalAngle() + 90 + 360) % 360; + return horizontalAngle(state.get(FlywheelBlock.HORIZONTAL_FACING)) + 90; } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorGenerator.java b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorGenerator.java index ef09f0533..5dcd43ad1 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorGenerator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/motor/MotorGenerator.java @@ -21,9 +21,7 @@ public class MotorGenerator extends SpecialBlockStateGen { protected int getYRotation(BlockState state) { return state.get(MotorBlock.FACING) .getAxis() - .isVertical() ? 0 - : (int) state.get(MotorBlock.FACING) - .getHorizontalAngle(); + .isVertical() ? 0 : horizontalAngle(state.get(MotorBlock.FACING)); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawGenerator.java b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawGenerator.java index 917350e34..2beeb5ca8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawGenerator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawGenerator.java @@ -23,7 +23,7 @@ public class SawGenerator extends SpecialBlockStateGen { if (facing.getAxis() .isVertical()) return axisAlongFirst ? 90 : 0; - return ((int) facing.getHorizontalAngle() + 360) % 360; + return horizontalAngle(facing); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/redstone/AnalogLeverBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/redstone/AnalogLeverBlock.java index 43d565978..7ca71613d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/redstone/AnalogLeverBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/redstone/AnalogLeverBlock.java @@ -29,8 +29,8 @@ import net.minecraftforge.api.distmarker.OnlyIn; public class AnalogLeverBlock extends HorizontalFaceBlock implements ITE { - public AnalogLeverBlock() { - super(Properties.from(Blocks.LEVER)); + public AnalogLeverBlock(Properties p_i48402_1_) { + super(p_i48402_1_); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactMovementBehaviour.java b/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactMovementBehaviour.java index e95a4f5cc..228323a59 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactMovementBehaviour.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.redstone; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; @@ -17,7 +17,7 @@ public class ContactMovementBehaviour extends MovementBehaviour { @Override public Vec3d getActiveAreaOffset(MovementContext context) { - return new Vec3d(context.state.get(ContactBlock.FACING).getDirectionVec()).scale(.65f); + return new Vec3d(context.state.get(RedstoneContactBlock.FACING).getDirectionVec()).scale(.65f); } @Override @@ -32,16 +32,16 @@ public class ContactMovementBehaviour extends MovementBehaviour { deactivateLastVisitedContact(context); BlockState visitedState = world.getBlockState(pos); - if (!AllBlocks.CONTACT.typeOf(visitedState)) + if (!AllBlocksNew.REDSTONE_CONTACT.has(visitedState)) return; - Vec3d contact = new Vec3d(block.get(ContactBlock.FACING).getDirectionVec()); + Vec3d contact = new Vec3d(block.get(RedstoneContactBlock.FACING).getDirectionVec()); contact = VecHelper.rotate(contact, context.rotation.x, context.rotation.y, context.rotation.z); Direction direction = Direction.getFacingFromVector(contact.x, contact.y, contact.z); - if (!ContactBlock.hasValidContact(world, pos.offset(direction.getOpposite()), direction)) + if (!RedstoneContactBlock.hasValidContact(world, pos.offset(direction.getOpposite()), direction)) return; - world.setBlockState(pos, visitedState.with(ContactBlock.POWERED, true)); + world.setBlockState(pos, visitedState.with(RedstoneContactBlock.POWERED, true)); context.data.put("lastContact", NBTUtil.writeBlockPos(pos)); return; } @@ -54,7 +54,7 @@ public class ContactMovementBehaviour extends MovementBehaviour { public void deactivateLastVisitedContact(MovementContext context) { if (context.data.contains("lastContact")) { BlockPos last = NBTUtil.readBlockPos(context.data.getCompound("lastContact")); - context.world.getPendingBlockTicks().scheduleTick(last, AllBlocks.CONTACT.get(), 1, TickPriority.NORMAL); + context.world.getPendingBlockTicks().scheduleTick(last, AllBlocksNew.REDSTONE_CONTACT.get(), 1, TickPriority.NORMAL); context.data.remove("lastContact"); } } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/redstone/RedstoneContactBlock.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/redstone/RedstoneContactBlock.java index a89d47360..85a4fc912 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/redstone/RedstoneContactBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.redstone; import java.util.Random; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.modules.contraptions.IWrenchable; import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; @@ -10,7 +10,6 @@ import com.simibubi.create.modules.contraptions.components.contraptions.Movement import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer.Builder; @@ -22,13 +21,13 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -public class ContactBlock extends ProperDirectionalBlock implements IPortableBlock, IWrenchable { +public class RedstoneContactBlock extends ProperDirectionalBlock implements IPortableBlock, IWrenchable { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; public static MovementBehaviour MOVEMENT = new ContactMovementBehaviour(); - public ContactBlock() { - super(Properties.from(Blocks.ANDESITE)); + public RedstoneContactBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(POWERED, false).with(FACING, Direction.UP)); } @@ -82,7 +81,7 @@ public class ContactBlock extends ProperDirectionalBlock implements IPortableBlo public static boolean hasValidContact(IWorld world, BlockPos pos, Direction direction) { BlockState blockState = world.getBlockState(pos.offset(direction)); - return AllBlocks.CONTACT.typeOf(blockState) && blockState.get(FACING) == direction.getOpposite(); + return AllBlocksNew.REDSTONE_CONTACT.has(blockState) && blockState.get(FACING) == direction.getOpposite(); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java index 847000309..4480d4aaf 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java @@ -4,7 +4,6 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Consumer; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.Create; import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; @@ -22,10 +21,10 @@ import net.minecraft.world.World; public enum AllBeltAttachments { //TODO rework this nonsense - BELT_FUNNEL(AllBlocks.BELT_FUNNEL.get()), - BELT_OBSERVER(AllBlocks.ENTITY_DETECTOR.get()), + BELT_FUNNEL(AllBlocksNew.FUNNEL.get()), + BELT_OBSERVER(AllBlocksNew.BELT_OBSERVER.get()), MECHANICAL_PRESS(AllBlocksNew.MECHANICAL_PRESS.get()), - LOGISTICAL_ATTACHABLES(AllBlocks.EXTRACTOR.get()), + LOGISTICAL_ATTACHABLES(AllBlocksNew.EXTRACTOR.get()), ; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java index 7101d94de..a1066d254 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java @@ -7,7 +7,6 @@ import java.util.List; import org.apache.commons.lang3.mutable.MutableInt; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.block.IHaveColorHandler; @@ -537,7 +536,7 @@ public class BeltBlock extends HorizontalKineticBlock int offset = isEnd ? -1 : 1; BlockPos tunnelPos = pos.offset(beltState.get(HORIZONTAL_FACING), offset) .up(); - if (AllBlocks.BELT_TUNNEL.typeOf(world.getBlockState(tunnelPos))) + if (AllBlocksNew.BELT_TUNNEL.has(world.getBlockState(tunnelPos))) BeltTunnelBlock.updateTunnel(world, tunnelPos); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltGenerator.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltGenerator.java index 574ae18b8..55b48bc91 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltGenerator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltGenerator.java @@ -27,9 +27,8 @@ public class BeltGenerator extends SpecialBlockStateGen { Slope slope = state.get(BeltBlock.SLOPE); boolean flip = casing && slope == Slope.UPWARD; - int horizontalAngle = (int) state.get(BeltBlock.HORIZONTAL_FACING) - .getHorizontalAngle(); - return (360 + horizontalAngle + (flip ? 180 : 0)) % 360; + Direction direction = state.get(BeltBlock.HORIZONTAL_FACING); + return horizontalAngle(direction) + (flip ? 180 : 0); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltInventory.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltInventory.java index 63a80a7e1..b83f80720 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltInventory.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltInventory.java @@ -7,7 +7,6 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Function; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.utility.ServerSpeedProvider; import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; @@ -287,7 +286,7 @@ public class BeltInventory { private boolean stuckAtTunnel(int offset, ItemStack stack, Direction movementDirection) { BlockPos pos = BeltHelper.getPositionForOffset(belt, offset).up(); - if (!AllBlocks.BELT_TUNNEL.typeOf(belt.getWorld().getBlockState(pos))) + if (!AllBlocksNew.BELT_TUNNEL.has(belt.getWorld().getBlockState(pos))) return false; TileEntity te = belt.getWorld().getTileEntity(pos); if (te == null || !(te instanceof BeltTunnelTileEntity)) @@ -325,7 +324,7 @@ public class BeltInventory { if (belt.getBlockState().get(BeltBlock.SLOPE) != Slope.HORIZONTAL) return; BlockPos pos = BeltHelper.getPositionForOffset(belt, offset).up(); - if (!AllBlocks.BELT_TUNNEL.typeOf(belt.getWorld().getBlockState(pos))) + if (!AllBlocksNew.BELT_TUNNEL.has(belt.getWorld().getBlockState(pos))) return; TileEntity te = belt.getWorld().getTileEntity(pos); if (te == null || !(te instanceof BeltTunnelTileEntity)) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java index 36f4e026b..42f1792d9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java @@ -37,7 +37,7 @@ public class ShaftBlock extends RotatedPillarKineticBlock { @Override public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return new ShaftTileEntity(); + return new SimpleKineticTileEntity(); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/SimpleKineticTileEntity.java similarity index 70% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftTileEntity.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/SimpleKineticTileEntity.java index a71dc9c31..13257cac0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/SimpleKineticTileEntity.java @@ -5,10 +5,10 @@ import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import net.minecraft.util.math.AxisAlignedBB; -public class ShaftTileEntity extends KineticTileEntity { +public class SimpleKineticTileEntity extends KineticTileEntity { - public ShaftTileEntity() { - super(AllTileEntities.SHAFT.type); + public SimpleKineticTileEntity() { + super(AllTileEntities.SIMPLE_KINETIC.type); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeGenerator.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeGenerator.java index 0f05de8a8..d6c5a77d5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeGenerator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeGenerator.java @@ -36,7 +36,7 @@ public class GaugeGenerator extends SpecialBlockStateGen { .isVertical()) return alongFirst ? 90 : 0; - return ((int) direction.getHorizontalAngle() + 360 + 90) % 360; + return horizontalAngle(direction) + 90; } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java index a13d9077d..a0c62e56b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/SpeedGaugeTileEntity.java @@ -16,7 +16,7 @@ import net.minecraft.util.text.TextFormatting; public class SpeedGaugeTileEntity extends GaugeTileEntity{ public SpeedGaugeTileEntity() { - super(AllTileEntities.SPEED_GAUGE.type); + super(AllTileEntities.SPEEDOMETER.type); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/StressGaugeTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/StressGaugeTileEntity.java index fb4523184..7442b80de 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/StressGaugeTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/StressGaugeTileEntity.java @@ -14,7 +14,7 @@ import net.minecraft.util.text.TextFormatting; public class StressGaugeTileEntity extends GaugeTileEntity { public StressGaugeTileEntity() { - super(AllTileEntities.STRESS_GAUGE.type); + super(AllTileEntities.STRESSOMETER.type); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java index c706a5a3e..9b5f87ddc 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java @@ -7,7 +7,6 @@ import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.HorizontalBlock; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; @@ -29,8 +28,8 @@ public abstract class AttachedLogisticalBlock extends HorizontalBlock implements public static final BooleanProperty UPWARD = BooleanProperty.create("upward"); - public AttachedLogisticalBlock() { - super(Properties.from(Blocks.ANDESITE)); + public AttachedLogisticalBlock(Properties properties) { + super(properties); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkBlock.java index 9acde6df9..eec8e1cf8 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkBlock.java @@ -8,7 +8,6 @@ import com.simibubi.create.modules.contraptions.IWrenchable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemUseContext; @@ -32,8 +31,8 @@ public class RedstoneLinkBlock extends ProperDirectionalBlock implements ITE ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + String variant = state.get(RedstoneLinkBlock.RECEIVER) ? "receiver" : "transmitter"; + if (state.get(RedstoneLinkBlock.FACING).getAxis().isHorizontal()) + variant += "_vertical"; + if (state.get(RedstoneLinkBlock.POWERED)) + variant += "_powered"; + + return prov.models().getExistingFile(prov.modLoc("block/redstone_link/" + variant)); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkTileEntity.java index ebdedb581..3bb3cf056 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkTileEntity.java @@ -6,7 +6,7 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; @@ -26,7 +26,7 @@ public class RedstoneLinkTileEntity extends SmartTileEntity { private boolean transmitter; public RedstoneLinkTileEntity() { - super(AllTileEntities.REDSTONE_BRIDGE.type); + super(AllTileEntities.REDSTONE_LINK.type); } public RedstoneLinkTileEntity(boolean transmitter) { @@ -101,7 +101,7 @@ public class RedstoneLinkTileEntity extends SmartTileEntity { if (world.isRemote) return; BlockState blockState = getBlockState(); - if (!AllBlocks.REDSTONE_BRIDGE.typeOf(blockState)) + if (!AllBlocksNew.REDSTONE_LINK.has(blockState)) return; if (receivedSignal != blockState.get(POWERED)) { diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/StockswitchBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchBlock.java similarity index 74% rename from src/main/java/com/simibubi/create/modules/logistics/block/StockswitchBlock.java rename to src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchBlock.java index a7b943d82..862e95461 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/StockswitchBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchBlock.java @@ -3,11 +3,11 @@ package com.simibubi.create.modules.logistics.block; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.gui.ScreenOpener; +import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.IWrenchable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.HorizontalBlock; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.entity.player.PlayerEntity; @@ -20,6 +20,8 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; @@ -28,12 +30,12 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.items.CapabilityItemHandler; -public class StockswitchBlock extends HorizontalBlock implements ITE, IWrenchable { +public class StockpileSwitchBlock extends HorizontalBlock implements ITE, IWrenchable { public static final IntegerProperty INDICATOR = IntegerProperty.create("indicator", 0, 6); - public StockswitchBlock() { - super(Properties.from(Blocks.ANDESITE)); + public StockpileSwitchBlock(Properties p_i48377_1_) { + super(p_i48377_1_); } @Override @@ -50,8 +52,14 @@ public class StockswitchBlock extends HorizontalBlock implements ITE () -> withTileEntityDo(worldIn, pos, te -> this.displayScreen(te, player))); + () -> () -> withTileEntityDo(worldIn, pos, te -> this.displayScreen(te, player))); return ActionResultType.SUCCESS; } @OnlyIn(value = Dist.CLIENT) - protected void displayScreen(StockswitchTileEntity te, PlayerEntity player) { + protected void displayScreen(StockpileSwitchTileEntity te, PlayerEntity player) { if (player instanceof ClientPlayerEntity) - ScreenOpener.open(new StockswitchScreen(te)); + ScreenOpener.open(new StockpileSwitchScreen(te)); } @Override @@ -105,11 +113,15 @@ public class StockswitchBlock extends HorizontalBlock implements ITE getTileEntityClass() { - return StockswitchTileEntity.class; + public Class getTileEntityClass() { + return StockpileSwitchTileEntity.class; } } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/StockswitchScreen.java b/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchScreen.java similarity index 94% rename from src/main/java/com/simibubi/create/modules/logistics/block/StockswitchScreen.java rename to src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchScreen.java index 09e341ce6..f78161497 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/StockswitchScreen.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchScreen.java @@ -5,7 +5,7 @@ import static com.simibubi.create.ScreenResources.STOCKSWITCH; import java.util.Arrays; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllPackets; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiScreen; @@ -17,7 +17,7 @@ import com.simibubi.create.modules.logistics.packet.ConfigureStockswitchPacket; import net.minecraft.item.ItemStack; -public class StockswitchScreen extends AbstractSimiScreen { +public class StockpileSwitchScreen extends AbstractSimiScreen { private ScrollInput offBelow; private Label offBelowLabel; @@ -31,13 +31,13 @@ public class StockswitchScreen extends AbstractSimiScreen { private final String stopAt = Lang.translate("gui.stockswitch.stopAt"); private final String lowerLimit = Lang.translate("gui.stockswitch.lowerLimit"); private final String upperLimit = Lang.translate("gui.stockswitch.upperLimit"); - private final ItemStack renderedItem = new ItemStack(AllBlocks.STOCKSWITCH.get()); + private final ItemStack renderedItem = new ItemStack(AllBlocksNew.STOCKPILE_SWITCH.get()); private int lastModification; - private StockswitchTileEntity te; + private StockpileSwitchTileEntity te; private float cursorPos; - public StockswitchScreen(StockswitchTileEntity te) { + public StockpileSwitchScreen(StockpileSwitchTileEntity te) { this.te = te; lastModification = -1; } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/StockswitchTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchTileEntity.java similarity index 90% rename from src/main/java/com/simibubi/create/modules/logistics/block/StockswitchTileEntity.java rename to src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchTileEntity.java index 90c69cd51..89808ee08 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/StockswitchTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchTileEntity.java @@ -18,7 +18,7 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -public class StockswitchTileEntity extends SmartTileEntity { +public class StockpileSwitchTileEntity extends SmartTileEntity { public float onWhenAbove; public float offWhenBelow; @@ -26,11 +26,11 @@ public class StockswitchTileEntity extends SmartTileEntity { public boolean powered; private LazyOptional observedInventory; - public StockswitchTileEntity() { - this(AllTileEntities.STOCKSWITCH.type); + public StockpileSwitchTileEntity() { + this(AllTileEntities.STOCKPILE_SWITCH.type); } - public StockswitchTileEntity(TileEntityType typeIn) { + public StockpileSwitchTileEntity(TileEntityType typeIn) { super(typeIn); onWhenAbove = .75f; offWhenBelow = .25f; @@ -69,7 +69,7 @@ public class StockswitchTileEntity extends SmartTileEntity { public void updateCurrentLevel() { if (!observedInventory.isPresent()) { if (!findNewInventory() && currentLevel != -1) { - world.setBlockState(pos, getBlockState().with(StockswitchBlock.INDICATOR, 0), 3); + world.setBlockState(pos, getBlockState().with(StockpileSwitchBlock.INDICATOR, 0), 3); currentLevel = -1; powered = false; world.notifyNeighbors(pos, getBlockState().getBlock()); @@ -106,7 +106,7 @@ public class StockswitchTileEntity extends SmartTileEntity { int displayLevel = 0; if (currentLevel > 0) displayLevel = (int) (currentLevel * 6); - world.setBlockState(pos, getBlockState().with(StockswitchBlock.INDICATOR, displayLevel), update ? 3 : 2); + world.setBlockState(pos, getBlockState().with(StockpileSwitchBlock.INDICATOR, displayLevel), update ? 3 : 2); if (update) world.notifyNeighbors(pos, getBlockState().getBlock()); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltAttachableLogisticalBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltAttachableLogisticalBlock.java index 4ed8d622b..c396f7443 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltAttachableLogisticalBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltAttachableLogisticalBlock.java @@ -22,6 +22,10 @@ import net.minecraft.world.World; public abstract class BeltAttachableLogisticalBlock extends AttachedLogisticalBlock implements IBeltAttachment { + public BeltAttachableLogisticalBlock(Properties properties) { + super(properties); + } + @Override public void onBlockAdded(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean isMoving) { onAttachmentPlaced(worldIn, pos, state); diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java index 197b7f1e8..d08c48bb3 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java @@ -21,7 +21,6 @@ import com.simibubi.create.modules.contraptions.relays.belt.transport.Transporte import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.HorizontalBlock; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.Entity; @@ -54,8 +53,8 @@ public class BeltObserverBlock extends HorizontalBlock public static final BooleanProperty BELT = BooleanProperty.create("belt"); public static final EnumProperty MODE = EnumProperty.create("mode", Mode.class); - public BeltObserverBlock() { - super(Properties.from(Blocks.ANDESITE)); + public BeltObserverBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(POWERED, false).with(BELT, false)); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntity.java index 9afed749e..ce279d5e2 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverTileEntity.java @@ -20,7 +20,7 @@ public class BeltObserverTileEntity extends SmartTileEntity { public int turnOffTicks = 0; public BeltObserverTileEntity() { - super(AllTileEntities.ENTITY_DETECTOR.type); + super(AllTileEntities.BELT_OBSERVER.type); setLazyTickRate(20); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java index ef2c82b11..48dc7cdf1 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.Lang; @@ -15,7 +14,6 @@ import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemUseContext; import net.minecraft.state.EnumProperty; @@ -41,8 +39,8 @@ public class BeltTunnelBlock extends Block implements ITE, public static final IProperty SHAPE = EnumProperty.create("shape", Shape.class); public static final IProperty HORIZONTAL_AXIS = BlockStateProperties.HORIZONTAL_AXIS; - public BeltTunnelBlock() { - super(Properties.from(Blocks.GOLD_BLOCK)); + public BeltTunnelBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(SHAPE, Shape.STRAIGHT)); } @@ -105,7 +103,7 @@ public class BeltTunnelBlock extends Block implements ITE, @Override public BlockState updatePostPlacement(BlockState state, Direction facing, BlockState facingState, IWorld worldIn, - BlockPos currentPos, BlockPos facingPos) { + BlockPos currentPos, BlockPos facingPos) { if (!(worldIn instanceof WrappedWorld)) withTileEntityDo(worldIn, currentPos, BeltTunnelTileEntity::initFlaps); BlockState tunnelState = getTunnelState(worldIn, currentPos); @@ -153,21 +151,25 @@ public class BeltTunnelBlock extends Block implements ITE, } private static BlockState getTunnelState(IBlockReader reader, BlockPos pos) { - BlockState state = AllBlocks.BELT_TUNNEL.get().getDefaultState(); + BlockState state = AllBlocksNew.BELT_TUNNEL.getDefaultState(); BlockState belt = reader.getBlockState(pos.down()); if (AllBlocksNew.BELT.has(belt)) - state = state.with(HORIZONTAL_AXIS, belt.get(BeltBlock.HORIZONTAL_FACING).getAxis()); + state = state.with(HORIZONTAL_AXIS, belt.get(BeltBlock.HORIZONTAL_FACING) + .getAxis()); Axis axis = state.get(HORIZONTAL_AXIS); // T and Cross - Direction left = Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis).rotateY(); - BlockState leftState = reader.getBlockState(pos.offset(left).down()); - boolean onLeft = - AllBlocksNew.BELT.has(leftState) && leftState.get(BeltBlock.HORIZONTAL_FACING).getAxis() != axis; - BlockState rightState = reader.getBlockState(pos.offset(left.getOpposite()).down()); - boolean onRight = - AllBlocksNew.BELT.has(rightState) && rightState.get(BeltBlock.HORIZONTAL_FACING).getAxis() != axis; + Direction left = Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis) + .rotateY(); + BlockState leftState = reader.getBlockState(pos.offset(left) + .down()); + boolean onLeft = AllBlocksNew.BELT.has(leftState) && leftState.get(BeltBlock.HORIZONTAL_FACING) + .getAxis() != axis; + BlockState rightState = reader.getBlockState(pos.offset(left.getOpposite()) + .down()); + boolean onRight = AllBlocksNew.BELT.has(rightState) && rightState.get(BeltBlock.HORIZONTAL_FACING) + .getAxis() != axis; if (onLeft && onRight) state = state.with(SHAPE, Shape.CROSS); @@ -178,8 +180,8 @@ public class BeltTunnelBlock extends Block implements ITE, if (state.get(SHAPE) == Shape.STRAIGHT) { Direction fw = Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis); - if (AllBlocks.BELT_TUNNEL.typeOf(reader.getBlockState(pos.offset(fw))) - && AllBlocks.BELT_TUNNEL.typeOf(reader.getBlockState(pos.offset(fw.getOpposite())))) + if (AllBlocksNew.BELT_TUNNEL.has(reader.getBlockState(pos.offset(fw))) + && AllBlocksNew.BELT_TUNNEL.has(reader.getBlockState(pos.offset(fw.getOpposite())))) state = state.with(SHAPE, Shape.WINDOW); } @@ -211,7 +213,8 @@ public class BeltTunnelBlock extends Block implements ITE, break; } if (!context.getWorld().isRemote) - context.getWorld().setBlockState(context.getPos(), state.with(SHAPE, next), 2); + context.getWorld() + .setBlockState(context.getPos(), state.with(SHAPE, next), 2); return ActionResultType.SUCCESS; } @@ -225,7 +228,7 @@ public class BeltTunnelBlock extends Block implements ITE, @Override public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, - boolean isMoving) { + boolean isMoving) { if (worldIn.isRemote) return; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java index ea857a4bf..de44ee7d1 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java @@ -6,7 +6,6 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.block.SyncedTileEntity; @@ -151,7 +150,7 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT for (Direction direction : Direction.values()) { if (direction.getAxis().isVertical()) continue; - if (AllBlocks.BELT_TUNNEL.typeOf(world.getBlockState(pos.offset(direction)))) + if (AllBlocksNew.BELT_TUNNEL.has(world.getBlockState(pos.offset(direction)))) continue; if (direction.getAxis() != tunnelState.get(BlockStateProperties.HORIZONTAL_AXIS)) { boolean positive = direction.getAxisDirection() == AxisDirection.POSITIVE diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeGenerator.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeGenerator.java new file mode 100644 index 000000000..8f1d4c8ca --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AbstractDiodeGenerator.java @@ -0,0 +1,80 @@ +package com.simibubi.create.modules.logistics.block.diodes; + +import java.util.Vector; + +import com.simibubi.create.Create; +import com.simibubi.create.foundation.utility.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.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.BlockModelProvider; +import net.minecraftforge.client.model.generators.ItemModelBuilder; +import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.client.model.generators.ModelFile.ExistingModelFile; + +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"); + }; + } + + @Override + protected final int getXRotation(BlockState state) { + return 0; + } + + @Override + protected final int getYRotation(BlockState state) { + return horizontalAngle(state.get(AbstractDiodeBlock.HORIZONTAL_FACING)); + } + + abstract Vector createModels(DataGenContext ctx, BlockModelProvider prov); + + abstract int getModelIndex(BlockState state); + + @Override + public final ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + if (models == null) + models = createModels(ctx, prov.models()); + return models.get(getModelIndex(state)); + } + + protected Vector makeVector(int size) { + return new Vector<>(size); + } + + protected ExistingModelFile existingModel(BlockModelProvider prov, String name) { + return prov.getExistingFile(existing(name)); + } + + protected ResourceLocation existing(String name) { + return Create.asResource("block/diodes/" + name); + } + + protected ResourceLocation texture(DataGenContext ctx, String name) { + return Create.asResource("block/diodes/" + ctx.getName() + "/" + name); + } + + protected ResourceLocation poweredTorch() { + return new ResourceLocation("block/redstone_torch"); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexPulsepeaterTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java similarity index 79% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexPulsepeaterTileEntity.java rename to src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java index 1f15bf71b..dfd68ab56 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexPulsepeaterTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustablePulseRepeaterTileEntity.java @@ -1,13 +1,13 @@ package com.simibubi.create.modules.logistics.block.diodes; -import static com.simibubi.create.modules.logistics.block.diodes.FlexpeaterBlock.POWERING; +import static com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterBlock.POWERING; import com.simibubi.create.AllTileEntities; -public class FlexPulsepeaterTileEntity extends FlexpeaterTileEntity { +public class AdjustablePulseRepeaterTileEntity extends AdjustableRepeaterTileEntity { - public FlexPulsepeaterTileEntity() { - super(AllTileEntities.FLEXPULSEPEATER.type); + public AdjustablePulseRepeaterTileEntity() { + super(AllTileEntities.ADJUSTABLE_PULSE_REPEATER.type); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java similarity index 74% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterBlock.java rename to src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java index 5865771eb..acb46336f 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java @@ -1,10 +1,9 @@ package com.simibubi.create.modules.logistics.block.diodes; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer.Builder; import net.minecraft.tileentity.TileEntity; @@ -12,13 +11,14 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -public class FlexpeaterBlock extends AbstractDiodeBlock { +public class AdjustableRepeaterBlock extends AbstractDiodeBlock { public static BooleanProperty POWERING = BooleanProperty.create("powering"); - public FlexpeaterBlock() { - super(Properties.from(Blocks.REPEATER)); - setDefaultState(getDefaultState().with(POWERED, false).with(POWERING, false)); + public AdjustableRepeaterBlock(Properties properties) { + super(properties); + setDefaultState(getDefaultState().with(POWERED, false) + .with(POWERING, false)); } @Override @@ -34,7 +34,8 @@ public class FlexpeaterBlock extends AbstractDiodeBlock { @Override public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return AllBlocks.FLEXPEATER.get() == this ? new FlexpeaterTileEntity() : new FlexPulsepeaterTileEntity(); + return AllBlocksNew.ADJUSTABLE_REPEATER.get() == this ? new AdjustableRepeaterTileEntity() + : new AdjustablePulseRepeaterTileEntity(); } @Override @@ -56,7 +57,8 @@ public class FlexpeaterBlock extends AbstractDiodeBlock { public boolean canConnectRedstone(BlockState state, IBlockReader world, BlockPos pos, Direction side) { if (side == null) return false; - return side.getAxis() == state.get(HORIZONTAL_FACING).getAxis(); + return side.getAxis() == state.get(HORIZONTAL_FACING) + .getAxis(); } } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterGenerator.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterGenerator.java new file mode 100644 index 000000000..b4a01b509 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterGenerator.java @@ -0,0 +1,39 @@ +package com.simibubi.create.modules.logistics.block.diodes; + +import java.util.Vector; + +import com.tterrag.registrate.providers.DataGenContext; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.BlockModelProvider; +import net.minecraftforge.client.model.generators.ModelFile; + +public class AdjustableRepeaterGenerator extends AbstractDiodeGenerator { + + @Override + Vector createModels(DataGenContext ctx, BlockModelProvider prov) { + Vector models = makeVector(4); + 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 + "_powering", template) + .texture("torch", poweredTorch()) + .texture("top", texture(ctx, "powering"))); + models.add(prov.withExistingParent(name + "_powered_powering", template) + .texture("torch", poweredTorch()) + .texture("top", texture(ctx, "powered_powering"))); + + return models; + } + + @Override + int getModelIndex(BlockState state) { + return (state.get(AdjustableRepeaterBlock.POWERING) ? 2 : 0) + (state.get(AdjustableRepeaterBlock.POWERED) ? 1 : 0); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterRenderer.java similarity index 64% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterRenderer.java index cb1695872..0693462ec 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterRenderer.java @@ -7,19 +7,19 @@ import com.simibubi.create.foundation.utility.SuperByteBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -public class FlexpeaterTileEntityRenderer extends ColoredOverlayTileEntityRenderer { +public class AdjustableRepeaterRenderer extends ColoredOverlayTileEntityRenderer { - public FlexpeaterTileEntityRenderer(TileEntityRendererDispatcher dispatcher) { + public AdjustableRepeaterRenderer(TileEntityRendererDispatcher dispatcher) { super(dispatcher); } @Override - protected int getColor(FlexpeaterTileEntity te, float partialTicks) { + protected int getColor(AdjustableRepeaterTileEntity te, float partialTicks) { return ColorHelper.mixColors(0x2C0300, 0xCD0000, te.state / (float) te.maxState.getValue()); } @Override - protected SuperByteBuffer getOverlayBuffer(FlexpeaterTileEntity te) { + protected SuperByteBuffer getOverlayBuffer(AdjustableRepeaterTileEntity te) { return AllBlockPartials.FLEXPEATER_INDICATOR.renderOn(te.getBlockState()); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterScrollSlot.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterScrollSlot.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterScrollSlot.java rename to src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterScrollSlot.java index 032727199..1b5a852ed 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterScrollSlot.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterScrollSlot.java @@ -9,7 +9,7 @@ import net.minecraft.block.BlockState; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.math.Vec3d; -public class FlexpeaterScrollSlot extends ValueBoxTransform { +public class AdjustableRepeaterScrollSlot extends ValueBoxTransform { @Override protected Vec3d getLocation(BlockState state) { diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterTileEntity.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntity.java rename to src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterTileEntity.java index df07b31e1..21f8d663a 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/FlexpeaterTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterTileEntity.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.diodes; -import static com.simibubi.create.modules.logistics.block.diodes.FlexpeaterBlock.POWERING; +import static com.simibubi.create.modules.logistics.block.diodes.AdjustableRepeaterBlock.POWERING; import static net.minecraft.block.RedstoneDiodeBlock.POWERED; import java.util.List; @@ -16,23 +16,23 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.MathHelper; -public class FlexpeaterTileEntity extends SmartTileEntity { +public class AdjustableRepeaterTileEntity extends SmartTileEntity { public int state; public boolean charging; ScrollValueBehaviour maxState; - public FlexpeaterTileEntity() { - this(AllTileEntities.FLEXPEATER.type); + public AdjustableRepeaterTileEntity() { + this(AllTileEntities.ADJUSTABLE_REPEATER.type); } - protected FlexpeaterTileEntity(TileEntityType type) { + protected AdjustableRepeaterTileEntity(TileEntityType type) { super(type); } @Override public void addBehaviours(List behaviours) { - maxState = new ScrollValueBehaviour(Lang.translate("generic.delay"), this, new FlexpeaterScrollSlot()) + maxState = new ScrollValueBehaviour(Lang.translate("generic.delay"), this, new AdjustableRepeaterScrollSlot()) .between(1, 60 * 20 * 30); maxState.withStepFunction(this::step); maxState.withFormatter(this::format); diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/LatchBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchBlock.java similarity index 96% rename from src/main/java/com/simibubi/create/modules/logistics/block/diodes/LatchBlock.java rename to src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchBlock.java index 11027f021..f4bf86ab9 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/LatchBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchBlock.java @@ -16,11 +16,12 @@ import net.minecraft.world.TickPriority; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -public class LatchBlock extends ToggleLatchBlock { +public class PoweredLatchBlock extends ToggleLatchBlock { public static BooleanProperty POWERED_SIDE = BooleanProperty.create("powered_side"); - public LatchBlock() { + public PoweredLatchBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(POWERED_SIDE, false)); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchGenerator.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchGenerator.java new file mode 100644 index 000000000..87eddd742 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PoweredLatchGenerator.java @@ -0,0 +1,35 @@ +package com.simibubi.create.modules.logistics.block.diodes; + +import java.util.Vector; + +import com.tterrag.registrate.providers.DataGenContext; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.BlockModelProvider; +import net.minecraftforge.client.model.generators.ModelFile; + +public class PoweredLatchGenerator extends AbstractDiodeGenerator { + + @Override + 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.get(PoweredLatchBlock.POWERING)? 1 : 0; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterBlock.java index 46a01faf6..c0f3e9244 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterBlock.java @@ -4,7 +4,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer.Builder; import net.minecraft.util.Direction; @@ -17,8 +16,8 @@ public class PulseRepeaterBlock extends AbstractDiodeBlock { public static BooleanProperty PULSING = BooleanProperty.create("pulsing"); - public PulseRepeaterBlock() { - super(Properties.from(Blocks.REPEATER)); + public PulseRepeaterBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(PULSING, false).with(POWERED, false)); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterGenerator.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterGenerator.java new file mode 100644 index 000000000..7d9f53f34 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/PulseRepeaterGenerator.java @@ -0,0 +1,36 @@ +package com.simibubi.create.modules.logistics.block.diodes; + +import java.util.Vector; + +import com.tterrag.registrate.providers.DataGenContext; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.ResourceLocation; +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.get(PulseRepeaterBlock.PULSING) ? 2 : state.get(PulseRepeaterBlock.POWERED) ? 1 : 0; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchBlock.java index e99fab8f8..ed6b2cac1 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchBlock.java @@ -6,7 +6,6 @@ import com.simibubi.create.AllItems; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer.Builder; @@ -23,8 +22,8 @@ public class ToggleLatchBlock extends AbstractDiodeBlock { public static BooleanProperty POWERING = BooleanProperty.create("powering"); - public ToggleLatchBlock() { - super(Properties.from(Blocks.REPEATER)); + public ToggleLatchBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(POWERING, false).with(POWERED, false)); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchGenerator.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchGenerator.java new file mode 100644 index 000000000..953ea9414 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/ToggleLatchGenerator.java @@ -0,0 +1,37 @@ +package com.simibubi.create.modules.logistics.block.diodes; + +import java.util.Vector; + +import com.tterrag.registrate.providers.DataGenContext; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.BlockModelProvider; +import net.minecraftforge.client.model.generators.ModelFile; + +public class ToggleLatchGenerator extends AbstractDiodeGenerator { + + @Override + Vector createModels(DataGenContext ctx, BlockModelProvider prov) { + String name = ctx.getName(); + Vector models = makeVector(4); + ResourceLocation off = existing("latch_off"); + ResourceLocation on = existing("latch_on"); + + models.add(prov.getExistingFile(off)); + models.add(prov.withExistingParent(name + "_off_powered", off) + .texture("top", texture(ctx, "powered"))); + models.add(prov.getExistingFile(on)); + models.add(prov.withExistingParent(name + "_on_powered", on) + .texture("top", texture(ctx, "powered_powering"))); + + return models; + } + + @Override + int getModelIndex(BlockState state) { + return (state.get(ToggleLatchBlock.POWERING) ? 2 : 0) + (state.get(ToggleLatchBlock.POWERED) ? 1 : 0); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java index e7124b30e..f10b9860c 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.extractor; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; @@ -29,8 +29,8 @@ public class ExtractorBlock extends BeltAttachableLogisticalBlock implements IPo public static BooleanProperty POWERED = BlockStateProperties.POWERED; private static final MovementBehaviour MOVEMENT = new ExtractorMovementBehaviour(); - public ExtractorBlock() { - super(); + public ExtractorBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(POWERED, false)); } @@ -41,12 +41,12 @@ public class ExtractorBlock extends BeltAttachableLogisticalBlock implements IPo @Override protected BlockState getVerticalDefaultState() { - return AllBlocks.VERTICAL_EXTRACTOR.getDefault(); + return AllBlocksNew.VERTICAL_EXTRACTOR.getDefaultState(); } - + @Override protected BlockState getHorizontalDefaultState() { - return AllBlocks.EXTRACTOR.getDefault(); + return AllBlocksNew.EXTRACTOR.getDefaultState(); } @Override @@ -66,13 +66,13 @@ public class ExtractorBlock extends BeltAttachableLogisticalBlock implements IPo @Override public BlockState getStateForPlacement(BlockItemUseContext context) { - return super.getStateForPlacement(context).with(POWERED, - reactsToRedstone() && context.getWorld().isBlockPowered(context.getPos())); + return super.getStateForPlacement(context).with(POWERED, reactsToRedstone() && context.getWorld() + .isBlockPowered(context.getPos())); } @Override public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, - boolean isMoving) { + boolean isMoving) { super.neighborChanged(state, worldIn, pos, blockIn, fromPos, isMoving); if (worldIn.isRemote) @@ -116,6 +116,10 @@ public class ExtractorBlock extends BeltAttachableLogisticalBlock implements IPo } public static class Vertical extends ExtractorBlock { + public Vertical(Properties properties) { + super(properties); + } + @Override protected boolean isVertical() { return true; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java index afaa439c2..00b6dd5aa 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.logistics.block.extractor; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; @@ -15,19 +15,18 @@ import net.minecraft.world.IBlockReader; public class LinkedExtractorBlock extends ExtractorBlock { -// @Override // TODO 1.15 register layer -// public BlockRenderLayer getRenderLayer() { -// return BlockRenderLayer.CUTOUT_MIPPED; -// } + public LinkedExtractorBlock(Properties properties) { + super(properties); + } @Override protected BlockState getVerticalDefaultState() { - return AllBlocks.VERTICAL_LINKED_EXTRACTOR.get().getDefaultState(); + return AllBlocksNew.VERTICAL_LINKED_EXTRACTOR.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocks.LINKED_EXTRACTOR.get().getDefaultState(); + return AllBlocksNew.LINKED_EXTRACTOR.getDefaultState(); } @Override @@ -75,6 +74,10 @@ public class LinkedExtractorBlock extends ExtractorBlock { } public static class Vertical extends LinkedExtractorBlock { + public Vertical(Properties properties) { + super(properties); + } + @Override protected boolean isVertical() { return true; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/VerticalExtractorGenerator.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/VerticalExtractorGenerator.java new file mode 100644 index 000000000..a6a07d234 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/VerticalExtractorGenerator.java @@ -0,0 +1,38 @@ +package com.simibubi.create.modules.logistics.block.extractor; + +import com.simibubi.create.foundation.utility.data.AssetLookup; +import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.modules.logistics.block.funnel.FunnelBlock; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraftforge.client.model.generators.ModelFile; + +public class VerticalExtractorGenerator extends SpecialBlockStateGen { + + private boolean linked; + + public VerticalExtractorGenerator(boolean linked) { + this.linked = linked; + } + + @Override + protected int getXRotation(BlockState state) { + return state.get(ExtractorBlock.Vertical.UPWARD) ? 180 : 0; + } + + @Override + protected int getYRotation(BlockState state) { + return (state.get(FunnelBlock.UPWARD) ? 0 : 180) + horizontalAngle(state.get(FunnelBlock.HORIZONTAL_FACING)); + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + return AssetLookup.forPowered(ctx, prov, "extractor/vertical" + (linked ? "_linked" : "")) + .apply(state); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java index 0a58ecbc1..a88a8445c 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; @@ -46,6 +45,10 @@ public class FunnelBlock extends AttachedLogisticalBlock public static final BooleanProperty BELT = BooleanProperty.create("belt"); public static final MovementBehaviour MOVEMENT = new FunnelMovementBehaviour(); + public FunnelBlock(Properties properties) { + super(properties); + } + @Override protected void fillStateContainer(Builder builder) { if (!isVertical()) @@ -86,12 +89,12 @@ public class FunnelBlock extends AttachedLogisticalBlock @Override protected BlockState getVerticalDefaultState() { - return AllBlocks.VERTICAL_FUNNEL.getDefault(); + return AllBlocksNew.VERTICAL_FUNNEL.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocks.BELT_FUNNEL.getDefault(); + return AllBlocksNew.FUNNEL.getDefaultState(); } @Override @@ -214,6 +217,10 @@ public class FunnelBlock extends AttachedLogisticalBlock } public static class Vertical extends FunnelBlock { + public Vertical(Properties properties) { + super(properties); + } + @Override protected boolean isVertical() { return true; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java index a88ac7d7c..9fc1114b3 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java @@ -33,7 +33,7 @@ public class FunnelTileEntity extends SmartTileEntity { private ItemStack justEaten; public FunnelTileEntity() { - super(AllTileEntities.BELT_FUNNEL.type); + super(AllTileEntities.FUNNEL.type); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/VerticalFunnelGenerator.java b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/VerticalFunnelGenerator.java new file mode 100644 index 000000000..7e28f1a3f --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/VerticalFunnelGenerator.java @@ -0,0 +1,30 @@ +package com.simibubi.create.modules.logistics.block.funnel; + +import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraftforge.client.model.generators.ModelFile; + +public class VerticalFunnelGenerator extends SpecialBlockStateGen { + + @Override + protected int getXRotation(BlockState state) { + return state.get(FunnelBlock.UPWARD) ? 270 : 90; + } + + @Override + protected int getYRotation(BlockState state) { + return (state.get(FunnelBlock.UPWARD) ? 180 : 0) + horizontalAngle(state.get(FunnelBlock.HORIZONTAL_FACING)); + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + return prov.models() + .getExistingFile(prov.modLoc("block/funnel/vertical")); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java similarity index 75% rename from src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateBlock.java rename to src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java index 2b2d5b61c..6b30ea853 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java @@ -1,10 +1,9 @@ package com.simibubi.create.modules.logistics.block.inventories; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.item.ItemHelper; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; @@ -18,10 +17,10 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -public class FlexcrateBlock extends CrateBlock { +public class AdjustableCrateBlock extends CrateBlock { - public FlexcrateBlock() { - super(Properties.from(Blocks.ANDESITE)); + public AdjustableCrateBlock(Properties p_i48415_1_) { + super(p_i48415_1_); } @Override @@ -31,7 +30,7 @@ public class FlexcrateBlock extends CrateBlock { @Override public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return new FlexcrateTileEntity(); + return new AdjustableCrateTileEntity(); } @Override @@ -39,11 +38,11 @@ public class FlexcrateBlock extends CrateBlock { if (oldState.getBlock() != state.getBlock() && state.hasTileEntity() && state.get(DOUBLE) && state.get(FACING).getAxisDirection() == AxisDirection.POSITIVE) { TileEntity tileEntity = worldIn.getTileEntity(pos); - if (!(tileEntity instanceof FlexcrateTileEntity)) + if (!(tileEntity instanceof AdjustableCrateTileEntity)) return; - FlexcrateTileEntity te = (FlexcrateTileEntity) tileEntity; - FlexcrateTileEntity other = te.getOtherCrate(); + AdjustableCrateTileEntity te = (AdjustableCrateTileEntity) tileEntity; + AdjustableCrateTileEntity other = te.getOtherCrate(); if (other == null) return; @@ -64,8 +63,8 @@ public class FlexcrateBlock extends CrateBlock { return ActionResultType.SUCCESS; } else { TileEntity te = worldIn.getTileEntity(pos); - if (te instanceof FlexcrateTileEntity) { - FlexcrateTileEntity fte = (FlexcrateTileEntity) te; + if (te instanceof AdjustableCrateTileEntity) { + AdjustableCrateTileEntity fte = (AdjustableCrateTileEntity) te; fte = fte.getMainCrate(); NetworkHooks.openGui((ServerPlayerEntity) player, fte, fte::sendToContainer); } @@ -75,14 +74,14 @@ public class FlexcrateBlock extends CrateBlock { public static void splitCrate(World world, BlockPos pos) { BlockState state = world.getBlockState(pos); - if (!AllBlocks.FLEXCRATE.typeOf(state)) + if (!AllBlocksNew.ADJUSTABLE_CRATE.has(state)) return; if (!state.get(DOUBLE)) return; TileEntity te = world.getTileEntity(pos); - if (!(te instanceof FlexcrateTileEntity)) + if (!(te instanceof AdjustableCrateTileEntity)) return; - FlexcrateTileEntity crateTe = (FlexcrateTileEntity) te; + AdjustableCrateTileEntity crateTe = (AdjustableCrateTileEntity) te; crateTe.onSplit(); world.setBlockState(pos, state.with(DOUBLE, false)); world.setBlockState(crateTe.getOtherCrate().getPos(), state.with(DOUBLE, false)); @@ -90,11 +89,11 @@ public class FlexcrateBlock extends CrateBlock { @Override public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { - if (!(worldIn.getTileEntity(pos) instanceof FlexcrateTileEntity)) + if (!(worldIn.getTileEntity(pos) instanceof AdjustableCrateTileEntity)) return; if (state.hasTileEntity() && state.getBlock() != newState.getBlock()) { - FlexcrateTileEntity te = (FlexcrateTileEntity) worldIn.getTileEntity(pos); + AdjustableCrateTileEntity te = (AdjustableCrateTileEntity) worldIn.getTileEntity(pos); if (!isMoving) te.onDestroyed(); worldIn.removeTileEntity(pos); @@ -110,8 +109,8 @@ public class FlexcrateBlock extends CrateBlock { @Override public int getComparatorInputOverride(BlockState blockState, World worldIn, BlockPos pos) { TileEntity te = worldIn.getTileEntity(pos); - if (te instanceof FlexcrateTileEntity) { - FlexcrateTileEntity flexcrateTileEntity = (FlexcrateTileEntity) te; + if (te instanceof AdjustableCrateTileEntity) { + AdjustableCrateTileEntity flexcrateTileEntity = (AdjustableCrateTileEntity) te; return ItemHelper.calcRedstoneFromInventory(flexcrateTileEntity.inventory); } return 0; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateContainer.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateContainer.java similarity index 85% rename from src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateContainer.java rename to src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateContainer.java index 43378fa62..3d0d0cf59 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateContainer.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateContainer.java @@ -13,25 +13,25 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.SlotItemHandler; -public class FlexcrateContainer extends Container { +public class AdjustableCrateContainer extends Container { - public FlexcrateTileEntity te; + public AdjustableCrateTileEntity te; public PlayerInventory playerInventory; public boolean doubleCrate; - public FlexcrateContainer(int id, PlayerInventory inv, PacketBuffer extraData) { + public AdjustableCrateContainer(int id, PlayerInventory inv, PacketBuffer extraData) { super(AllContainers.FLEXCRATE.type, id); ClientWorld world = Minecraft.getInstance().world; TileEntity tileEntity = world.getTileEntity(extraData.readBlockPos()); this.playerInventory = inv; - if (tileEntity instanceof FlexcrateTileEntity) { - this.te = (FlexcrateTileEntity) tileEntity; + if (tileEntity instanceof AdjustableCrateTileEntity) { + this.te = (AdjustableCrateTileEntity) tileEntity; this.te.handleUpdateTag(extraData.readCompoundTag()); init(); } } - public FlexcrateContainer(int id, PlayerInventory inv, FlexcrateTileEntity te) { + public AdjustableCrateContainer(int id, PlayerInventory inv, AdjustableCrateTileEntity te) { super(AllContainers.FLEXCRATE.type, id); this.te = te; this.playerInventory = inv; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateScreen.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java similarity index 83% rename from src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateScreen.java rename to src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java index c27104122..d5163832e 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateScreen.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllPackets; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen; @@ -23,20 +23,20 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -public class FlexcrateScreen extends AbstractSimiContainerScreen { +public class AdjustableCrateScreen extends AbstractSimiContainerScreen { - private FlexcrateTileEntity te; + private AdjustableCrateTileEntity te; private Label allowedItemsLabel; private ScrollInput allowedItems; private int lastModification; private List extraAreas; - private final ItemStack renderedItem = new ItemStack(AllBlocks.FLEXCRATE.get()); + private final ItemStack renderedItem = new ItemStack(AllBlocksNew.ADJUSTABLE_CRATE.get()); private final String title = Lang.translate("gui.flexcrate.title"); private final String storageSpace = Lang.translate("gui.flexcrate.storageSpace"); - public FlexcrateScreen(FlexcrateContainer container, PlayerInventory inv, ITextComponent title) { + public AdjustableCrateScreen(AdjustableCrateContainer container, PlayerInventory inv, ITextComponent title) { super(container, inv, title); te = container.te; lastModification = -1; @@ -49,13 +49,13 @@ public class FlexcrateScreen extends AbstractSimiContainerScreen lastModification = 0); + .withRange(1, (container.doubleCrate ? 2049 : 1025)) + .writingTo(allowedItemsLabel) + .withShiftStep(64) + .setState(te.allowedAmount) + .calling(s -> lastModification = 0); allowedItems.onChanged(); widgets.add(allowedItemsLabel); widgets.add(allowedItems); @@ -80,13 +80,13 @@ public class FlexcrateScreen extends AbstractSimiContainerScreen slot * 64) @@ -100,8 +100,8 @@ public class FlexcrateScreen extends AbstractSimiContainerScreen= 0) diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateTileEntity.java similarity index 84% rename from src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateTileEntity.java rename to src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateTileEntity.java index 665971392..b220a9e0a 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateTileEntity.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.inventories; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllTileEntities; import net.minecraft.entity.player.PlayerEntity; @@ -22,7 +22,7 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; -public class FlexcrateTileEntity extends CrateTileEntity implements INamedContainerProvider { +public class AdjustableCrateTileEntity extends CrateTileEntity implements INamedContainerProvider { public class Inv extends ItemStackHandler { public Inv() { @@ -62,11 +62,11 @@ public class FlexcrateTileEntity extends CrateTileEntity implements INamedContai public int itemCount; protected LazyOptional invHandler; - public FlexcrateTileEntity() { - this(AllTileEntities.FLEXCRATE.type); + public AdjustableCrateTileEntity() { + this(AllTileEntities.ADJUSTABLE_CRATE.type); } - public FlexcrateTileEntity(TileEntityType type) { + public AdjustableCrateTileEntity(TileEntityType type) { super(type); allowedAmount = 512; itemCount = 10; @@ -76,26 +76,26 @@ public class FlexcrateTileEntity extends CrateTileEntity implements INamedContai @Override public Container createMenu(int id, PlayerInventory inventory, PlayerEntity player) { - return new FlexcrateContainer(id, inventory, this); + return new AdjustableCrateContainer(id, inventory, this); } - public FlexcrateTileEntity getOtherCrate() { - if (!AllBlocks.FLEXCRATE.typeOf(getBlockState())) + public AdjustableCrateTileEntity getOtherCrate() { + if (!AllBlocksNew.ADJUSTABLE_CRATE.has(getBlockState())) return null; TileEntity tileEntity = world.getTileEntity(pos.offset(getFacing())); - if (tileEntity instanceof FlexcrateTileEntity) - return (FlexcrateTileEntity) tileEntity; + if (tileEntity instanceof AdjustableCrateTileEntity) + return (AdjustableCrateTileEntity) tileEntity; return null; } - public FlexcrateTileEntity getMainCrate() { + public AdjustableCrateTileEntity getMainCrate() { if (isSecondaryCrate()) return getOtherCrate(); return this; } public void onSplit() { - FlexcrateTileEntity other = getOtherCrate(); + AdjustableCrateTileEntity other = getOtherCrate(); if (other == null) return; if (other == getMainCrate()) { @@ -119,14 +119,14 @@ public class FlexcrateTileEntity extends CrateTileEntity implements INamedContai } public void onDestroyed() { - FlexcrateTileEntity other = getOtherCrate(); + AdjustableCrateTileEntity other = getOtherCrate(); if (other == null) { for (int slot = 0; slot < inventory.getSlots(); slot++) drop(slot); return; } - FlexcrateTileEntity main = getMainCrate(); + AdjustableCrateTileEntity main = getMainCrate(); if (this == main) { for (int slot = 0; slot < inventory.getSlots(); slot++) { other.inventory.setStackInSlot(slot, inventory.getStackInSlot(slot)); @@ -163,7 +163,8 @@ public class FlexcrateTileEntity extends CrateTileEntity implements INamedContai @Override public ITextComponent getDisplayName() { - return new StringTextComponent(getType().getRegistryName().toString()); + return new StringTextComponent(getType().getRegistryName() + .toString()); } public void sendToContainer(PacketBuffer buffer) { @@ -180,7 +181,7 @@ public class FlexcrateTileEntity extends CrateTileEntity implements INamedContai @Override public LazyOptional getCapability(Capability capability, Direction facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - FlexcrateTileEntity mainCrate = getMainCrate(); + AdjustableCrateTileEntity mainCrate = getMainCrate(); if (mainCrate != null && mainCrate.invHandler != null && mainCrate.invHandler.isPresent()) return mainCrate.invHandler.cast(); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CrateTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CrateTileEntity.java index a30a76486..e7a9020f3 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CrateTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CrateTileEntity.java @@ -19,7 +19,7 @@ public abstract class CrateTileEntity extends SmartTileEntity { public void addBehaviours(List behaviours) {} public boolean isDoubleCrate() { - return getBlockState().get(FlexcrateBlock.DOUBLE); + return getBlockState().get(AdjustableCrateBlock.DOUBLE); } public boolean isSecondaryCrate() { @@ -31,7 +31,7 @@ public abstract class CrateTileEntity extends SmartTileEntity { } public Direction getFacing() { - return getBlockState().get(FlexcrateBlock.FACING); + return getBlockState().get(AdjustableCrateBlock.FACING); } } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CreativeCrateTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CreativeCrateTileEntity.java index b580131f6..2d8a3493c 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CreativeCrateTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CreativeCrateTileEntity.java @@ -3,7 +3,7 @@ package com.simibubi.create.modules.logistics.block.inventories; import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; @@ -58,7 +58,7 @@ public class CreativeCrateTileEntity extends CrateTileEntity { } private CreativeCrateTileEntity getOtherCrate() { - if (!AllBlocks.CREATIVE_CRATE.typeOf(getBlockState())) + if (!AllBlocksNew.CREATIVE_CRATE.has(getBlockState())) return null; TileEntity tileEntity = world.getTileEntity(pos.offset(getFacing())); if (tileEntity instanceof CreativeCrateTileEntity) diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java index 9929aee3e..d088d9fe7 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.transposer; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; @@ -8,19 +8,18 @@ import net.minecraft.world.IBlockReader; public class LinkedTransposerBlock extends TransposerBlock { -// @Override // TODO 1.15 register layer -// public BlockRenderLayer getRenderLayer() { -// return BlockRenderLayer.CUTOUT; -// } + public LinkedTransposerBlock(Properties properties) { + super(properties); + } @Override protected BlockState getVerticalDefaultState() { - return AllBlocks.VERTICAL_LINKED_TRANSPOSER.get().getDefaultState(); + return AllBlocksNew.VERTICAL_LINKED_TRANSPOSER.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocks.LINKED_TRANSPOSER.get().getDefaultState(); + return AllBlocksNew.LINKED_TRANSPOSER.getDefaultState(); } @Override @@ -34,6 +33,10 @@ public class LinkedTransposerBlock extends TransposerBlock { } public static class Vertical extends LinkedTransposerBlock { + public Vertical(Properties properties) { + super(properties); + } + @Override protected boolean isVertical() { return true; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java index d4e9069dc..695a8837f 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.transposer; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.logistics.block.belts.BeltAttachableLogisticalBlock; @@ -26,10 +26,11 @@ public class TransposerBlock extends BeltAttachableLogisticalBlock { public static BooleanProperty POWERED = BlockStateProperties.POWERED; - public TransposerBlock() { + public TransposerBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(POWERED, false)); } - + @Override public boolean hasTileEntity(BlockState state) { return true; @@ -57,12 +58,12 @@ public class TransposerBlock extends BeltAttachableLogisticalBlock { @Override protected BlockState getVerticalDefaultState() { - return AllBlocks.VERTICAL_TRANSPOSER.getDefault(); + return AllBlocksNew.VERTICAL_TRANSPOSER.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocks.TRANSPOSER.getDefault(); + return AllBlocksNew.TRANSPOSER.getDefaultState(); } @Override @@ -72,7 +73,8 @@ public class TransposerBlock extends BeltAttachableLogisticalBlock { return ActionResultType.SUCCESS; Direction blockFacing = getBlockFacing(state); BlockState newState = state; - if (blockFacing.getAxis().isHorizontal()) + if (blockFacing.getAxis() + .isHorizontal()) newState = state.with(HORIZONTAL_FACING, blockFacing.getOpposite()); else newState = state.cycle(UPWARD); @@ -92,12 +94,13 @@ public class TransposerBlock extends BeltAttachableLogisticalBlock { @Override public BlockState getStateForPlacement(BlockItemUseContext context) { BlockState stateForPlacement = super.getStateForPlacement(context); - return stateForPlacement.with(POWERED, Boolean.valueOf(context.getWorld().isBlockPowered(context.getPos()))); + return stateForPlacement.with(POWERED, Boolean.valueOf(context.getWorld() + .isBlockPowered(context.getPos()))); } @Override public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, - boolean isMoving) { + boolean isMoving) { if (worldIn.isRemote) return; @@ -128,6 +131,10 @@ public class TransposerBlock extends BeltAttachableLogisticalBlock { } public static class Vertical extends TransposerBlock { + public Vertical(Properties properties) { + super(properties); + } + @Override protected boolean isVertical() { return true; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/VerticalTransposerGenerator.java b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/VerticalTransposerGenerator.java new file mode 100644 index 000000000..fa5ff061a --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/VerticalTransposerGenerator.java @@ -0,0 +1,38 @@ +package com.simibubi.create.modules.logistics.block.transposer; + +import com.simibubi.create.foundation.utility.data.AssetLookup; +import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraftforge.client.model.generators.ModelFile; + +public class VerticalTransposerGenerator extends SpecialBlockStateGen { + + private boolean linked; + + public VerticalTransposerGenerator(boolean linked) { + this.linked = linked; + } + + @Override + protected int getXRotation(BlockState state) { + return state.get(TransposerBlock.Vertical.UPWARD) ? 270 : 90; + } + + @Override + protected int getYRotation(BlockState state) { + return (state.get(TransposerBlock.Vertical.UPWARD) ? 180 : 0) + + horizontalAngle(state.get(TransposerBlock.Vertical.HORIZONTAL_FACING)); + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + return AssetLookup.forPowered(ctx, prov, "transposer/" + (linked ? "vertical_linked" : "block")) + .apply(state); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureFlexcratePacket.java b/src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureFlexcratePacket.java index 27b6aecc9..b8d52a639 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureFlexcratePacket.java +++ b/src/main/java/com/simibubi/create/modules/logistics/packet/ConfigureFlexcratePacket.java @@ -1,12 +1,12 @@ package com.simibubi.create.modules.logistics.packet; import com.simibubi.create.foundation.packet.TileEntityConfigurationPacket; -import com.simibubi.create.modules.logistics.block.inventories.FlexcrateTileEntity; +import com.simibubi.create.modules.logistics.block.inventories.AdjustableCrateTileEntity; import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; -public class ConfigureFlexcratePacket extends TileEntityConfigurationPacket { +public class ConfigureFlexcratePacket extends TileEntityConfigurationPacket { private int maxItems; @@ -30,7 +30,7 @@ public class ConfigureFlexcratePacket extends TileEntityConfigurationPacket { +public class ConfigureStockswitchPacket extends TileEntityConfigurationPacket { private float offBelow; private float onAbove; @@ -34,7 +34,7 @@ public class ConfigureStockswitchPacket extends TileEntityConfigurationPacket tileEntityTypeIn) { diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java index 83ae9ab95..a7b3f7a04 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicannonTileEntity.java @@ -3,7 +3,6 @@ package com.simibubi.create.modules.schematics.block; import java.util.LinkedList; import java.util.List; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; @@ -152,9 +151,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC if (!world.isBlockPresent(pos.offset(facing))) continue; - if (AllBlocks.CREATIVE_CRATE.get() == world.getBlockState(pos.offset(facing)).getBlock()) { + if (AllBlocksNew.CREATIVE_CRATE.has(world.getBlockState(pos.offset(facing)))) hasCreativeCrate = true; - } TileEntity tileEntity = world.getTileEntity(pos.offset(facing)); if (tileEntity != null) { @@ -415,7 +413,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC ItemRequirement requirement; if (entityMode) { - requirement = ItemRequirement.of(blockReader.getEntities().get(printingEntityIndex)); + requirement = ItemRequirement.of(blockReader.getEntities() + .get(printingEntityIndex)); } else { blockState = blockReader.getBlockState(target); @@ -464,7 +463,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC ItemStack icon = requirement.isEmpty() || requiredItems.isEmpty() ? ItemStack.EMPTY : requiredItems.get(0); if (entityMode) - launchEntity(target, icon, blockReader.getEntities().get(printingEntityIndex)); + launchEntity(target, icon, blockReader.getEntities() + .get(printingEntityIndex)); else if (AllBlocksNew.BELT.has(blockState)) { TileEntity te = blockReader.getTileEntity(currentPos.add(schematicAnchor)); blockState = stripBeltIfNotLast(blockState); @@ -504,7 +504,9 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC } if (!isLastSegment) blockState = (blockState.get(BeltBlock.PART) == Part.MIDDLE) ? Blocks.AIR.getDefaultState() - : AllBlocksNew.SHAFT.getDefaultState().with(ShaftBlock.AXIS, facing.rotateY().getAxis()); + : AllBlocksNew.SHAFT.getDefaultState() + .with(ShaftBlock.AXIS, facing.rotateY() + .getAxis()); return blockState; } @@ -520,7 +522,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC return; } - if (!blueprint.getTag().getBoolean("Deployed")) { + if (!blueprint.getTag() + .getBoolean("Deployed")) { state = State.STOPPED; statusMsg = "schematicNotPlaced"; sendUpdate = true; @@ -529,9 +532,11 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC // Load blocks into reader Template activeTemplate = SchematicItem.loadSchematic(blueprint); - BlockPos anchor = NBTUtil.readBlockPos(blueprint.getTag().getCompound("Anchor")); + BlockPos anchor = NBTUtil.readBlockPos(blueprint.getTag() + .getCompound("Anchor")); - if (activeTemplate.getSize().equals(BlockPos.ZERO)) { + if (activeTemplate.getSize() + .equals(BlockPos.ZERO)) { state = State.STOPPED; statusMsg = "schematicExpired"; inventory.setStackInSlot(0, ItemStack.EMPTY); @@ -556,7 +561,10 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC updateChecklist(); sendUpdate = true; blocksToPlace += blocksPlaced; - currentPos = currentPos != null ? currentPos.west() : blockReader.getBounds().getOrigin().west(); + currentPos = currentPos != null ? currentPos.west() + : blockReader.getBounds() + .getOrigin() + .west(); } protected ItemStack getItemForBlock(BlockState blockState) { @@ -582,7 +590,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC ItemStack stack = iItemHandler.extractItem(slot, 1, false); stack.setDamage(stack.getDamage() + 1); if (stack.getDamage() <= stack.getMaxDamage()) { - if (iItemHandler.getStackInSlot(slot).isEmpty()) + if (iItemHandler.getStackInSlot(slot) + .isEmpty()) iItemHandler.insertItem(slot, stack, false); else ItemHandlerHelper.insertItem(iItemHandler, stack, false); @@ -600,8 +609,10 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC int amountFound = 0; for (IItemHandler iItemHandler : attachedInventories) { - amountFound += ItemHelper.extract(iItemHandler, s -> ItemRequirement.validate(required, s), - ExtractionCountMode.UPTO, required.getCount(), true).getCount(); + amountFound += ItemHelper + .extract(iItemHandler, s -> ItemRequirement.validate(required, s), ExtractionCountMode.UPTO, + required.getCount(), true) + .getCount(); if (amountFound < required.getCount()) continue; @@ -614,8 +625,10 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC if (!simulate && success) { int amountFound = 0; for (IItemHandler iItemHandler : attachedInventories) { - amountFound += ItemHelper.extract(iItemHandler, s -> ItemRequirement.validate(required, s), - ExtractionCountMode.UPTO, required.getCount(), false).getCount(); + amountFound += ItemHelper + .extract(iItemHandler, s -> ItemRequirement.validate(required, s), ExtractionCountMode.UPTO, + required.getCount(), false) + .getCount(); if (amountFound < required.getCount()) continue; break; @@ -636,13 +649,17 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC return; } - currentPos = entities.get(printingEntityIndex).getPosition().subtract(schematicAnchor); + currentPos = entities.get(printingEntityIndex) + .getPosition() + .subtract(schematicAnchor); return; } - BlockPos size = blockReader.getBounds().getSize(); + BlockPos size = blockReader.getBounds() + .getSize(); currentPos = currentPos.offset(Direction.EAST); - BlockPos posInBounds = currentPos.subtract(blockReader.getBounds().getOrigin()); + BlockPos posInBounds = currentPos.subtract(blockReader.getBounds() + .getOrigin()); if (posInBounds.getX() > size.getX()) currentPos = new BlockPos(blockReader.getBounds().x, currentPos.getY(), currentPos.getZ() + 1).west(); @@ -656,20 +673,22 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC finishedPrinting(); return; } - currentPos = entities.get(0).getPosition().subtract(schematicAnchor); + currentPos = entities.get(0) + .getPosition() + .subtract(schematicAnchor); } } public void finishedPrinting() { inventory.setStackInSlot(0, ItemStack.EMPTY); - inventory.setStackInSlot(1, - new ItemStack(AllItems.EMPTY_BLUEPRINT.get(), inventory.getStackInSlot(1).getCount() + 1)); + inventory.setStackInSlot(1, new ItemStack(AllItems.EMPTY_BLUEPRINT.get(), inventory.getStackInSlot(1) + .getCount() + 1)); state = State.STOPPED; statusMsg = "finished"; resetPrinter(); target = getPos().add(1, 0, 0); world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), AllSoundEvents.SCHEMATICANNON_FINISH.get(), - SoundCategory.BLOCKS, 1, .7f); + SoundCategory.BLOCKS, 1, .7f); sendUpdate = true; } @@ -692,7 +711,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC if (!world.isBlockPresent(pos)) return false; - if (!world.getWorldBorder().contains(pos)) + if (!world.getWorldBorder() + .contains(pos)) return false; if (toReplace == state) return false; @@ -710,8 +730,9 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC return true; if (replaceMode == 2 && !placingAir) return true; - if (replaceMode == 1 && (state.isNormalCube(blockReader, pos.subtract(schematicAnchor)) - || !toReplace.isNormalCube(world, pos)) && !placingAir) + if (replaceMode == 1 + && (state.isNormalCube(blockReader, pos.subtract(schematicAnchor)) || !toReplace.isNormalCube(world, pos)) + && !placingAir) return true; if (replaceMode == 0 && !toReplace.isNormalCube(world, pos) && !placingAir) return true; @@ -728,7 +749,7 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC // Block doesnt need to be placed twice (Doors, beds, double plants) if (state.has(BlockStateProperties.DOUBLE_BLOCK_HALF) - && state.get(BlockStateProperties.DOUBLE_BLOCK_HALF) == DoubleBlockHalf.UPPER) + && state.get(BlockStateProperties.DOUBLE_BLOCK_HALF) == DoubleBlockHalf.UPPER) return true; if (state.has(BlockStateProperties.BED_PART) && state.get(BlockStateProperties.BED_PART) == BedPart.HEAD) return true; @@ -751,10 +772,12 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC return; if (1 - fuelLevel + 1 / 128f < getFuelAddedByGunPowder()) return; - if (inventory.getStackInSlot(4).isEmpty()) + if (inventory.getStackInSlot(4) + .isEmpty()) return; - inventory.getStackInSlot(4).shrink(1); + inventory.getStackInSlot(4) + .shrink(1); fuelLevel += getFuelAddedByGunPowder(); sendUpdate = true; } @@ -769,7 +792,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC ItemStack blueprint = inventory.getStackInSlot(0); ItemStack paper = inventory.extractItem(BookInput, 1, true); - boolean outputFull = inventory.getStackInSlot(BookOutput).getCount() == inventory.getSlotLimit(BookOutput); + boolean outputFull = inventory.getStackInSlot(BookOutput) + .getCount() == inventory.getSlotLimit(BookOutput); if (paper.isEmpty() || outputFull) { if (bookPrintingProgress != 0) @@ -794,7 +818,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC dontUpdateChecklist = true; inventory.extractItem(BookInput, 1, false); ItemStack stack = checklist.createItem(); - stack.setCount(inventory.getStackInSlot(BookOutput).getCount() + 1); + stack.setCount(inventory.getStackInSlot(BookOutput) + .getCount() + 1); inventory.setStackInSlot(BookOutput, stack); sendUpdate = true; return; @@ -826,7 +851,7 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC public void playFiringSound() { world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), AllSoundEvents.SCHEMATICANNON_LAUNCH_BLOCK.get(), - SoundCategory.BLOCKS, .1f, 1.1f); + SoundCategory.BLOCKS, .1f, 1.1f); } public void sendToContainer(PacketBuffer buffer) { @@ -841,7 +866,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC @Override public ITextComponent getDisplayName() { - return new StringTextComponent(getType().getRegistryName().toString()); + return new StringTextComponent(getType().getRegistryName() + .toString()); } public void updateChecklist() { @@ -881,7 +907,8 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC for (IItemHandler inventory : attachedInventories) { for (int slot = 0; slot < inventory.getSlots(); slot++) { ItemStack stackInSlot = inventory.getStackInSlot(slot); - if (inventory.extractItem(slot, 1, true).isEmpty()) + if (inventory.extractItem(slot, 1, true) + .isEmpty()) continue; checklist.collect(stackInSlot); } @@ -890,8 +917,7 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC } @Override - public void addBehaviours(List behaviours) { - } + public void addBehaviours(List behaviours) {} @Override public void lazyTick() { diff --git a/src/main/resources/assets/create/blockstates/analog_lever.json b/src/main/resources/assets/create/blockstates/analog_lever.json deleted file mode 100644 index a1c828734..000000000 --- a/src/main/resources/assets/create/blockstates/analog_lever.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=north": { "model": "create:block/analog_lever/body", "x": 180, "y": 180 }, - "face=ceiling,facing=east": { "model": "create:block/analog_lever/body", "x": 180, "y": 270 }, - "face=ceiling,facing=south": { "model": "create:block/analog_lever/body", "x": 180}, - "face=ceiling,facing=west": { "model": "create:block/analog_lever/body", "x": 180, "y": 90 }, - "face=floor,facing=north": { "model": "create:block/analog_lever/body" }, - "face=floor,facing=east": { "model": "create:block/analog_lever/body", "y": 90 }, - "face=floor,facing=south": { "model": "create:block/analog_lever/body", "y": 180 }, - "face=floor,facing=west": { "model": "create:block/analog_lever/body", "y": 270 }, - "face=wall,facing=north": { "model": "create:block/analog_lever/body", "x": 90 }, - "face=wall,facing=east": { "model": "create:block/analog_lever/body", "x": 90, "y": 90 }, - "face=wall,facing=south": { "model": "create:block/analog_lever/body", "x": 90, "y": 180 }, - "face=wall,facing=west": { "model": "create:block/analog_lever/body", "x": 90, "y": 270 }, - "face=ceiling,facing=north": { "model": "create:block/analog_lever/body", "x": 180, "y": 180 }, - "face=ceiling,facing=east": { "model": "create:block/analog_lever/body", "x": 180, "y": 270 }, - "face=ceiling,facing=south": { "model": "create:block/analog_lever/body", "x": 180}, - "face=ceiling,facing=west": { "model": "create:block/analog_lever/body", "x": 180, "y": 90 }, - "face=floor,facing=north": { "model": "create:block/analog_lever/body" }, - "face=floor,facing=east": { "model": "create:block/analog_lever/body", "y": 90 }, - "face=floor,facing=south": { "model": "create:block/analog_lever/body", "y": 180 }, - "face=floor,facing=west": { "model": "create:block/analog_lever/body", "y": 270 }, - "face=wall,facing=north": { "model": "create:block/analog_lever/body", "x": 90 }, - "face=wall,facing=east": { "model": "create:block/analog_lever/body", "x": 90, "y": 90 }, - "face=wall,facing=south": { "model": "create:block/analog_lever/body", "x": 90, "y": 180 }, - "face=wall,facing=west": { "model": "create:block/analog_lever/body", "x": 90, "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/belt_funnel.json b/src/main/resources/assets/create/blockstates/belt_funnel.json deleted file mode 100644 index 25d3e3483..000000000 --- a/src/main/resources/assets/create/blockstates/belt_funnel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "belt=true,facing=south": { "model": "create:block/funnel/horizontal_belt", "y": 180 }, - "belt=true,facing=east": { "model": "create:block/funnel/horizontal_belt", "y": 90 }, - "belt=true,facing=north": { "model": "create:block/funnel/horizontal_belt" }, - "belt=true,facing=west": { "model": "create:block/funnel/horizontal_belt", "y": 270 }, - "belt=false,facing=south": { "model": "create:block/funnel/horizontal_belt", "y": 180 }, - "belt=false,facing=east": { "model": "create:block/funnel/horizontal_belt", "y": 90 }, - "belt=false,facing=north": { "model": "create:block/funnel/horizontal_belt" }, - "belt=false,facing=west": { "model": "create:block/funnel/horizontal_belt", "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/belt_tunnel.json b/src/main/resources/assets/create/blockstates/belt_tunnel.json deleted file mode 100644 index 46dc42caf..000000000 --- a/src/main/resources/assets/create/blockstates/belt_tunnel.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "shape=straight,axis=x": { "model": "create:block/belt_tunnel/straight" }, - "shape=window,axis=x": { "model": "create:block/belt_tunnel/straight_windowed" }, - "shape=halfshade,axis=x": { "model": "create:block/belt_tunnel/straight_halfshade" }, - "shape=fullshade,axis=x": { "model": "create:block/belt_tunnel/straight_fullshade" }, - "shape=t_left,axis=x": { "model": "create:block/belt_tunnel/t_left" }, - "shape=t_right,axis=x": { "model": "create:block/belt_tunnel/t_right" }, - "shape=cross,axis=x": { "model": "create:block/belt_tunnel/cross" }, - - "shape=straight,axis=z": { "model": "create:block/belt_tunnel/straight", "y": 90 }, - "shape=window,axis=z": { "model": "create:block/belt_tunnel/straight_windowed", "y": 90 }, - "shape=halfshade,axis=z": { "model": "create:block/belt_tunnel/straight_halfshade", "y": 90 }, - "shape=fullshade,axis=z": { "model": "create:block/belt_tunnel/straight_fullshade", "y": 90 }, - "shape=t_left,axis=z": { "model": "create:block/belt_tunnel/t_left", "y": 90 }, - "shape=t_right,axis=z": { "model": "create:block/belt_tunnel/t_right", "y": 90 }, - "shape=cross,axis=z": { "model": "create:block/belt_tunnel/cross", "y": 90 } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/contact.json b/src/main/resources/assets/create/blockstates/contact.json deleted file mode 100644 index d44b78d45..000000000 --- a/src/main/resources/assets/create/blockstates/contact.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "powered=true,facing=north": { "model": "create:block/contact_powered", "x": 90 }, - "powered=true,facing=east": { "model": "create:block/contact_powered", "x": 90, "y": 90 }, - "powered=true,facing=south": { "model": "create:block/contact_powered", "x": 90, "y": 180 }, - "powered=true,facing=west": { "model": "create:block/contact_powered", "x": 90, "y": 270 }, - "powered=true,facing=up": { "model": "create:block/contact_powered" }, - "powered=true,facing=down": { "model": "create:block/contact_powered", "x": 180 }, - "powered=false,facing=north": { "model": "create:block/contact", "x": 90 }, - "powered=false,facing=east": { "model": "create:block/contact", "x": 90, "y": 90 }, - "powered=false,facing=south": { "model": "create:block/contact", "x": 90, "y": 180 }, - "powered=false,facing=west": { "model": "create:block/contact", "x": 90, "y": 270 }, - "powered=false,facing=up": { "model": "create:block/contact" }, - "powered=false,facing=down": { "model": "create:block/contact", "x": 180 } - } -} diff --git a/src/main/resources/assets/create/blockstates/creative_crate.json b/src/main/resources/assets/create/blockstates/creative_crate.json deleted file mode 100644 index e8c3b0338..000000000 --- a/src/main/resources/assets/create/blockstates/creative_crate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "double=true,facing=up": { "model": "create:block/crate/creative/double_bottom" }, - "double=true,facing=down": { "model": "create:block/crate/creative/double_top" }, - "double=true,facing=west": { "model": "create:block/crate/creative/double_left", "y": 90 }, - "double=true,facing=east": { "model": "create:block/crate/creative/double_right", "y": 90 }, - "double=true,facing=north": { "model": "create:block/crate/creative/double_right" }, - "double=true,facing=south": { "model": "create:block/crate/creative/double_left" }, - - "double=false,facing=up": { "model": "create:block/crate/creative/single" }, - "double=false,facing=down": { "model": "create:block/crate/creative/single" }, - "double=false,facing=west": { "model": "create:block/crate/creative/single" }, - "double=false,facing=east": { "model": "create:block/crate/creative/single" }, - "double=false,facing=north": { "model": "create:block/crate/creative/single" }, - "double=false,facing=south": { "model": "create:block/crate/creative/single" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/entity_detector.json b/src/main/resources/assets/create/blockstates/entity_detector.json deleted file mode 100644 index 50543c629..000000000 --- a/src/main/resources/assets/create/blockstates/entity_detector.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "variants": { - "mode=detect,powered=false,belt=false,facing=south": { "model": "create:block/belt_observer/detect", "y": 0 }, - "mode=detect,powered=false,belt=false,facing=east": { "model": "create:block/belt_observer/detect", "y": 270 }, - "mode=detect,powered=false,belt=false,facing=north": { "model": "create:block/belt_observer/detect", "y": 180 }, - "mode=detect,powered=false,belt=false,facing=west": { "model": "create:block/belt_observer/detect", "y": 90 }, - - "mode=detect,powered=true,belt=false,facing=south": { "model": "create:block/belt_observer/detect_powered", "y": 0 }, - "mode=detect,powered=true,belt=false,facing=east": { "model": "create:block/belt_observer/detect_powered", "y": 270 }, - "mode=detect,powered=true,belt=false,facing=north": { "model": "create:block/belt_observer/detect_powered", "y": 180 }, - "mode=detect,powered=true,belt=false,facing=west": { "model": "create:block/belt_observer/detect_powered", "y": 90 }, - - "mode=detect,powered=false,belt=true,facing=south": { "model": "create:block/belt_observer/detect_belt", "y": 0 }, - "mode=detect,powered=false,belt=true,facing=east": { "model": "create:block/belt_observer/detect_belt", "y": 270 }, - "mode=detect,powered=false,belt=true,facing=north": { "model": "create:block/belt_observer/detect_belt", "y": 180 }, - "mode=detect,powered=false,belt=true,facing=west": { "model": "create:block/belt_observer/detect_belt", "y": 90 }, - - "mode=detect,powered=true,belt=true,facing=south": { "model": "create:block/belt_observer/detect_belt_powered", "y": 0 }, - "mode=detect,powered=true,belt=true,facing=east": { "model": "create:block/belt_observer/detect_belt_powered", "y": 270 }, - "mode=detect,powered=true,belt=true,facing=north": { "model": "create:block/belt_observer/detect_belt_powered", "y": 180 }, - "mode=detect,powered=true,belt=true,facing=west": { "model": "create:block/belt_observer/detect_belt_powered", "y": 90 }, - - - "mode=pulse,powered=false,belt=false,facing=south": { "model": "create:block/belt_observer/pulse", "y": 0 }, - "mode=pulse,powered=false,belt=false,facing=east": { "model": "create:block/belt_observer/pulse", "y": 270 }, - "mode=pulse,powered=false,belt=false,facing=north": { "model": "create:block/belt_observer/pulse", "y": 180 }, - "mode=pulse,powered=false,belt=false,facing=west": { "model": "create:block/belt_observer/pulse", "y": 90 }, - - "mode=pulse,powered=true,belt=false,facing=south": { "model": "create:block/belt_observer/pulse_powered", "y": 0 }, - "mode=pulse,powered=true,belt=false,facing=east": { "model": "create:block/belt_observer/pulse_powered", "y": 270 }, - "mode=pulse,powered=true,belt=false,facing=north": { "model": "create:block/belt_observer/pulse_powered", "y": 180 }, - "mode=pulse,powered=true,belt=false,facing=west": { "model": "create:block/belt_observer/pulse_powered", "y": 90 }, - - "mode=pulse,powered=false,belt=true,facing=south": { "model": "create:block/belt_observer/pulse_belt", "y": 0 }, - "mode=pulse,powered=false,belt=true,facing=east": { "model": "create:block/belt_observer/pulse_belt", "y": 270 }, - "mode=pulse,powered=false,belt=true,facing=north": { "model": "create:block/belt_observer/pulse_belt", "y": 180 }, - "mode=pulse,powered=false,belt=true,facing=west": { "model": "create:block/belt_observer/pulse_belt", "y": 90 }, - - "mode=pulse,powered=true,belt=true,facing=south": { "model": "create:block/belt_observer/pulse_belt_powered", "y": 0 }, - "mode=pulse,powered=true,belt=true,facing=east": { "model": "create:block/belt_observer/pulse_belt_powered", "y": 270 }, - "mode=pulse,powered=true,belt=true,facing=north": { "model": "create:block/belt_observer/pulse_belt_powered", "y": 180 }, - "mode=pulse,powered=true,belt=true,facing=west": { "model": "create:block/belt_observer/pulse_belt_powered", "y": 90 }, - - - "mode=eject,powered=false,belt=false,facing=south": { "model": "create:block/belt_observer/eject", "y": 0 }, - "mode=eject,powered=false,belt=false,facing=east": { "model": "create:block/belt_observer/eject", "y": 270 }, - "mode=eject,powered=false,belt=false,facing=north": { "model": "create:block/belt_observer/eject", "y": 180 }, - "mode=eject,powered=false,belt=false,facing=west": { "model": "create:block/belt_observer/eject", "y": 90 }, - - "mode=eject,powered=true,belt=false,facing=south": { "model": "create:block/belt_observer/eject_powered", "y": 0 }, - "mode=eject,powered=true,belt=false,facing=east": { "model": "create:block/belt_observer/eject_powered", "y": 270 }, - "mode=eject,powered=true,belt=false,facing=north": { "model": "create:block/belt_observer/eject_powered", "y": 180 }, - "mode=eject,powered=true,belt=false,facing=west": { "model": "create:block/belt_observer/eject_powered", "y": 90 }, - - "mode=eject,powered=false,belt=true,facing=south": { "model": "create:block/belt_observer/eject_belt", "y": 0 }, - "mode=eject,powered=false,belt=true,facing=east": { "model": "create:block/belt_observer/eject_belt", "y": 270 }, - "mode=eject,powered=false,belt=true,facing=north": { "model": "create:block/belt_observer/eject_belt", "y": 180 }, - "mode=eject,powered=false,belt=true,facing=west": { "model": "create:block/belt_observer/eject_belt", "y": 90 }, - - "mode=eject,powered=true,belt=true,facing=south": { "model": "create:block/belt_observer/eject_belt_powered", "y": 0 }, - "mode=eject,powered=true,belt=true,facing=east": { "model": "create:block/belt_observer/eject_belt_powered", "y": 270 }, - "mode=eject,powered=true,belt=true,facing=north": { "model": "create:block/belt_observer/eject_belt_powered", "y": 180 }, - "mode=eject,powered=true,belt=true,facing=west": { "model": "create:block/belt_observer/eject_belt_powered", "y": 90 }, - - - "mode=split,powered=false,belt=false,facing=south": { "model": "create:block/belt_observer/split", "y": 0 }, - "mode=split,powered=false,belt=false,facing=east": { "model": "create:block/belt_observer/split", "y": 270 }, - "mode=split,powered=false,belt=false,facing=north": { "model": "create:block/belt_observer/split", "y": 180 }, - "mode=split,powered=false,belt=false,facing=west": { "model": "create:block/belt_observer/split", "y": 90 }, - - "mode=split,powered=true,belt=false,facing=south": { "model": "create:block/belt_observer/split_powered", "y": 0 }, - "mode=split,powered=true,belt=false,facing=east": { "model": "create:block/belt_observer/split_powered", "y": 270 }, - "mode=split,powered=true,belt=false,facing=north": { "model": "create:block/belt_observer/split_powered", "y": 180 }, - "mode=split,powered=true,belt=false,facing=west": { "model": "create:block/belt_observer/split_powered", "y": 90 }, - - "mode=split,powered=false,belt=true,facing=south": { "model": "create:block/belt_observer/split_belt", "y": 0 }, - "mode=split,powered=false,belt=true,facing=east": { "model": "create:block/belt_observer/split_belt", "y": 270 }, - "mode=split,powered=false,belt=true,facing=north": { "model": "create:block/belt_observer/split_belt", "y": 180 }, - "mode=split,powered=false,belt=true,facing=west": { "model": "create:block/belt_observer/split_belt", "y": 90 }, - - "mode=split,powered=true,belt=true,facing=south": { "model": "create:block/belt_observer/split_belt_powered", "y": 0 }, - "mode=split,powered=true,belt=true,facing=east": { "model": "create:block/belt_observer/split_belt_powered", "y": 270 }, - "mode=split,powered=true,belt=true,facing=north": { "model": "create:block/belt_observer/split_belt_powered", "y": 180 }, - "mode=split,powered=true,belt=true,facing=west": { "model": "create:block/belt_observer/split_belt_powered", "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/extractor.json b/src/main/resources/assets/create/blockstates/extractor.json deleted file mode 100644 index 380fa0777..000000000 --- a/src/main/resources/assets/create/blockstates/extractor.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "powered=true,facing=north": { "model": "create:block/extractor/horizontal_powered", "y": 180 }, - "powered=true,facing=east": { "model": "create:block/extractor/horizontal_powered", "y": 90 }, - "powered=true,facing=south": { "model": "create:block/extractor/horizontal_powered", "y": 0 }, - "powered=true,facing=west": { "model": "create:block/extractor/horizontal_powered", "y": 270 }, - "powered=false,facing=north": { "model": "create:block/extractor/horizontal", "y": 180 }, - "powered=false,facing=east": { "model": "create:block/extractor/horizontal", "y": 90 }, - "powered=false,facing=south": { "model": "create:block/extractor/horizontal", "y": 0 }, - "powered=false,facing=west": { "model": "create:block/extractor/horizontal", "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/filtered_crate.json b/src/main/resources/assets/create/blockstates/filtered_crate.json deleted file mode 100644 index 4a297e253..000000000 --- a/src/main/resources/assets/create/blockstates/filtered_crate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "double=true,facing=up": { "model": "create:block/crate/copper/double_bottom" }, - "double=true,facing=down": { "model": "create:block/crate/copper/double_top" }, - "double=true,facing=west": { "model": "create:block/crate/copper/double_left", "y": 90 }, - "double=true,facing=east": { "model": "create:block/crate/copper/double_right", "y": 90 }, - "double=true,facing=north": { "model": "create:block/crate/copper/double_right" }, - "double=true,facing=south": { "model": "create:block/crate/copper/double_left" }, - - "double=false,facing=up": { "model": "create:block/crate/copper/single" }, - "double=false,facing=down": { "model": "create:block/crate/copper/single" }, - "double=false,facing=west": { "model": "create:block/crate/copper/single" }, - "double=false,facing=east": { "model": "create:block/crate/copper/single" }, - "double=false,facing=north": { "model": "create:block/crate/copper/single" }, - "double=false,facing=south": { "model": "create:block/crate/copper/single" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/flexcrate.json b/src/main/resources/assets/create/blockstates/flexcrate.json deleted file mode 100644 index 887558a53..000000000 --- a/src/main/resources/assets/create/blockstates/flexcrate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "double=true,facing=up": { "model": "create:block/crate/brass/double_bottom" }, - "double=true,facing=down": { "model": "create:block/crate/brass/double_top" }, - "double=true,facing=west": { "model": "create:block/crate/brass/double_left", "y": 90 }, - "double=true,facing=east": { "model": "create:block/crate/brass/double_right", "y": 90 }, - "double=true,facing=north": { "model": "create:block/crate/brass/double_right" }, - "double=true,facing=south": { "model": "create:block/crate/brass/double_left" }, - - "double=false,facing=up": { "model": "create:block/crate/brass/single" }, - "double=false,facing=down": { "model": "create:block/crate/brass/single" }, - "double=false,facing=west": { "model": "create:block/crate/brass/single" }, - "double=false,facing=east": { "model": "create:block/crate/brass/single" }, - "double=false,facing=north": { "model": "create:block/crate/brass/single" }, - "double=false,facing=south": { "model": "create:block/crate/brass/single" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/flexpeater.json b/src/main/resources/assets/create/blockstates/flexpeater.json deleted file mode 100644 index 6ac61f5f0..000000000 --- a/src/main/resources/assets/create/blockstates/flexpeater.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "variants": { - "powered=false,powering=false,facing=north": { "model": "create:block/repeaters/flexpeater", "y": 180 }, - "powered=false,powering=false,facing=east": { "model": "create:block/repeaters/flexpeater", "y": 270 }, - "powered=false,powering=false,facing=south": { "model": "create:block/repeaters/flexpeater", "y": 0 }, - "powered=false,powering=false,facing=west": { "model": "create:block/repeaters/flexpeater", "y": 90 }, - - "powered=true,powering=false,facing=north": { "model": "create:block/repeaters/flexpeater_powered", "y": 180 }, - "powered=true,powering=false,facing=east": { "model": "create:block/repeaters/flexpeater_powered", "y": 270 }, - "powered=true,powering=false,facing=south": { "model": "create:block/repeaters/flexpeater_powered", "y": 0 }, - "powered=true,powering=false,facing=west": { "model": "create:block/repeaters/flexpeater_powered", "y": 90 }, - - "powered=false,powering=true,facing=north": { "model": "create:block/repeaters/flexpeater_powering", "y": 180 }, - "powered=false,powering=true,facing=east": { "model": "create:block/repeaters/flexpeater_powering", "y": 270 }, - "powered=false,powering=true,facing=south": { "model": "create:block/repeaters/flexpeater_powering", "y": 0 }, - "powered=false,powering=true,facing=west": { "model": "create:block/repeaters/flexpeater_powering", "y": 90 }, - - "powered=true,powering=true,facing=north": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 180 }, - "powered=true,powering=true,facing=east": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 270 }, - "powered=true,powering=true,facing=south": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 0 }, - "powered=true,powering=true,facing=west": { "model": "create:block/repeaters/flexpeater_powered_powering", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/flexpulsepeater.json b/src/main/resources/assets/create/blockstates/flexpulsepeater.json deleted file mode 100644 index fb2a1196b..000000000 --- a/src/main/resources/assets/create/blockstates/flexpulsepeater.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "variants": { - "powered=false,powering=false,facing=north": { "model": "create:block/repeaters/flexpulsepeater", "y": 180 }, - "powered=false,powering=false,facing=east": { "model": "create:block/repeaters/flexpulsepeater", "y": 270 }, - "powered=false,powering=false,facing=south": { "model": "create:block/repeaters/flexpulsepeater", "y": 0 }, - "powered=false,powering=false,facing=west": { "model": "create:block/repeaters/flexpulsepeater", "y": 90 }, - - "powered=true,powering=false,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 180 }, - "powered=true,powering=false,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 270 }, - "powered=true,powering=false,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 0 }, - "powered=true,powering=false,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powered", "y": 90 }, - - "powered=false,powering=true,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 180 }, - "powered=false,powering=true,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 270 }, - "powered=false,powering=true,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 0 }, - "powered=false,powering=true,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powering", "y": 90 }, - - "powered=true,powering=true,facing=north": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 180 }, - "powered=true,powering=true,facing=east": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 270 }, - "powered=true,powering=true,facing=south": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 0 }, - "powered=true,powering=true,facing=west": { "model": "create:block/repeaters/flexpulsepeater_powered_powering", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/linked_extractor.json b/src/main/resources/assets/create/blockstates/linked_extractor.json deleted file mode 100644 index 639fd051d..000000000 --- a/src/main/resources/assets/create/blockstates/linked_extractor.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "powered=true,facing=south": { "model": "create:block/extractor/horizontal_wireless_powered", "y": 180 }, - "powered=true,facing=east": { "model": "create:block/extractor/horizontal_wireless_powered", "y": 90 }, - "powered=true,facing=north": { "model": "create:block/extractor/horizontal_wireless_powered", "y": 0 }, - "powered=true,facing=west": { "model": "create:block/extractor/horizontal_wireless_powered", "y": 270 }, - - "powered=false,facing=south": { "model": "create:block/extractor/horizontal_wireless", "y": 180 }, - "powered=false,facing=east": { "model": "create:block/extractor/horizontal_wireless", "y": 90 }, - "powered=false,facing=north": { "model": "create:block/extractor/horizontal_wireless", "y": 0 }, - "powered=false,facing=west": { "model": "create:block/extractor/horizontal_wireless", "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/linked_transposer.json b/src/main/resources/assets/create/blockstates/linked_transposer.json deleted file mode 100644 index 7a8cd68f3..000000000 --- a/src/main/resources/assets/create/blockstates/linked_transposer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "powered=true,facing=north": { "model": "create:block/transposer/linked_powered", "y": 0 }, - "powered=true,facing=south": { "model": "create:block/transposer/linked_powered", "y": 180 }, - "powered=true,facing=west": { "model": "create:block/transposer/linked_powered", "y": 270 }, - "powered=true,facing=east": { "model": "create:block/transposer/linked_powered", "y": 90 }, - "powered=false,facing=north": { "model": "create:block/transposer/linked", "y": 0 }, - "powered=false,facing=south": { "model": "create:block/transposer/linked", "y": 180 }, - "powered=false,facing=west": { "model": "create:block/transposer/linked", "y": 270 }, - "powered=false,facing=east": { "model": "create:block/transposer/linked", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/pulse_repeater.json b/src/main/resources/assets/create/blockstates/pulse_repeater.json deleted file mode 100644 index 4112d7912..000000000 --- a/src/main/resources/assets/create/blockstates/pulse_repeater.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "variants": { - "powered=false,pulsing=false,facing=south": { "model": "create:block/pulse_repeater" }, - "powered=false,pulsing=false,facing=north": { "model": "create:block/pulse_repeater", "y": 180 }, - "powered=false,pulsing=false,facing=east": { "model": "create:block/pulse_repeater", "y": 270 }, - "powered=false,pulsing=false,facing=west": { "model": "create:block/pulse_repeater", "y": 90 }, - - "powered=true,pulsing=false,facing=south": { "model": "create:block/pulse_repeater_powered" }, - "powered=true,pulsing=false,facing=north": { "model": "create:block/pulse_repeater_powered", "y": 180 }, - "powered=true,pulsing=false,facing=east": { "model": "create:block/pulse_repeater_powered", "y": 270 }, - "powered=true,pulsing=false,facing=west": { "model": "create:block/pulse_repeater_powered", "y": 90 }, - - "powered=false,pulsing=true,facing=south": { "model": "create:block/pulse_repeater_pulsing" }, - "powered=false,pulsing=true,facing=north": { "model": "create:block/pulse_repeater_pulsing", "y": 180 }, - "powered=false,pulsing=true,facing=east": { "model": "create:block/pulse_repeater_pulsing", "y": 270 }, - "powered=false,pulsing=true,facing=west": { "model": "create:block/pulse_repeater_pulsing", "y": 90 }, - - "powered=true,pulsing=true,facing=south": { "model": "create:block/pulse_repeater_pulsing" }, - "powered=true,pulsing=true,facing=north": { "model": "create:block/pulse_repeater_pulsing", "y": 180 }, - "powered=true,pulsing=true,facing=east": { "model": "create:block/pulse_repeater_pulsing", "y": 270 }, - "powered=true,pulsing=true,facing=west": { "model": "create:block/pulse_repeater_pulsing", "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/redstone_bridge.json b/src/main/resources/assets/create/blockstates/redstone_bridge.json deleted file mode 100644 index 08162ed76..000000000 --- a/src/main/resources/assets/create/blockstates/redstone_bridge.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variants": { - "receiver=false,powered=false,facing=up": { "model": "create:block/redstone_bridge", "y": 180 }, - "receiver=false,powered=false,facing=down": { "model": "create:block/redstone_bridge", "x": 180, "y": 180 }, - "receiver=false,powered=false,facing=south": { "model": "create:block/redstone_bridge_side", "x": 270 }, - "receiver=false,powered=false,facing=north": { "model": "create:block/redstone_bridge_side", "x": 270 , "y": 180 }, - "receiver=false,powered=false,facing=west": { "model": "create:block/redstone_bridge_side", "x": 270 , "y": 90 }, - "receiver=false,powered=false,facing=east": { "model": "create:block/redstone_bridge_side", "x": 270 , "y": 270 }, - - "receiver=false,powered=true,facing=up": { "model": "create:block/redstone_bridge_powered", "y": 180 }, - "receiver=false,powered=true,facing=down": { "model": "create:block/redstone_bridge_powered", "x": 180, "y": 180 }, - "receiver=false,powered=true,facing=south": { "model": "create:block/redstone_bridge_side_powered", "x": 270 }, - "receiver=false,powered=true,facing=north": { "model": "create:block/redstone_bridge_side_powered", "x": 270 , "y": 180 }, - "receiver=false,powered=true,facing=west": { "model": "create:block/redstone_bridge_side_powered", "x": 270 , "y": 90 }, - "receiver=false,powered=true,facing=east": { "model": "create:block/redstone_bridge_side_powered", "x": 270 , "y": 270 }, - - "receiver=true,powered=false,facing=up": { "model": "create:block/redstone_bridge_receiver", "y": 180 }, - "receiver=true,powered=false,facing=down": { "model": "create:block/redstone_bridge_receiver", "x": 180, "y": 180 }, - "receiver=true,powered=false,facing=south": { "model": "create:block/redstone_bridge_receiver_side", "x": 270 }, - "receiver=true,powered=false,facing=north": { "model": "create:block/redstone_bridge_receiver_side", "x": 270 , "y": 180 }, - "receiver=true,powered=false,facing=west": { "model": "create:block/redstone_bridge_receiver_side", "x": 270 , "y": 90 }, - "receiver=true,powered=false,facing=east": { "model": "create:block/redstone_bridge_receiver_side", "x": 270 , "y": 270 }, - - "receiver=true,powered=true,facing=up": { "model": "create:block/redstone_bridge_receiver_powered", "y": 180 }, - "receiver=true,powered=true,facing=down": { "model": "create:block/redstone_bridge_receiver_powered", "x": 180, "y": 180 }, - "receiver=true,powered=true,facing=south": { "model": "create:block/redstone_bridge_receiver_side_powered", "x": 270 }, - "receiver=true,powered=true,facing=north": { "model": "create:block/redstone_bridge_receiver_side_powered", "x": 270 , "y": 180 }, - "receiver=true,powered=true,facing=west": { "model": "create:block/redstone_bridge_receiver_side_powered", "x": 270 , "y": 90 }, - "receiver=true,powered=true,facing=east": { "model": "create:block/redstone_bridge_receiver_side_powered", "x": 270 , "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/redstone_latch.json b/src/main/resources/assets/create/blockstates/redstone_latch.json deleted file mode 100644 index d261d4611..000000000 --- a/src/main/resources/assets/create/blockstates/redstone_latch.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "powering=true,facing=north": { "model": "create:block/repeaters/redstone_latch_powered", "y": 180 }, - "powering=true,facing=east": { "model": "create:block/repeaters/redstone_latch_powered", "y": 270 }, - "powering=true,facing=south": { "model": "create:block/repeaters/redstone_latch_powered", "y": 0 }, - "powering=true,facing=west": { "model": "create:block/repeaters/redstone_latch_powered", "y": 90 }, - "powering=false,facing=north": { "model": "create:block/repeaters/redstone_latch", "y": 180 }, - "powering=false,facing=east": { "model": "create:block/repeaters/redstone_latch", "y": 270 }, - "powering=false,facing=south": { "model": "create:block/repeaters/redstone_latch", "y": 0 }, - "powering=false,facing=west": { "model": "create:block/repeaters/redstone_latch", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/stockswitch.json b/src/main/resources/assets/create/blockstates/stockswitch.json deleted file mode 100644 index 4d5967e5a..000000000 --- a/src/main/resources/assets/create/blockstates/stockswitch.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "variants": { - "indicator=0,facing=south": { "model": "create:block/stockpile_switch", "y": 270 }, - "indicator=1,facing=south": { "model": "create:block/stockpile_switch_1", "y": 270 }, - "indicator=2,facing=south": { "model": "create:block/stockpile_switch_2", "y": 270 }, - "indicator=3,facing=south": { "model": "create:block/stockpile_switch_3", "y": 270 }, - "indicator=4,facing=south": { "model": "create:block/stockpile_switch_4", "y": 270 }, - "indicator=5,facing=south": { "model": "create:block/stockpile_switch_5", "y": 270 }, - "indicator=6,facing=south": { "model": "create:block/stockpile_switch_6", "y": 270 }, - "indicator=0,facing=east": { "model": "create:block/stockpile_switch", "y": 180 }, - "indicator=1,facing=east": { "model": "create:block/stockpile_switch_1", "y": 180 }, - "indicator=2,facing=east": { "model": "create:block/stockpile_switch_2", "y": 180 }, - "indicator=3,facing=east": { "model": "create:block/stockpile_switch_3", "y": 180 }, - "indicator=4,facing=east": { "model": "create:block/stockpile_switch_4", "y": 180 }, - "indicator=5,facing=east": { "model": "create:block/stockpile_switch_5", "y": 180 }, - "indicator=6,facing=east": { "model": "create:block/stockpile_switch_6", "y": 180 }, - "indicator=0,facing=north": { "model": "create:block/stockpile_switch", "y": 90 }, - "indicator=1,facing=north": { "model": "create:block/stockpile_switch_1", "y": 90 }, - "indicator=2,facing=north": { "model": "create:block/stockpile_switch_2", "y": 90 }, - "indicator=3,facing=north": { "model": "create:block/stockpile_switch_3", "y": 90 }, - "indicator=4,facing=north": { "model": "create:block/stockpile_switch_4", "y": 90 }, - "indicator=5,facing=north": { "model": "create:block/stockpile_switch_5", "y": 90 }, - "indicator=6,facing=north": { "model": "create:block/stockpile_switch_6", "y": 90 }, - "indicator=0,facing=west": { "model": "create:block/stockpile_switch", "y": 0 }, - "indicator=1,facing=west": { "model": "create:block/stockpile_switch_1", "y": 0 }, - "indicator=2,facing=west": { "model": "create:block/stockpile_switch_2", "y": 0 }, - "indicator=3,facing=west": { "model": "create:block/stockpile_switch_3", "y": 0 }, - "indicator=4,facing=west": { "model": "create:block/stockpile_switch_4", "y": 0 }, - "indicator=5,facing=west": { "model": "create:block/stockpile_switch_5", "y": 0 }, - "indicator=6,facing=west": { "model": "create:block/stockpile_switch_6", "y": 0 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/toggle_latch.json b/src/main/resources/assets/create/blockstates/toggle_latch.json deleted file mode 100644 index b7c7670c3..000000000 --- a/src/main/resources/assets/create/blockstates/toggle_latch.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "variants": { - "powered=false,powering=false,facing=north": { "model": "create:block/repeaters/toggle_latch", "y": 180 }, - "powered=false,powering=false,facing=east": { "model": "create:block/repeaters/toggle_latch", "y": 270 }, - "powered=false,powering=false,facing=south": { "model": "create:block/repeaters/toggle_latch", "y": 0 }, - "powered=false,powering=false,facing=west": { "model": "create:block/repeaters/toggle_latch", "y": 90 }, - - "powered=true,powering=false,facing=north": { "model": "create:block/repeaters/toggle_latch_powered", "y": 180 }, - "powered=true,powering=false,facing=east": { "model": "create:block/repeaters/toggle_latch_powered", "y": 270 }, - "powered=true,powering=false,facing=south": { "model": "create:block/repeaters/toggle_latch_powered", "y": 0 }, - "powered=true,powering=false,facing=west": { "model": "create:block/repeaters/toggle_latch_powered", "y": 90 }, - - "powered=false,powering=true,facing=north": { "model": "create:block/repeaters/toggle_latch_powering", "y": 180 }, - "powered=false,powering=true,facing=east": { "model": "create:block/repeaters/toggle_latch_powering", "y": 270 }, - "powered=false,powering=true,facing=south": { "model": "create:block/repeaters/toggle_latch_powering", "y": 0 }, - "powered=false,powering=true,facing=west": { "model": "create:block/repeaters/toggle_latch_powering", "y": 90 }, - - "powered=true,powering=true,facing=north": { "model": "create:block/repeaters/toggle_latch_powered_powering", "y": 180 }, - "powered=true,powering=true,facing=east": { "model": "create:block/repeaters/toggle_latch_powered_powering", "y": 270 }, - "powered=true,powering=true,facing=south": { "model": "create:block/repeaters/toggle_latch_powered_powering", "y": 0 }, - "powered=true,powering=true,facing=west": { "model": "create:block/repeaters/toggle_latch_powered_powering", "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/transposer.json b/src/main/resources/assets/create/blockstates/transposer.json deleted file mode 100644 index 12877a743..000000000 --- a/src/main/resources/assets/create/blockstates/transposer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "powered=true,facing=north": { "model": "create:block/transposer/default_powered", "y": 0 }, - "powered=true,facing=east": { "model": "create:block/transposer/default_powered", "y": 90 }, - "powered=true,facing=south": { "model": "create:block/transposer/default_powered", "y": 180 }, - "powered=true,facing=west": { "model": "create:block/transposer/default_powered", "y": 270 }, - "powered=false,facing=north": { "model": "create:block/transposer/default", "y": 0 }, - "powered=false,facing=east": { "model": "create:block/transposer/default", "y": 90 }, - "powered=false,facing=south": { "model": "create:block/transposer/default", "y": 180 }, - "powered=false,facing=west": { "model": "create:block/transposer/default", "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/vertical_extractor.json b/src/main/resources/assets/create/blockstates/vertical_extractor.json deleted file mode 100644 index 69dd523fa..000000000 --- a/src/main/resources/assets/create/blockstates/vertical_extractor.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "variants": { - - "powered=true,upward=false,facing=south": { "model": "create:block/extractor/vertical_powered", "y": 180 }, - "powered=true,upward=false,facing=east": { "model": "create:block/extractor/vertical_powered", "y": 90 }, - "powered=true,upward=false,facing=north": { "model": "create:block/extractor/vertical_powered", "y": 0 }, - "powered=true,upward=false,facing=west": { "model": "create:block/extractor/vertical_powered", "y": 270 }, - "powered=true,upward=true,facing=south": { "model": "create:block/extractor/vertical_powered", "y": 0, "x": 180 }, - "powered=true,upward=true,facing=east": { "model": "create:block/extractor/vertical_powered", "y": 270, "x": 180 }, - "powered=true,upward=true,facing=north": { "model": "create:block/extractor/vertical_powered", "y": 180, "x": 180 }, - "powered=true,upward=true,facing=west": { "model": "create:block/extractor/vertical_powered", "y": 90, "x": 180 }, - - "powered=false,upward=false,facing=south": { "model": "create:block/extractor/vertical", "y": 180 }, - "powered=false,upward=false,facing=east": { "model": "create:block/extractor/vertical", "y": 90 }, - "powered=false,upward=false,facing=north": { "model": "create:block/extractor/vertical", "y": 0 }, - "powered=false,upward=false,facing=west": { "model": "create:block/extractor/vertical", "y": 270 }, - "powered=false,upward=true,facing=south": { "model": "create:block/extractor/vertical", "y": 0, "x": 180 }, - "powered=false,upward=true,facing=east": { "model": "create:block/extractor/vertical", "y": 270, "x": 180 }, - "powered=false,upward=true,facing=north": { "model": "create:block/extractor/vertical", "y": 180, "x": 180 }, - "powered=false,upward=true,facing=west": { "model": "create:block/extractor/vertical", "y": 90, "x": 180 } - - } -} diff --git a/src/main/resources/assets/create/blockstates/vertical_funnel.json b/src/main/resources/assets/create/blockstates/vertical_funnel.json deleted file mode 100644 index 575ae26c5..000000000 --- a/src/main/resources/assets/create/blockstates/vertical_funnel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "upward=true,facing=south": { "model": "create:block/funnel/vertical", "y": 180, "x": 270 }, - "upward=true,facing=east": { "model": "create:block/funnel/vertical", "y": 90, "x": 270 }, - "upward=true,facing=north": { "model": "create:block/funnel/vertical", "y": 0, "x": 270 }, - "upward=true,facing=west": { "model": "create:block/funnel/vertical", "y": 270, "x": 270 }, - "upward=false,facing=south": { "model": "create:block/funnel/vertical", "y": 0, "x": 90 }, - "upward=false,facing=east": { "model": "create:block/funnel/vertical", "y": 270, "x": 90 }, - "upward=false,facing=north": { "model": "create:block/funnel/vertical", "y": 180, "x": 90 }, - "upward=false,facing=west": { "model": "create:block/funnel/vertical", "y": 90, "x": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/vertical_linked_extractor.json b/src/main/resources/assets/create/blockstates/vertical_linked_extractor.json deleted file mode 100644 index dd02dc3b9..000000000 --- a/src/main/resources/assets/create/blockstates/vertical_linked_extractor.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "variants": { - - "powered=true,upward=false,facing=south": { "model": "create:block/extractor/vertical_wireless_powered", "y": 180 }, - "powered=true,upward=false,facing=east": { "model": "create:block/extractor/vertical_wireless_powered", "y": 90 }, - "powered=true,upward=false,facing=north": { "model": "create:block/extractor/vertical_wireless_powered", "y": 0 }, - "powered=true,upward=false,facing=west": { "model": "create:block/extractor/vertical_wireless_powered", "y": 270 }, - "powered=true,upward=true,facing=south": { "model": "create:block/extractor/vertical_wireless_powered", "y": 0, "x": 180 }, - "powered=true,upward=true,facing=east": { "model": "create:block/extractor/vertical_wireless_powered", "y": 270, "x": 180 }, - "powered=true,upward=true,facing=north": { "model": "create:block/extractor/vertical_wireless_powered", "y": 180, "x": 180 }, - "powered=true,upward=true,facing=west": { "model": "create:block/extractor/vertical_wireless_powered", "y": 90, "x": 180 }, - - "powered=false,upward=false,facing=south": { "model": "create:block/extractor/vertical_wireless", "y": 180 }, - "powered=false,upward=false,facing=east": { "model": "create:block/extractor/vertical_wireless", "y": 90 }, - "powered=false,upward=false,facing=north": { "model": "create:block/extractor/vertical_wireless", "y": 0 }, - "powered=false,upward=false,facing=west": { "model": "create:block/extractor/vertical_wireless", "y": 270 }, - "powered=false,upward=true,facing=south": { "model": "create:block/extractor/vertical_wireless", "y": 0, "x": 180 }, - "powered=false,upward=true,facing=east": { "model": "create:block/extractor/vertical_wireless", "y": 270, "x": 180 }, - "powered=false,upward=true,facing=north": { "model": "create:block/extractor/vertical_wireless", "y": 180, "x": 180 }, - "powered=false,upward=true,facing=west": { "model": "create:block/extractor/vertical_wireless", "y": 90, "x": 180 } - - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/vertical_linked_transposer.json b/src/main/resources/assets/create/blockstates/vertical_linked_transposer.json deleted file mode 100644 index 2171c9f7b..000000000 --- a/src/main/resources/assets/create/blockstates/vertical_linked_transposer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "variants": { - - "powered=true,upward=true,facing=south": { "model": "create:block/transposer/vertical_linked_powered", "y": 180, "x": 270 }, - "powered=true,upward=true,facing=east": { "model": "create:block/transposer/vertical_linked_powered", "y": 90, "x": 270 }, - "powered=true,upward=true,facing=north": { "model": "create:block/transposer/vertical_linked_powered", "y": 0, "x": 270 }, - "powered=true,upward=true,facing=west": { "model": "create:block/transposer/vertical_linked_powered", "y": 270, "x": 270 }, - "powered=true,upward=false,facing=south": { "model": "create:block/transposer/vertical_linked_powered", "y": 0, "x": 90 }, - "powered=true,upward=false,facing=east": { "model": "create:block/transposer/vertical_linked_powered", "y": 270, "x": 90 }, - "powered=true,upward=false,facing=north": { "model": "create:block/transposer/vertical_linked_powered", "y": 180, "x": 90 }, - "powered=true,upward=false,facing=west": { "model": "create:block/transposer/vertical_linked_powered", "y": 90, "x": 90 }, - - "powered=false,upward=true,facing=south": { "model": "create:block/transposer/vertical_linked", "y": 180, "x": 270 }, - "powered=false,upward=true,facing=east": { "model": "create:block/transposer/vertical_linked", "y": 90, "x": 270 }, - "powered=false,upward=true,facing=north": { "model": "create:block/transposer/vertical_linked", "y": 0, "x": 270 }, - "powered=false,upward=true,facing=west": { "model": "create:block/transposer/vertical_linked", "y": 270, "x": 270 }, - "powered=false,upward=false,facing=south": { "model": "create:block/transposer/vertical_linked", "y": 0, "x": 90 }, - "powered=false,upward=false,facing=east": { "model": "create:block/transposer/vertical_linked", "y": 270, "x": 90 }, - "powered=false,upward=false,facing=north": { "model": "create:block/transposer/vertical_linked", "y": 180, "x": 90 }, - "powered=false,upward=false,facing=west": { "model": "create:block/transposer/vertical_linked", "y": 90, "x": 90 } - - } -} diff --git a/src/main/resources/assets/create/blockstates/vertical_transposer.json b/src/main/resources/assets/create/blockstates/vertical_transposer.json deleted file mode 100644 index e6f460e70..000000000 --- a/src/main/resources/assets/create/blockstates/vertical_transposer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "variants": { - - "powered=true,upward=true,facing=south": { "model": "create:block/transposer/default_powered", "y": 180, "x": 270 }, - "powered=true,upward=true,facing=east": { "model": "create:block/transposer/default_powered", "y": 90, "x": 270 }, - "powered=true,upward=true,facing=north": { "model": "create:block/transposer/default_powered", "y": 0, "x": 270 }, - "powered=true,upward=true,facing=west": { "model": "create:block/transposer/default_powered", "y": 270, "x": 270 }, - "powered=true,upward=false,facing=south": { "model": "create:block/transposer/default_powered", "y": 0, "x": 90 }, - "powered=true,upward=false,facing=east": { "model": "create:block/transposer/default_powered", "y": 270, "x": 90 }, - "powered=true,upward=false,facing=north": { "model": "create:block/transposer/default_powered", "y": 180, "x": 90 }, - "powered=true,upward=false,facing=west": { "model": "create:block/transposer/default_powered", "y": 90, "x": 90 }, - - "powered=false,upward=true,facing=south": { "model": "create:block/transposer/default", "y": 180, "x": 270 }, - "powered=false,upward=true,facing=east": { "model": "create:block/transposer/default", "y": 90, "x": 270 }, - "powered=false,upward=true,facing=north": { "model": "create:block/transposer/default", "y": 0, "x": 270 }, - "powered=false,upward=true,facing=west": { "model": "create:block/transposer/default", "y": 270, "x": 270 }, - "powered=false,upward=false,facing=south": { "model": "create:block/transposer/default", "y": 0, "x": 90 }, - "powered=false,upward=false,facing=east": { "model": "create:block/transposer/default", "y": 270, "x": 90 }, - "powered=false,upward=false,facing=north": { "model": "create:block/transposer/default", "y": 180, "x": 90 }, - "powered=false,upward=false,facing=west": { "model": "create:block/transposer/default", "y": 90, "x": 90 } - - } -} diff --git a/src/main/resources/assets/create/blockstates/warehouse_crate.json b/src/main/resources/assets/create/blockstates/warehouse_crate.json deleted file mode 100644 index 0d6635db5..000000000 --- a/src/main/resources/assets/create/blockstates/warehouse_crate.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "double=true,facing=up": { "model": "create:block/crate/andesite/double_bottom" }, - "double=true,facing=down": { "model": "create:block/crate/andesite/double_top" }, - "double=true,facing=west": { "model": "create:block/crate/andesite/double_left", "y": 90 }, - "double=true,facing=east": { "model": "create:block/crate/andesite/double_right", "y": 90 }, - "double=true,facing=north": { "model": "create:block/crate/andesite/double_right" }, - "double=true,facing=south": { "model": "create:block/crate/andesite/double_left" }, - - "double=false,facing=up": { "model": "create:block/crate/andesite/single" }, - "double=false,facing=down": { "model": "create:block/crate/andesite/single" }, - "double=false,facing=west": { "model": "create:block/crate/andesite/single" }, - "double=false,facing=east": { "model": "create:block/crate/andesite/single" }, - "double=false,facing=north": { "model": "create:block/crate/andesite/single" }, - "double=false,facing=south": { "model": "create:block/crate/andesite/single" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/analog_lever/body.json b/src/main/resources/assets/create/models/block/analog_lever/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/analog_lever/body.json rename to src/main/resources/assets/create/models/block/analog_lever/block.json diff --git a/src/main/resources/assets/create/models/block/andesite_casing.json b/src/main/resources/assets/create/models/block/andesite_casing.json deleted file mode 100644 index 71b9ae315..000000000 --- a/src/main/resources/assets/create/models/block/andesite_casing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/andesite_casing" - } -} diff --git a/src/main/resources/assets/create/models/block/basin.json b/src/main/resources/assets/create/models/block/basin.json index be76f1771..95bc5feaa 100644 --- a/src/main/resources/assets/create/models/block/basin.json +++ b/src/main/resources/assets/create/models/block/basin.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "parent": "block/block", - "ambientocclusion": true, "textures": { + "1": "create:block/basin_side", "12": "create:block/basin", "particle": "create:block/basin" }, @@ -13,12 +13,12 @@ "to": [2, 13, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, "faces": { - "north": {"uv": [7, 0, 8, 5.5], "texture": "#12"}, - "east": {"uv": [0, 0, 8, 5.5], "texture": "#12"}, - "south": {"uv": [0, 0, 1, 5.5], "texture": "#12"}, - "west": {"uv": [0, 0, 8, 5.5], "texture": "#12"}, - "up": {"uv": [8, 0, 9, 8], "texture": "#12"}, - "down": {"uv": [8, 0, 9, 8], "texture": "#12"} + "north": {"uv": [14, 3, 16, 14], "texture": "#1"}, + "east": {"uv": [0, 3, 16, 14], "texture": "#1"}, + "south": {"uv": [0, 3, 2, 14], "texture": "#1"}, + "west": {"uv": [0, 3, 16, 14], "texture": "#1"}, + "up": {"uv": [0, 0, 2, 16], "texture": "#12"}, + "down": {"uv": [0, 0, 2, 16], "texture": "#12"} } }, { @@ -27,12 +27,12 @@ "to": [14, 2, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 25, 8]}, "faces": { - "north": {"uv": [1, 5.5, 7, 6.5], "texture": "#12"}, - "east": {"uv": [1, 5.5, 7, 6.5], "texture": "#12"}, - "south": {"uv": [1, 5.5, 7, 6.5], "texture": "#12"}, - "west": {"uv": [1, 5.5, 7, 6.5], "texture": "#12"}, - "up": {"uv": [0, 10, 6, 16], "texture": "#12"}, - "down": {"uv": [0, 10, 6, 16], "rotation": 90, "texture": "#12"} + "north": {"uv": [2, 14, 14, 16], "texture": "#1"}, + "east": {"uv": [2, 14, 14, 16], "texture": "#1"}, + "south": {"uv": [2, 14, 14, 16], "texture": "#1"}, + "west": {"uv": [2, 14, 14, 16], "texture": "#1"}, + "up": {"uv": [2, 2, 14, 14], "texture": "#12"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#12"} } }, { @@ -41,10 +41,10 @@ "to": [14, 13, 2], "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, "faces": { - "north": {"uv": [1, 0, 7, 5.5], "texture": "#12"}, - "south": {"uv": [0, 0, 8, 5.5], "texture": "#12"}, - "up": {"uv": [9, 0, 15, 1], "texture": "#12"}, - "down": {"uv": [9, 7, 15, 8], "texture": "#12"} + "north": {"uv": [2, 3, 14, 14], "texture": "#1"}, + "south": {"uv": [2, 3, 14, 14], "texture": "#1"}, + "up": {"uv": [2, 0, 14, 2], "texture": "#12"}, + "down": {"uv": [2, 14, 14, 16], "texture": "#12"} } }, { @@ -53,10 +53,10 @@ "to": [14, 13, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]}, "faces": { - "north": {"uv": [1, 0, 7, 5.5], "texture": "#12"}, - "south": {"uv": [1, 0, 7, 5.5], "texture": "#12"}, - "up": {"uv": [9, 7, 15, 8], "texture": "#12"}, - "down": {"uv": [9, 0, 15, 1], "texture": "#12"} + "north": {"uv": [2, 3, 14, 14], "texture": "#1"}, + "south": {"uv": [2, 3, 14, 14], "texture": "#1"}, + "up": {"uv": [2, 14, 14, 16], "texture": "#12"}, + "down": {"uv": [2, 0, 14, 2], "texture": "#12"} } }, { @@ -65,12 +65,12 @@ "to": [16, 13, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 40, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 5.5], "texture": "#12"}, - "east": {"uv": [0, 0, 8, 5.5], "texture": "#12"}, - "south": {"uv": [7, 0, 8, 5.5], "texture": "#12"}, - "west": {"uv": [0, 0, 8, 5.5], "texture": "#12"}, - "up": {"uv": [15, 0, 16, 8], "texture": "#12"}, - "down": {"uv": [15, 0, 16, 8], "texture": "#12"} + "north": {"uv": [0, 3, 2, 14], "texture": "#1"}, + "east": {"uv": [0, 3, 16, 14], "texture": "#1"}, + "south": {"uv": [14, 3, 16, 14], "texture": "#1"}, + "west": {"uv": [0, 3, 16, 14], "texture": "#1"}, + "up": {"uv": [14, 0, 16, 16], "texture": "#12"}, + "down": {"uv": [14, 0, 16, 16], "texture": "#12"} } } ], diff --git a/src/main/resources/assets/create/models/block/belt_observer/detect.json b/src/main/resources/assets/create/models/block/belt_observer/detect.json deleted file mode 100644 index 5a6ba1150..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/detect.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base", - "textures": { - "texture": "create:block/belt_observer_detect" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/detect_belt.json b/src/main/resources/assets/create/models/block/belt_observer/detect_belt.json deleted file mode 100644 index 90dcf7aed..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/detect_belt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_belt", - "textures": { - "texture": "create:block/belt_observer_detect" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/detect_belt_powered.json b/src/main/resources/assets/create/models/block/belt_observer/detect_belt_powered.json deleted file mode 100644 index d941db520..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/detect_belt_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_belt_powered", - "textures": { - "texture": "create:block/belt_observer_detect_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/detect_powered.json b/src/main/resources/assets/create/models/block/belt_observer/detect_powered.json deleted file mode 100644 index a2a3a4bb9..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/detect_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_powered", - "textures": { - "texture": "create:block/belt_observer_detect_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/eject.json b/src/main/resources/assets/create/models/block/belt_observer/eject.json deleted file mode 100644 index 821e2c378..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/eject.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base", - "textures": { - "texture": "create:block/belt_observer_eject" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/eject_belt.json b/src/main/resources/assets/create/models/block/belt_observer/eject_belt.json deleted file mode 100644 index 4f590d91a..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/eject_belt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_belt", - "textures": { - "texture": "create:block/belt_observer_eject" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/eject_belt_powered.json b/src/main/resources/assets/create/models/block/belt_observer/eject_belt_powered.json deleted file mode 100644 index d4656f309..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/eject_belt_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_belt_powered", - "textures": { - "texture": "create:block/belt_observer_eject_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/eject_powered.json b/src/main/resources/assets/create/models/block/belt_observer/eject_powered.json deleted file mode 100644 index c7fd5ec96..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/eject_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_powered", - "textures": { - "texture": "create:block/belt_observer_eject_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/entity_detector.json b/src/main/resources/assets/create/models/block/belt_observer/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/entity_detector.json rename to src/main/resources/assets/create/models/block/belt_observer/item.json diff --git a/src/main/resources/assets/create/models/block/belt_observer/pulse.json b/src/main/resources/assets/create/models/block/belt_observer/pulse.json deleted file mode 100644 index 39d8c5ef3..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/pulse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base", - "textures": { - "texture": "create:block/belt_observer_pulse" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/pulse_belt.json b/src/main/resources/assets/create/models/block/belt_observer/pulse_belt.json deleted file mode 100644 index b93de0c5b..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/pulse_belt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_belt", - "textures": { - "texture": "create:block/belt_observer_pulse" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/pulse_belt_powered.json b/src/main/resources/assets/create/models/block/belt_observer/pulse_belt_powered.json deleted file mode 100644 index 7d7bb923f..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/pulse_belt_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_belt_powered", - "textures": { - "texture": "create:block/belt_observer_pulse_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/pulse_powered.json b/src/main/resources/assets/create/models/block/belt_observer/pulse_powered.json deleted file mode 100644 index 93c6da0a7..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/pulse_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_powered", - "textures": { - "texture": "create:block/belt_observer_pulse_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/split.json b/src/main/resources/assets/create/models/block/belt_observer/split.json deleted file mode 100644 index 12405d396..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/split.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base", - "textures": { - "texture": "create:block/belt_observer_split" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/split_belt.json b/src/main/resources/assets/create/models/block/belt_observer/split_belt.json deleted file mode 100644 index bc413b344..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/split_belt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_belt", - "textures": { - "texture": "create:block/belt_observer_split" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/split_belt_powered.json b/src/main/resources/assets/create/models/block/belt_observer/split_belt_powered.json deleted file mode 100644 index 2fad9a1bb..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/split_belt_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_belt_powered", - "textures": { - "texture": "create:block/belt_observer_split_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_observer/split_powered.json b/src/main/resources/assets/create/models/block/belt_observer/split_powered.json deleted file mode 100644 index 5d373467f..000000000 --- a/src/main/resources/assets/create/models/block/belt_observer/split_powered.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/belt_observer/base_powered", - "textures": { - "texture": "create:block/belt_observer_split_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight_fullshade.json b/src/main/resources/assets/create/models/block/belt_tunnel/fullshade.json similarity index 100% rename from src/main/resources/assets/create/models/block/belt_tunnel/straight_fullshade.json rename to src/main/resources/assets/create/models/block/belt_tunnel/fullshade.json diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight_halfshade.json b/src/main/resources/assets/create/models/block/belt_tunnel/halfshade.json similarity index 100% rename from src/main/resources/assets/create/models/block/belt_tunnel/straight_halfshade.json rename to src/main/resources/assets/create/models/block/belt_tunnel/halfshade.json diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight_windowed.json b/src/main/resources/assets/create/models/block/belt_tunnel/window.json similarity index 100% rename from src/main/resources/assets/create/models/block/belt_tunnel/straight_windowed.json rename to src/main/resources/assets/create/models/block/belt_tunnel/window.json diff --git a/src/main/resources/assets/create/models/block/brass_casing.json b/src/main/resources/assets/create/models/block/brass_casing.json deleted file mode 100644 index 283ed4c16..000000000 --- a/src/main/resources/assets/create/models/block/brass_casing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/crafter_top" - } -} diff --git a/src/main/resources/assets/create/models/block/copper_casing.json b/src/main/resources/assets/create/models/block/copper_casing.json deleted file mode 100644 index 26e7e9293..000000000 --- a/src/main/resources/assets/create/models/block/copper_casing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/copper_casing" - } -} diff --git a/src/main/resources/assets/create/models/block/crate/andesite/double_bottom.json b/src/main/resources/assets/create/models/block/crate/andesite/double_bottom.json deleted file mode 100644 index 1f64b86a4..000000000 --- a/src/main/resources/assets/create/models/block/crate/andesite/double_bottom.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_bottom", - "textures": { - "side": "create:block/crate_andesite_side", - "crate": "create:block/crate_andesite", - "casing": "create:block/andesite_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/andesite/double_left.json b/src/main/resources/assets/create/models/block/crate/andesite/double_left.json deleted file mode 100644 index 7e80d3c0f..000000000 --- a/src/main/resources/assets/create/models/block/crate/andesite/double_left.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_left", - "textures": { - "side": "create:block/crate_andesite_side", - "crate": "create:block/crate_andesite", - "casing": "create:block/andesite_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/andesite/double_right.json b/src/main/resources/assets/create/models/block/crate/andesite/double_right.json deleted file mode 100644 index ef4e4879b..000000000 --- a/src/main/resources/assets/create/models/block/crate/andesite/double_right.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_right", - "textures": { - "side": "create:block/crate_andesite_side", - "crate": "create:block/crate_andesite", - "casing": "create:block/andesite_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/andesite/double_top.json b/src/main/resources/assets/create/models/block/crate/andesite/double_top.json deleted file mode 100644 index 1365289d2..000000000 --- a/src/main/resources/assets/create/models/block/crate/andesite/double_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_top", - "textures": { - "side": "create:block/crate_andesite_side", - "crate": "create:block/crate_andesite", - "casing": "create:block/andesite_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/andesite/single.json b/src/main/resources/assets/create/models/block/crate/andesite/single.json deleted file mode 100644 index fd13c504e..000000000 --- a/src/main/resources/assets/create/models/block/crate/andesite/single.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/single", - "textures": { - "side": "create:block/crate_andesite_side", - "crate": "create:block/crate_andesite", - "casing": "create:block/andesite_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/double_bottom.json b/src/main/resources/assets/create/models/block/crate/bottom.json similarity index 100% rename from src/main/resources/assets/create/models/block/crate/double_bottom.json rename to src/main/resources/assets/create/models/block/crate/bottom.json diff --git a/src/main/resources/assets/create/models/block/crate/brass/double_bottom.json b/src/main/resources/assets/create/models/block/crate/brass/double_bottom.json deleted file mode 100644 index 17421d454..000000000 --- a/src/main/resources/assets/create/models/block/crate/brass/double_bottom.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_bottom", - "textures": { - "side": "create:block/crate_brass_side", - "crate": "create:block/crate_brass", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/brass/double_left.json b/src/main/resources/assets/create/models/block/crate/brass/double_left.json deleted file mode 100644 index 1bafd8483..000000000 --- a/src/main/resources/assets/create/models/block/crate/brass/double_left.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_left", - "textures": { - "side": "create:block/crate_brass_side", - "crate": "create:block/crate_brass", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/brass/double_right.json b/src/main/resources/assets/create/models/block/crate/brass/double_right.json deleted file mode 100644 index 8a2fae584..000000000 --- a/src/main/resources/assets/create/models/block/crate/brass/double_right.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_right", - "textures": { - "side": "create:block/crate_brass_side", - "crate": "create:block/crate_brass", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/brass/double_top.json b/src/main/resources/assets/create/models/block/crate/brass/double_top.json deleted file mode 100644 index 1f143378e..000000000 --- a/src/main/resources/assets/create/models/block/crate/brass/double_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_top", - "textures": { - "side": "create:block/crate_brass_side", - "crate": "create:block/crate_brass", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/brass/single.json b/src/main/resources/assets/create/models/block/crate/brass/single.json deleted file mode 100644 index b1caf4cf2..000000000 --- a/src/main/resources/assets/create/models/block/crate/brass/single.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/single", - "textures": { - "side": "create:block/crate_brass_side", - "crate": "create:block/crate_brass", - "casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/copper/double_bottom.json b/src/main/resources/assets/create/models/block/crate/copper/double_bottom.json deleted file mode 100644 index 8f3c1d55f..000000000 --- a/src/main/resources/assets/create/models/block/crate/copper/double_bottom.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_bottom", - "textures": { - "side": "create:block/crate_copper_side", - "crate": "create:block/crate_copper", - "casing": "create:block/copper_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/copper/double_left.json b/src/main/resources/assets/create/models/block/crate/copper/double_left.json deleted file mode 100644 index 6cb52e843..000000000 --- a/src/main/resources/assets/create/models/block/crate/copper/double_left.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_left", - "textures": { - "side": "create:block/crate_copper_side", - "crate": "create:block/crate_copper", - "casing": "create:block/copper_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/copper/double_right.json b/src/main/resources/assets/create/models/block/crate/copper/double_right.json deleted file mode 100644 index fc4f8230b..000000000 --- a/src/main/resources/assets/create/models/block/crate/copper/double_right.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_right", - "textures": { - "side": "create:block/crate_copper_side", - "crate": "create:block/crate_copper", - "casing": "create:block/copper_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/copper/double_top.json b/src/main/resources/assets/create/models/block/crate/copper/double_top.json deleted file mode 100644 index a1c05fdf4..000000000 --- a/src/main/resources/assets/create/models/block/crate/copper/double_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_top", - "textures": { - "side": "create:block/crate_copper_side", - "crate": "create:block/crate_copper", - "casing": "create:block/copper_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/copper/single.json b/src/main/resources/assets/create/models/block/crate/copper/single.json deleted file mode 100644 index 9424436d3..000000000 --- a/src/main/resources/assets/create/models/block/crate/copper/single.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/single", - "textures": { - "side": "create:block/crate_copper_side", - "crate": "create:block/crate_copper", - "casing": "create:block/copper_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/creative/double_bottom.json b/src/main/resources/assets/create/models/block/crate/creative/double_bottom.json deleted file mode 100644 index a6a52312c..000000000 --- a/src/main/resources/assets/create/models/block/crate/creative/double_bottom.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_bottom", - "textures": { - "side": "create:block/crate_creative_side", - "crate": "create:block/crate_creative", - "casing": "create:block/chorus_chrome_mesh" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/creative/double_left.json b/src/main/resources/assets/create/models/block/crate/creative/double_left.json deleted file mode 100644 index 17188e56f..000000000 --- a/src/main/resources/assets/create/models/block/crate/creative/double_left.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_left", - "textures": { - "side": "create:block/crate_creative_side", - "crate": "create:block/crate_creative", - "casing": "create:block/chorus_chrome_mesh" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/creative/double_right.json b/src/main/resources/assets/create/models/block/crate/creative/double_right.json deleted file mode 100644 index e23a11c5e..000000000 --- a/src/main/resources/assets/create/models/block/crate/creative/double_right.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_right", - "textures": { - "side": "create:block/crate_creative_side", - "crate": "create:block/crate_creative", - "casing": "create:block/chorus_chrome_mesh" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/creative/double_top.json b/src/main/resources/assets/create/models/block/crate/creative/double_top.json deleted file mode 100644 index fe10d5395..000000000 --- a/src/main/resources/assets/create/models/block/crate/creative/double_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/double_top", - "textures": { - "side": "create:block/crate_creative_side", - "crate": "create:block/crate_creative", - "casing": "create:block/chorus_chrome_mesh" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/creative/single.json b/src/main/resources/assets/create/models/block/crate/creative/single.json deleted file mode 100644 index bf83bf254..000000000 --- a/src/main/resources/assets/create/models/block/crate/creative/single.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/crate/single", - "textures": { - "side": "create:block/crate_creative_side", - "crate": "create:block/crate_creative", - "casing": "create:block/chorus_chrome_mesh" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crate/double_left.json b/src/main/resources/assets/create/models/block/crate/left.json similarity index 100% rename from src/main/resources/assets/create/models/block/crate/double_left.json rename to src/main/resources/assets/create/models/block/crate/left.json diff --git a/src/main/resources/assets/create/models/block/crate/double_right.json b/src/main/resources/assets/create/models/block/crate/right.json similarity index 100% rename from src/main/resources/assets/create/models/block/crate/double_right.json rename to src/main/resources/assets/create/models/block/crate/right.json diff --git a/src/main/resources/assets/create/models/block/crate/double_top.json b/src/main/resources/assets/create/models/block/crate/top.json similarity index 100% rename from src/main/resources/assets/create/models/block/crate/double_top.json rename to src/main/resources/assets/create/models/block/crate/top.json diff --git a/src/main/resources/assets/create/models/block/creative_crate.json b/src/main/resources/assets/create/models/block/creative_crate.json deleted file mode 100644 index e67b2c589..000000000 --- a/src/main/resources/assets/create/models/block/creative_crate.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "block/block", - "textures": { - "0": "create:block/creative_crate_side", - "1": "create:block/creative_crate_top", - "particle": "create:block/creative_crate_top" - }, - "elements": [ - { - "name": "Cube", - "from": [ 1.0, 0.0, 1.0 ], - "to": [ 15.0, 14.0, 15.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "up": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater.json b/src/main/resources/assets/create/models/block/diodes/adjustable_pulse_repeater.json similarity index 69% rename from src/main/resources/assets/create/models/block/repeaters/flexpulsepeater.json rename to src/main/resources/assets/create/models/block/diodes/adjustable_pulse_repeater.json index fa9dfe787..685e4b7b6 100644 --- a/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater.json +++ b/src/main/resources/assets/create/models/block/diodes/adjustable_pulse_repeater.json @@ -1,11 +1,10 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "parent": "block/block", "textures": { - "flexpeater_off": "create:block/flexpulsepeater_off", + "top": "create:block/diodes/adjustable_pulse_repeater/idle", "torch": "minecraft:block/redstone_torch_off", "smooth_stone": "minecraft:block/smooth_stone", - "particle": "create:block/flexpulsepeater_off" + "particle": "#top" }, "elements": [ { @@ -13,11 +12,11 @@ "from": [ 5, 2.1, 5 ], "to": [ 11, 3.1, 11 ], "faces": { - "north": { "texture": "#flexpeater_off", "uv": [ 5, 5, 11, 6 ], "rotation": 180 }, - "east": { "texture": "#flexpeater_off", "uv": [ 10, 5, 11, 11 ], "rotation": 90 }, - "south": { "texture": "#flexpeater_off", "uv": [ 5, 10, 11, 11 ] }, - "west": { "texture": "#flexpeater_off", "uv": [ 5, 11, 6, 5 ], "rotation": 90 }, - "up": { "texture": "#flexpeater_off", "uv": [ 5, 5, 11, 11 ] } + "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 ] } } }, { @@ -29,7 +28,7 @@ "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": "#flexpeater_off", "uv": [ 0, 0, 16, 16 ] }, + "up": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] }, "down": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 16 ] } } }, @@ -59,5 +58,12 @@ "up": { "texture": "#torch", "uv": [ 7, 6, 9, 8 ] } } } - ] + ], + "display": { + "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/repeaters/flexpeater.json b/src/main/resources/assets/create/models/block/diodes/adjustable_repeater.json similarity index 51% rename from src/main/resources/assets/create/models/block/repeaters/flexpeater.json rename to src/main/resources/assets/create/models/block/diodes/adjustable_repeater.json index 6ba760111..7cd8a0331 100644 --- a/src/main/resources/assets/create/models/block/repeaters/flexpeater.json +++ b/src/main/resources/assets/create/models/block/diodes/adjustable_repeater.json @@ -1,10 +1,10 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "parent": "block/block", "textures": { - "flexpeater_off": "create:block/flexpeater_off", + "top": "create:block/diodes/adjustable_repeater/idle", "smooth_stone": "minecraft:block/smooth_stone", - "particle": "create:block/flexpeater_off" + "torch": "minecraft:block/redstone_torch_off", + "particle": "#top" }, "elements": [ { @@ -12,11 +12,11 @@ "from": [ 5, 2.1, 5 ], "to": [ 11, 3.1, 11 ], "faces": { - "north": { "texture": "#flexpeater_off", "uv": [ 5, 5, 11, 6 ], "rotation": 180 }, - "east": { "texture": "#flexpeater_off", "uv": [ 10, 5, 11, 11 ], "rotation": 90 }, - "south": { "texture": "#flexpeater_off", "uv": [ 5, 10, 11, 11 ] }, - "west": { "texture": "#flexpeater_off", "uv": [ 5, 11, 6, 5 ], "rotation": 90 }, - "up": { "texture": "#flexpeater_off", "uv": [ 5, 5, 11, 11 ] } + "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 ] } } }, { @@ -28,9 +28,16 @@ "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": "#flexpeater_off", "uv": [ 0, 0, 16, 16 ] }, + "up": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] }, "down": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 16 ] } } } - ] + ], + "display": { + "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/repeaters/flexpeater_indicator.json b/src/main/resources/assets/create/models/block/diodes/indicator.json similarity index 90% rename from src/main/resources/assets/create/models/block/repeaters/flexpeater_indicator.json rename to src/main/resources/assets/create/models/block/diodes/indicator.json index 5ed46c25e..504b39f81 100644 --- a/src/main/resources/assets/create/models/block/repeaters/flexpeater_indicator.json +++ b/src/main/resources/assets/create/models/block/diodes/indicator.json @@ -1,6 +1,6 @@ { "textures": { - "flexpeater_off": "create:block/flexpeater_off" + "flexpeater_off": "create:block/diodes/adjustable_repeater/idle" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/repeaters/toggle_latch.json b/src/main/resources/assets/create/models/block/diodes/latch_off.json similarity index 88% rename from src/main/resources/assets/create/models/block/repeaters/toggle_latch.json rename to src/main/resources/assets/create/models/block/diodes/latch_off.json index 83507382e..b1fdfac10 100644 --- a/src/main/resources/assets/create/models/block/repeaters/toggle_latch.json +++ b/src/main/resources/assets/create/models/block/diodes/latch_off.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "3": "create:block/toggle_latch", + "top": "create:block/diodes/powered_toggle_latch/idle", "torch": "minecraft:block/redstone_torch_off", "smooth_stone": "minecraft:block/smooth_stone", - "particle": "minecraft:block/cobblestone", + "particle": "minecraft:block/smooth_stone", "base": "minecraft:block/cobblestone", "lever": "minecraft:block/lever" }, @@ -15,11 +15,11 @@ "from": [3, 2, 4], "to": [13, 3, 12], "faces": { - "north": {"uv": [3, 4, 13, 5], "rotation": 180, "texture": "#3"}, - "east": {"uv": [12, 4, 13, 12], "rotation": 90, "texture": "#3"}, - "south": {"uv": [3, 11, 13, 12], "texture": "#3"}, - "west": {"uv": [3, 4, 4, 12], "rotation": 90, "texture": "#3"}, - "up": {"uv": [3, 4, 13, 12], "texture": "#3"} + "north": {"uv": [3, 4, 13, 5], "rotation": 180, "texture": "#top"}, + "east": {"uv": [12, 4, 13, 12], "rotation": 90, "texture": "#top"}, + "south": {"uv": [3, 11, 13, 12], "texture": "#top"}, + "west": {"uv": [3, 4, 4, 12], "rotation": 90, "texture": "#top"}, + "up": {"uv": [3, 4, 13, 12], "texture": "#top"} } }, { @@ -31,7 +31,7 @@ "east": {"uv": [0, 0, 16, 2], "texture": "#smooth_stone"}, "south": {"uv": [0, 0, 16, 2], "texture": "#smooth_stone"}, "west": {"uv": [0, 0, 16, 2], "texture": "#smooth_stone"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, "down": {"uv": [0, 0, 16, 16], "texture": "#smooth_stone"} } }, diff --git a/src/main/resources/assets/create/models/block/repeaters/toggle_latch_powering.json b/src/main/resources/assets/create/models/block/diodes/latch_on.json similarity index 92% rename from src/main/resources/assets/create/models/block/repeaters/toggle_latch_powering.json rename to src/main/resources/assets/create/models/block/diodes/latch_on.json index 565558b87..8354678e8 100644 --- a/src/main/resources/assets/create/models/block/repeaters/toggle_latch_powering.json +++ b/src/main/resources/assets/create/models/block/diodes/latch_on.json @@ -1,13 +1,12 @@ { "credit": "Made with Blockbench", "parent": "block/block", - "ambientocclusion": false, "textures": { - "3": "create:block/toggle_latch", - "5": "create:block/toggle_latch_powered_powering", + "top": "create:block/diodes/powered_toggle_latch/idle", + "5": "create:block/diodes/powered_toggle_latch/powered_powering", "torch": "minecraft:block/redstone_torch", "smooth_stone": "minecraft:block/smooth_stone", - "particle": "minecraft:block/cobblestone", + "particle": "minecraft:block/smooth_stone", "base": "minecraft:block/cobblestone", "lever": "minecraft:block/lever" }, @@ -34,7 +33,7 @@ "east": {"uv": [0, 0, 16, 2], "texture": "#smooth_stone"}, "south": {"uv": [0, 0, 16, 2], "texture": "#smooth_stone"}, "west": {"uv": [0, 0, 16, 2], "texture": "#smooth_stone"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, "down": {"uv": [0, 0, 16, 16], "texture": "#smooth_stone"} } }, diff --git a/src/main/resources/assets/create/models/block/pulse_repeater.json b/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json similarity index 84% rename from src/main/resources/assets/create/models/block/pulse_repeater.json rename to src/main/resources/assets/create/models/block/diodes/pulse_repeater.json index 4df0c5b72..8504219bf 100644 --- a/src/main/resources/assets/create/models/block/pulse_repeater.json +++ b/src/main/resources/assets/create/models/block/diodes/pulse_repeater.json @@ -1,11 +1,10 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "parent": "block/block", "textures": { - "pulse_repeater": "create:block/pulse_repeater", + "top": "create:block/diodes/pulse_repeater/idle", "torch": "minecraft:block/redstone_torch_off", "smooth_stone": "minecraft:block/smooth_stone", - "particle": "create:block/pulse_repeater" + "particle": "#top" }, "elements": [ { @@ -17,7 +16,7 @@ "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": "#pulse_repeater", "uv": [ 0, 0, 16, 16 ] }, + "up": { "texture": "#top", "uv": [ 0, 0, 16, 16 ] }, "down": { "texture": "#smooth_stone", "uv": [ 0, 0, 16, 16 ] } } }, diff --git a/src/main/resources/assets/create/models/block/extractor/horizontal.json b/src/main/resources/assets/create/models/block/extractor/horizontal.json index e5bb8c934..aef3762c1 100644 --- a/src/main/resources/assets/create/models/block/extractor/horizontal.json +++ b/src/main/resources/assets/create/models/block/extractor/horizontal.json @@ -3,8 +3,8 @@ "parent": "block/block", "textures": { "1": "create:block/brass_casing", - "particle": "create:block/extractor", - "extractor": "create:block/extractor" + "extractor": "create:block/extractor", + "particle": "#extractor" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/extractor/horizontal_wireless.json b/src/main/resources/assets/create/models/block/extractor/horizontal_linked.json similarity index 97% rename from src/main/resources/assets/create/models/block/extractor/horizontal_wireless.json rename to src/main/resources/assets/create/models/block/extractor/horizontal_linked.json index 8505efe84..a83392dc4 100644 --- a/src/main/resources/assets/create/models/block/extractor/horizontal_wireless.json +++ b/src/main/resources/assets/create/models/block/extractor/horizontal_linked.json @@ -4,8 +4,8 @@ "textures": { "2": "create:block/brass_casing", "redstone_antenna": "create:block/redstone_antenna", - "particle": "create:block/extractor", - "extractor": "create:block/extractor" + "extractor": "create:block/extractor", + "particle": "#extractor" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/extractor/horizontal_linked_powered.json b/src/main/resources/assets/create/models/block/extractor/horizontal_linked_powered.json new file mode 100644 index 000000000..939bbe91e --- /dev/null +++ b/src/main/resources/assets/create/models/block/extractor/horizontal_linked_powered.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/extractor/horizontal_linked", + "textures": { + "redstone_antenna": "create:block/redstone_antenna_powered", + "extractor": "create:block/extractor_powered" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/extractor/horizontal_powered.json b/src/main/resources/assets/create/models/block/extractor/horizontal_powered.json index c5dff3e17..3bc488ffe 100644 --- a/src/main/resources/assets/create/models/block/extractor/horizontal_powered.json +++ b/src/main/resources/assets/create/models/block/extractor/horizontal_powered.json @@ -1,7 +1,6 @@ { "parent": "create:block/extractor/horizontal", "textures": { - "extractor": "create:block/extractor_powered", - "particle": "create:block/extractor_powered" + "extractor": "create:block/extractor_powered" } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/extractor/horizontal_wireless_powered.json b/src/main/resources/assets/create/models/block/extractor/horizontal_wireless_powered.json deleted file mode 100644 index ef5d56a59..000000000 --- a/src/main/resources/assets/create/models/block/extractor/horizontal_wireless_powered.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/extractor/horizontal_wireless", - "textures": { - "redstone_antenna": "create:block/redstone_antenna_powered", - "extractor": "create:block/extractor_powered", - "particle": "create:block/extractor_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/extractor/vertical.json b/src/main/resources/assets/create/models/block/extractor/vertical.json index ca1901ce5..551978196 100644 --- a/src/main/resources/assets/create/models/block/extractor/vertical.json +++ b/src/main/resources/assets/create/models/block/extractor/vertical.json @@ -3,8 +3,8 @@ "parent": "block/block", "textures": { "1": "create:block/brass_casing", - "particle": "create:block/extractor", - "extractor": "create:block/extractor" + "extractor": "create:block/extractor", + "particle": "#extractor" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/extractor/vertical_wireless.json b/src/main/resources/assets/create/models/block/extractor/vertical_linked.json similarity index 98% rename from src/main/resources/assets/create/models/block/extractor/vertical_wireless.json rename to src/main/resources/assets/create/models/block/extractor/vertical_linked.json index d9dbf74c1..f7a502df4 100644 --- a/src/main/resources/assets/create/models/block/extractor/vertical_wireless.json +++ b/src/main/resources/assets/create/models/block/extractor/vertical_linked.json @@ -3,9 +3,9 @@ "parent": "create:block/extractor/horizontal", "textures": { "1": "create:block/brass_casing", - "particle": "create:block/extractor", "extractor": "create:block/extractor", - "redstone_antenna": "create:block/redstone_antenna" + "redstone_antenna": "create:block/redstone_antenna", + "particle": "#extractor" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/extractor/vertical_linked_powered.json b/src/main/resources/assets/create/models/block/extractor/vertical_linked_powered.json new file mode 100644 index 000000000..d6334281f --- /dev/null +++ b/src/main/resources/assets/create/models/block/extractor/vertical_linked_powered.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/extractor/vertical_linked", + "textures": { + "redstone_antenna": "create:block/redstone_antenna_powered", + "extractor": "create:block/extractor_powered" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/extractor/vertical_powered.json b/src/main/resources/assets/create/models/block/extractor/vertical_powered.json index 592d930cb..7b4c09a02 100644 --- a/src/main/resources/assets/create/models/block/extractor/vertical_powered.json +++ b/src/main/resources/assets/create/models/block/extractor/vertical_powered.json @@ -1,7 +1,6 @@ { "parent": "create:block/extractor/vertical", "textures": { - "extractor": "create:block/extractor_powered", - "particle": "create:block/extractor_powered" + "extractor": "create:block/extractor_powered" } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/funnel/horizontal.json b/src/main/resources/assets/create/models/block/funnel/horizontal.json index dca41a007..630a512ea 100644 --- a/src/main/resources/assets/create/models/block/funnel/horizontal.json +++ b/src/main/resources/assets/create/models/block/funnel/horizontal.json @@ -6,8 +6,8 @@ "4": "create:block/extractor", "brass_casing": "create:block/brass_casing", "belt_funnel": "create:block/belt_funnel", - "particle": "create:block/package_funnel_horizontal", - "package_funnel_horizontal": "create:block/package_funnel_horizontal" + "package_funnel_horizontal": "create:block/funnel_horizontal", + "particle": "#package_funnel_horizontal" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/funnel/vertical.json b/src/main/resources/assets/create/models/block/funnel/vertical.json index 09383a204..d5de931ce 100644 --- a/src/main/resources/assets/create/models/block/funnel/vertical.json +++ b/src/main/resources/assets/create/models/block/funnel/vertical.json @@ -1,7 +1,7 @@ { "parent": "create:block/funnel/horizontal", "textures": { - "particle": "create:block/package_funnel_vertical", - "package_funnel_horizontal": "create:block/package_funnel_vertical" + "particle": "create:block/funnel_vertical", + "package_funnel_horizontal": "create:block/funnel_vertical" } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_block/0.json b/src/main/resources/assets/create/models/block/oxidized/copper_block/0.json deleted file mode 100644 index 9a83266ab..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_block/0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_block_0" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_block/1.json b/src/main/resources/assets/create/models/block/oxidized/copper_block/1.json deleted file mode 100644 index bdb2a3fc2..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_block/1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_block_1" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_block/2.json b/src/main/resources/assets/create/models/block/oxidized/copper_block/2.json deleted file mode 100644 index 5fb9f56b1..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_block/2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_block_2" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_block/3.json b/src/main/resources/assets/create/models/block/oxidized/copper_block/3.json deleted file mode 100644 index 7e53df33d..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_block/3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_block_3" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_block/4.json b/src/main/resources/assets/create/models/block/oxidized/copper_block/4.json deleted file mode 100644 index 9a268b149..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_block/4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_block_4" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_block/5.json b/src/main/resources/assets/create/models/block/oxidized/copper_block/5.json deleted file mode 100644 index d1674bee5..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_block/5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_block_5" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_block/6.json b/src/main/resources/assets/create/models/block/oxidized/copper_block/6.json deleted file mode 100644 index 6aa38c09b..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_block/6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_block_6" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_block/7.json b/src/main/resources/assets/create/models/block/oxidized/copper_block/7.json deleted file mode 100644 index 5c1318ccc..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_block/7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_block_7" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_ore/0.json b/src/main/resources/assets/create/models/block/oxidized/copper_ore/0.json deleted file mode 100644 index 00a08db77..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_ore/0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_0" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_ore/1.json b/src/main/resources/assets/create/models/block/oxidized/copper_ore/1.json deleted file mode 100644 index eb30051f9..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_ore/1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_1" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_ore/2.json b/src/main/resources/assets/create/models/block/oxidized/copper_ore/2.json deleted file mode 100644 index b6d26d98b..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_ore/2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_2" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_ore/3.json b/src/main/resources/assets/create/models/block/oxidized/copper_ore/3.json deleted file mode 100644 index 17e8144b5..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_ore/3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_3" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_ore/4.json b/src/main/resources/assets/create/models/block/oxidized/copper_ore/4.json deleted file mode 100644 index 02d3ce4b9..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_ore/4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_4" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_ore/5.json b/src/main/resources/assets/create/models/block/oxidized/copper_ore/5.json deleted file mode 100644 index cc8b13258..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_ore/5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_5" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_ore/6.json b/src/main/resources/assets/create/models/block/oxidized/copper_ore/6.json deleted file mode 100644 index 9b6cf90d4..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_ore/6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_6" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_ore/7.json b/src/main/resources/assets/create/models/block/oxidized/copper_ore/7.json deleted file mode 100644 index b53392abd..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_ore/7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_7" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/0.json b/src/main/resources/assets/create/models/block/oxidized/copper_shingles/0.json deleted file mode 100644 index 2729a1e46..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_shingles_0" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/1.json b/src/main/resources/assets/create/models/block/oxidized/copper_shingles/1.json deleted file mode 100644 index f53a1604c..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_shingles_1" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/2.json b/src/main/resources/assets/create/models/block/oxidized/copper_shingles/2.json deleted file mode 100644 index 86d9adc55..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_shingles_2" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/3.json b/src/main/resources/assets/create/models/block/oxidized/copper_shingles/3.json deleted file mode 100644 index 0f8ee9bdc..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_shingles_3" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/4.json b/src/main/resources/assets/create/models/block/oxidized/copper_shingles/4.json deleted file mode 100644 index 2d457a951..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_shingles_4" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/5.json b/src/main/resources/assets/create/models/block/oxidized/copper_shingles/5.json deleted file mode 100644 index 56f5902b2..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_shingles_5" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/6.json b/src/main/resources/assets/create/models/block/oxidized/copper_shingles/6.json deleted file mode 100644 index d15628e5e..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_shingles_6" - } -} diff --git a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/7.json b/src/main/resources/assets/create/models/block/oxidized/copper_shingles/7.json deleted file mode 100644 index d37361db5..000000000 --- a/src/main/resources/assets/create/models/block/oxidized/copper_shingles/7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_shingles_7" - } -} diff --git a/src/main/resources/assets/create/models/block/pulse_repeater_powered.json b/src/main/resources/assets/create/models/block/pulse_repeater_powered.json deleted file mode 100644 index a118e7f05..000000000 --- a/src/main/resources/assets/create/models/block/pulse_repeater_powered.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/pulse_repeater", - "textures": { - "pulse_repeater": "create:block/pulse_repeater_powered", - "particle": "create:block/pulse_repeater_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/pulse_repeater_pulsing.json b/src/main/resources/assets/create/models/block/pulse_repeater_pulsing.json deleted file mode 100644 index 6323bc244..000000000 --- a/src/main/resources/assets/create/models/block/pulse_repeater_pulsing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/pulse_repeater_powered", - "textures": { - "torch": "minecraft:block/redstone_torch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/contact.json b/src/main/resources/assets/create/models/block/redstone_contact/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/contact.json rename to src/main/resources/assets/create/models/block/redstone_contact/block.json diff --git a/src/main/resources/assets/create/models/block/contact_powered.json b/src/main/resources/assets/create/models/block/redstone_contact/block_powered.json similarity index 72% rename from src/main/resources/assets/create/models/block/contact_powered.json rename to src/main/resources/assets/create/models/block/redstone_contact/block_powered.json index 96f9030df..eedc44be7 100644 --- a/src/main/resources/assets/create/models/block/contact_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_contact/block_powered.json @@ -1,5 +1,5 @@ { - "parent": "create:block/contact", + "parent": "create:block/redstone_contact/block", "textures": { "particle": "create:block/contact_side_powered", "1": "create:block/contact_side_powered" diff --git a/src/main/resources/assets/create/models/block/redstone_bridge_receiver.json b/src/main/resources/assets/create/models/block/redstone_link/receiver.json similarity index 100% rename from src/main/resources/assets/create/models/block/redstone_bridge_receiver.json rename to src/main/resources/assets/create/models/block/redstone_link/receiver.json diff --git a/src/main/resources/assets/create/models/block/redstone_bridge_powered.json b/src/main/resources/assets/create/models/block/redstone_link/receiver_powered.json similarity index 80% rename from src/main/resources/assets/create/models/block/redstone_bridge_powered.json rename to src/main/resources/assets/create/models/block/redstone_link/receiver_powered.json index 20e8b9390..205c09227 100644 --- a/src/main/resources/assets/create/models/block/redstone_bridge_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_link/receiver_powered.json @@ -1,5 +1,5 @@ { - "parent": "create:block/redstone_bridge", + "parent": "create:block/redstone_link/receiver", "textures": { "redstone_antenna": "create:block/redstone_antenna_powered", "redstone_bridge": "create:block/redstone_bridge_powered", diff --git a/src/main/resources/assets/create/models/block/redstone_bridge_receiver_side.json b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json similarity index 100% rename from src/main/resources/assets/create/models/block/redstone_bridge_receiver_side.json rename to src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json diff --git a/src/main/resources/assets/create/models/block/redstone_bridge_receiver_side_powered.json b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical_powered.json similarity index 79% rename from src/main/resources/assets/create/models/block/redstone_bridge_receiver_side_powered.json rename to src/main/resources/assets/create/models/block/redstone_link/receiver_vertical_powered.json index e395ee7bf..73a1d4106 100644 --- a/src/main/resources/assets/create/models/block/redstone_bridge_receiver_side_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical_powered.json @@ -1,5 +1,5 @@ { - "parent": "create:block/redstone_bridge_receiver_side", + "parent": "create:block/redstone_link/receiver_vertical", "textures": { "redstone_antenna": "create:block/redstone_antenna_powered", "redstone_bridge_side": "create:block/redstone_bridge_side_powered", diff --git a/src/main/resources/assets/create/models/block/redstone_bridge.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json similarity index 100% rename from src/main/resources/assets/create/models/block/redstone_bridge.json rename to src/main/resources/assets/create/models/block/redstone_link/transmitter.json diff --git a/src/main/resources/assets/create/models/block/redstone_bridge_receiver_powered.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json similarity index 80% rename from src/main/resources/assets/create/models/block/redstone_bridge_receiver_powered.json rename to src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json index e4390614c..4fa28d3ea 100644 --- a/src/main/resources/assets/create/models/block/redstone_bridge_receiver_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json @@ -1,5 +1,5 @@ { - "parent": "create:block/redstone_bridge_receiver", + "parent": "create:block/redstone_link/transmitter", "textures": { "redstone_antenna": "create:block/redstone_antenna_powered", "redstone_bridge": "create:block/redstone_bridge_powered", diff --git a/src/main/resources/assets/create/models/block/redstone_bridge_side.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json similarity index 100% rename from src/main/resources/assets/create/models/block/redstone_bridge_side.json rename to src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json diff --git a/src/main/resources/assets/create/models/block/redstone_bridge_side_powered.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical_powered.json similarity index 78% rename from src/main/resources/assets/create/models/block/redstone_bridge_side_powered.json rename to src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical_powered.json index 67f6d2a4f..9f4f0019c 100644 --- a/src/main/resources/assets/create/models/block/redstone_bridge_side_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical_powered.json @@ -1,5 +1,5 @@ { - "parent": "create:block/redstone_bridge_side", + "parent": "create:block/redstone_link/transmitter_vertical", "textures": { "redstone_antenna": "create:block/redstone_antenna_powered", "redstone_bridge_side": "create:block/redstone_bridge_side_powered", diff --git a/src/main/resources/assets/create/models/block/repeaters/flexpeater_powered.json b/src/main/resources/assets/create/models/block/repeaters/flexpeater_powered.json deleted file mode 100644 index 21f3a5015..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/flexpeater_powered.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/repeaters/flexpeater", - "textures": { - "flexpeater_off": "create:block/flexpeater_charging", - "particle": "create:block/flexpeater_charging" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/flexpeater_powered_powering.json b/src/main/resources/assets/create/models/block/repeaters/flexpeater_powered_powering.json deleted file mode 100644 index 5dbda982e..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/flexpeater_powered_powering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/repeaters/flexpeater", - "textures": { - "flexpeater_off": "create:block/flexpeater_on", - "particle": "create:block/flexpeater_on" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/flexpeater_powering.json b/src/main/resources/assets/create/models/block/repeaters/flexpeater_powering.json deleted file mode 100644 index b4d71106f..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/flexpeater_powering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/repeaters/flexpeater", - "textures": { - "flexpeater_off": "create:block/flexpeater_powering", - "particle": "create:block/flexpeater_powering" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powered.json b/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powered.json deleted file mode 100644 index c0633f132..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powered.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/repeaters/flexpulsepeater", - "textures": { - "flexpeater_off": "create:block/flexpulsepeater_on", - "particle": "create:block/flexpulsepeater_on" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powered_powering.json b/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powered_powering.json deleted file mode 100644 index 5a5f3876b..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powered_powering.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/repeaters/flexpulsepeater_powered", - "textures": { - "torch": "minecraft:block/redstone_torch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powering.json b/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powering.json deleted file mode 100644 index 60d4ab99b..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/flexpulsepeater_powering.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/repeaters/flexpulsepeater", - "textures": { - "torch": "minecraft:block/redstone_torch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/redstone_latch.json b/src/main/resources/assets/create/models/block/repeaters/redstone_latch.json deleted file mode 100644 index fd504e5a4..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/redstone_latch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/repeaters/toggle_latch", - "textures": { - "3": "create:block/redstone_latch", - "particle": "create:block/redstone_latch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/redstone_latch_powered.json b/src/main/resources/assets/create/models/block/repeaters/redstone_latch_powered.json deleted file mode 100644 index 2a66ce1cb..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/redstone_latch_powered.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/repeaters/toggle_latch_powering", - "textures": { - "3": "create:block/redstone_latch_powered", - "particle": "create:block/redstone_latch_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/toggle_latch_powered.json b/src/main/resources/assets/create/models/block/repeaters/toggle_latch_powered.json deleted file mode 100644 index 55d817a33..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/toggle_latch_powered.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/repeaters/toggle_latch", - "textures": { - "3": "create:block/toggle_latch_powered", - "particle": "create:block/toggle_latch_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/repeaters/toggle_latch_powered_powering.json b/src/main/resources/assets/create/models/block/repeaters/toggle_latch_powered_powering.json deleted file mode 100644 index a161e2dfd..000000000 --- a/src/main/resources/assets/create/models/block/repeaters/toggle_latch_powered_powering.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/repeaters/toggle_latch_powering", - "textures": { - "3": "create:block/toggle_latch_powered_powering", - "particle": "create:block/toggle_latch_powered_powering" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch.json b/src/main/resources/assets/create/models/block/stockpile_switch.json index 3f9ef2344..cfe456960 100644 --- a/src/main/resources/assets/create/models/block/stockpile_switch.json +++ b/src/main/resources/assets/create/models/block/stockpile_switch.json @@ -1,93 +1,101 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", + "credit": "Made with Blockbench", "parent": "block/block", - "textures": { - "progress": "create:block/indicator/0", - "brass_casing": "create:block/brass_casing", - "dark_oak_planks": "minecraft:block/dark_oak_planks", - "iron_block": "minecraft:block/iron_block", - "end": "create:block/stockpile_switch_end", - "particle": "create:block/brass_casing" - }, - "elements": [ - { - "name": "Indicator", - "from": [ 1, 2, 13 ], - "to": [ 4, 14, 16 ], - "faces": { - "east": { "texture": "#progress", "uv": [ 0, 2, 3, 14 ] }, - "south": { "texture": "#progress", "uv": [ 1, 2, 4, 14 ] }, - "west": { "texture": "#progress", "uv": [ 0, 2, 3, 14 ] } - } - }, - { - "name": "Bottom Plate", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#brass_casing", "uv": [ 0, 14, 16, 16 ] }, - "east": { "texture": "#brass_casing", "uv": [ 0, 14, 16, 16 ] }, - "south": { "texture": "#brass_casing", "uv": [ 0, 14, 16, 16 ] }, - "west": { "texture": "#brass_casing", "uv": [ 0, 14, 16, 16 ] }, - "up": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Top Plate", - "from": [ 0, 14, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "north": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 2 ] }, - "east": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 2 ] }, - "west": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Side Plate", - "from": [ 14, 2, 0 ], - "to": [ 16, 14, 16 ], - "faces": { - "north": { "texture": "#brass_casing", "uv": [ 0, 2, 2, 14 ] }, - "east": { "texture": "#brass_casing", "uv": [ 0, 2, 16, 14 ] }, - "south": { "texture": "#brass_casing", "uv": [ 14, 2, 16, 14 ] }, - "west": { "texture": "#brass_casing", "uv": [ 0, 2, 16, 14 ] } - } - }, - { - "name": "Center", - "from": [ 2, 2, 1 ], - "to": [ 14, 14, 15 ], - "faces": { - "north": { "texture": "#dark_oak_planks", "uv": [ 0, 0, 12, 12 ] }, - "south": { "texture": "#dark_oak_planks", "uv": [ 0, 0, 12, 12 ] }, - "west": { "texture": "#dark_oak_planks", "uv": [ 0, 0, 14, 12 ] } - } - }, - { - "name": "Indicator", - "from": [ -1, 2, 2 ], - "to": [ 1, 14, 14 ], - "faces": { - "north": { "texture": "#iron_block", "uv": [ 14, 2, 16, 14 ] }, - "south": { "texture": "#iron_block", "uv": [ 0, 2, 2, 14 ] }, - "west": { "texture": "#end", "uv": [ 2, 2, 14, 14 ] }, - "up": { "texture": "#iron_block", "uv": [ 2, 0, 14, 2 ], "rotation": 270 }, - "down": { "texture": "#iron_block", "uv": [ 2, 14, 14, 16 ], "rotation": 90 } - } - }, - { - "name": "Indicator", - "from": [ 1, 2, 0 ], - "to": [ 4, 14, 3 ], - "faces": { - "north": { "texture": "#progress", "uv": [ 0, 2, 3, 14 ] }, - "east": { "texture": "#progress", "uv": [ 1, 2, 4, 14 ] }, - "west": { "texture": "#progress", "uv": [ 1, 2, 4, 14 ] } - } - } - ] + "textures": { + "5": "create:block/brass_casing_inner", + "6": "create:block/brass_casing", + "indicator": "create:block/indicator/0", + "particle": "create:block/brass_casing_side", + "brass_casing": "create:block/brass_casing_side", + "end": "create:block/stockpile_switch_end" + }, + "elements": [ + { + "name": "Bottom Plate", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#brass_casing"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#6"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"} + } + }, + { + "name": "Top Plate", + "from": [0, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, + "east": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, + "west": {"uv": [0, 0, 16, 2], "texture": "#brass_casing"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#6"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"} + } + }, + { + "name": "Center", + "from": [1, 2, 1], + "to": [15, 14, 15], + "faces": { + "north": {"uv": [0, 0, 14, 12], "texture": "#5"}, + "east": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, + "south": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, + "west": {"uv": [0, 1, 12, 15], "rotation": 90, "texture": "#5"}, + "up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#5"}, + "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#5"} + } + }, + { + "name": "Indicator", + "from": [3.1, 3.1, -1.9], + "to": [12.9, 12.9, 1.1], + "faces": { + "north": {"uv": [0, 0, 10, 10], "texture": "#end"}, + "east": {"uv": [10, 0, 13, 10], "texture": "#end"}, + "west": {"uv": [10, 0, 13, 10], "texture": "#end"}, + "up": {"uv": [10, 0, 13, 10], "rotation": 90, "texture": "#end"}, + "down": {"uv": [10, 0, 13, 10], "rotation": 270, "texture": "#end"} + } + }, + { + "name": "Indicator", + "from": [13, 2, 6], + "to": [16, 14, 10], + "faces": { + "north": {"uv": [0, 0, 3, 12], "texture": "#indicator"}, + "east": {"uv": [0, 0, 4, 12], "texture": "#indicator"}, + "south": {"uv": [1, 0, 4, 12], "texture": "#indicator"} + } + }, + { + "name": "Indicator", + "from": [0, 2, 6], + "to": [3, 14, 10], + "faces": { + "north": {"uv": [3, 0, 0, 12], "texture": "#indicator"}, + "south": {"uv": [4, 0, 1, 12], "texture": "#indicator"}, + "west": {"uv": [4, 0, 0, 12], "texture": "#indicator"} + } + }, + { + "name": "Indicator", + "from": [6, 2, 13], + "to": [10, 14, 16], + "faces": { + "east": {"uv": [4, 0, 1, 12], "texture": "#indicator"}, + "south": {"uv": [4, 0, 0, 12], "texture": "#indicator"}, + "west": {"uv": [3, 0, 0, 12], "texture": "#indicator"} + } + } + ], + "display": { + "gui": { + "rotation": [30, -135, 0], + "scale": [0.625, 0.625, 0.625] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch_1.json b/src/main/resources/assets/create/models/block/stockpile_switch_1.json deleted file mode 100644 index f8d6edca1..000000000 --- a/src/main/resources/assets/create/models/block/stockpile_switch_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/stockpile_switch", - "textures": { - "progress": "create:block/indicator/1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch_2.json b/src/main/resources/assets/create/models/block/stockpile_switch_2.json deleted file mode 100644 index 1e2d3278e..000000000 --- a/src/main/resources/assets/create/models/block/stockpile_switch_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/stockpile_switch", - "textures": { - "progress": "create:block/indicator/2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch_3.json b/src/main/resources/assets/create/models/block/stockpile_switch_3.json deleted file mode 100644 index cc7518686..000000000 --- a/src/main/resources/assets/create/models/block/stockpile_switch_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/stockpile_switch", - "textures": { - "progress": "create:block/indicator/3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch_4.json b/src/main/resources/assets/create/models/block/stockpile_switch_4.json deleted file mode 100644 index d3e052411..000000000 --- a/src/main/resources/assets/create/models/block/stockpile_switch_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/stockpile_switch", - "textures": { - "progress": "create:block/indicator/4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch_5.json b/src/main/resources/assets/create/models/block/stockpile_switch_5.json deleted file mode 100644 index b99d92e0b..000000000 --- a/src/main/resources/assets/create/models/block/stockpile_switch_5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/stockpile_switch", - "textures": { - "progress": "create:block/indicator/5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/stockpile_switch_6.json b/src/main/resources/assets/create/models/block/stockpile_switch_6.json deleted file mode 100644 index d25d07ae7..000000000 --- a/src/main/resources/assets/create/models/block/stockpile_switch_6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/stockpile_switch", - "textures": { - "progress": "create:block/indicator/6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/transposer/default.json b/src/main/resources/assets/create/models/block/transposer/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/transposer/default.json rename to src/main/resources/assets/create/models/block/transposer/block.json diff --git a/src/main/resources/assets/create/models/block/transposer/default_powered.json b/src/main/resources/assets/create/models/block/transposer/block_powered.json similarity index 73% rename from src/main/resources/assets/create/models/block/transposer/default_powered.json rename to src/main/resources/assets/create/models/block/transposer/block_powered.json index f547c7e0e..4747bb4d3 100644 --- a/src/main/resources/assets/create/models/block/transposer/default_powered.json +++ b/src/main/resources/assets/create/models/block/transposer/block_powered.json @@ -1,5 +1,5 @@ { - "parent": "create:block/transposer/default", + "parent": "create:block/transposer/block", "textures": { "extractor": "create:block/extractor_powered", "particle": "create:block/extractor_powered" diff --git a/src/main/resources/assets/create/models/block/transposer/linked.json b/src/main/resources/assets/create/models/block/transposer/horizontal_linked.json similarity index 100% rename from src/main/resources/assets/create/models/block/transposer/linked.json rename to src/main/resources/assets/create/models/block/transposer/horizontal_linked.json diff --git a/src/main/resources/assets/create/models/block/extractor/vertical_wireless_powered.json b/src/main/resources/assets/create/models/block/transposer/horizontal_linked_powered.json similarity index 77% rename from src/main/resources/assets/create/models/block/extractor/vertical_wireless_powered.json rename to src/main/resources/assets/create/models/block/transposer/horizontal_linked_powered.json index 277f856d9..bf379ba7f 100644 --- a/src/main/resources/assets/create/models/block/extractor/vertical_wireless_powered.json +++ b/src/main/resources/assets/create/models/block/transposer/horizontal_linked_powered.json @@ -1,5 +1,5 @@ { - "parent": "create:block/extractor/vertical_wireless", + "parent": "create:block/transposer/horizontal_linked", "textures": { "redstone_antenna": "create:block/redstone_antenna_powered", "extractor": "create:block/extractor_powered", diff --git a/src/main/resources/assets/create/models/block/transposer/linked_powered.json b/src/main/resources/assets/create/models/block/transposer/linked_powered.json deleted file mode 100644 index 12ff33bb8..000000000 --- a/src/main/resources/assets/create/models/block/transposer/linked_powered.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "create:block/transposer/linked", - "textures": { - "redstone_antenna": "create:block/redstone_antenna_powered", - "extractor": "create:block/extractor_powered", - "particle": "create:block/extractor_powered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/analog_lever.json b/src/main/resources/assets/create/models/item/analog_lever.json deleted file mode 100644 index caddaab55..000000000 --- a/src/main/resources/assets/create/models/item/analog_lever.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/analog_lever/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/antioxidant.json b/src/main/resources/assets/create/models/item/antioxidant.json deleted file mode 100644 index 3bcae42ef..000000000 --- a/src/main/resources/assets/create/models/item/antioxidant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "create:item/antioxidant" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/belt_funnel.json b/src/main/resources/assets/create/models/item/belt_funnel.json deleted file mode 100644 index 234192573..000000000 --- a/src/main/resources/assets/create/models/item/belt_funnel.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/funnel/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/belt_tunnel.json b/src/main/resources/assets/create/models/item/belt_tunnel.json deleted file mode 100644 index 4c5411cb6..000000000 --- a/src/main/resources/assets/create/models/item/belt_tunnel.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/belt_tunnel/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/cocoa_log.json b/src/main/resources/assets/create/models/item/cocoa_log.json deleted file mode 100644 index f435f99ae..000000000 --- a/src/main/resources/assets/create/models/item/cocoa_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/cocoa_log_2" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/contact.json b/src/main/resources/assets/create/models/item/contact.json deleted file mode 100644 index 72336568c..000000000 --- a/src/main/resources/assets/create/models/item/contact.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/contact" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/creative_crate.json b/src/main/resources/assets/create/models/item/creative_crate.json deleted file mode 100644 index b206b9358..000000000 --- a/src/main/resources/assets/create/models/item/creative_crate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/crate/creative/single" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/extractor.json b/src/main/resources/assets/create/models/item/extractor.json deleted file mode 100644 index d74df1741..000000000 --- a/src/main/resources/assets/create/models/item/extractor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/extractor/horizontal" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/filtered_crate.json b/src/main/resources/assets/create/models/item/filtered_crate.json deleted file mode 100644 index 9478a7f23..000000000 --- a/src/main/resources/assets/create/models/item/filtered_crate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/crate/copper/single" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/flexcrate.json b/src/main/resources/assets/create/models/item/flexcrate.json deleted file mode 100644 index 2f1d31d32..000000000 --- a/src/main/resources/assets/create/models/item/flexcrate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/crate/brass/single" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/flexpeater.json b/src/main/resources/assets/create/models/item/flexpeater.json deleted file mode 100644 index 165f7eb72..000000000 --- a/src/main/resources/assets/create/models/item/flexpeater.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/repeaters/flexpeater", - "textures": { - "flexpeater_off": "create:block/flexpeater_item" - }, - "display": { - "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/item/flexpulsepeater.json b/src/main/resources/assets/create/models/item/flexpulsepeater.json deleted file mode 100644 index a566c00e1..000000000 --- a/src/main/resources/assets/create/models/item/flexpulsepeater.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "parent": "create:block/repeaters/flexpulsepeater", - "textures": { - "flexpeater_off": "create:block/flexpulsepeater_item" - }, - "display": { - "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/item/linked_extractor.json b/src/main/resources/assets/create/models/item/linked_extractor.json deleted file mode 100644 index 7eccdf092..000000000 --- a/src/main/resources/assets/create/models/item/linked_extractor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/extractor/horizontal_wireless" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/linked_transposer.json b/src/main/resources/assets/create/models/item/linked_transposer.json deleted file mode 100644 index 30072ff3c..000000000 --- a/src/main/resources/assets/create/models/item/linked_transposer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/transposer/linked" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/pulse_repeater.json b/src/main/resources/assets/create/models/item/pulse_repeater.json deleted file mode 100644 index 3030b26ac..000000000 --- a/src/main/resources/assets/create/models/item/pulse_repeater.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "create:block/pulse_repeater", - "display": { - "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/item/redstone_bridge.json b/src/main/resources/assets/create/models/item/redstone_bridge.json deleted file mode 100644 index c3649fcf8..000000000 --- a/src/main/resources/assets/create/models/item/redstone_bridge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/redstone_bridge_powered" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/redstone_latch.json b/src/main/resources/assets/create/models/item/redstone_latch.json deleted file mode 100644 index 0d839e344..000000000 --- a/src/main/resources/assets/create/models/item/redstone_latch.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "create:block/repeaters/redstone_latch", - "display": { - "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/item/stockswitch.json b/src/main/resources/assets/create/models/item/stockswitch.json deleted file mode 100644 index 8c0271645..000000000 --- a/src/main/resources/assets/create/models/item/stockswitch.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "create:block/stockpile_switch_4", - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/toggle_latch.json b/src/main/resources/assets/create/models/item/toggle_latch.json deleted file mode 100644 index 0794ca899..000000000 --- a/src/main/resources/assets/create/models/item/toggle_latch.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "create:block/repeaters/toggle_latch", - "display": { - "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/item/transposer.json b/src/main/resources/assets/create/models/item/transposer.json deleted file mode 100644 index 399c110aa..000000000 --- a/src/main/resources/assets/create/models/item/transposer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/transposer/default" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/warehouse_crate.json b/src/main/resources/assets/create/models/item/warehouse_crate.json deleted file mode 100644 index 20c00f2c1..000000000 --- a/src/main/resources/assets/create/models/item/warehouse_crate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/crate/andesite/single" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/basin.png b/src/main/resources/assets/create/textures/block/basin.png index d95aef9b9..c650eea86 100644 Binary files a/src/main/resources/assets/create/textures/block/basin.png and b/src/main/resources/assets/create/textures/block/basin.png differ diff --git a/src/main/resources/assets/create/textures/block/basin_side.png b/src/main/resources/assets/create/textures/block/basin_side.png new file mode 100644 index 000000000..be37152b6 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/basin_side.png differ diff --git a/src/main/resources/assets/create/textures/block/brass_casing_inner.png b/src/main/resources/assets/create/textures/block/brass_casing_inner.png new file mode 100644 index 000000000..9d5649710 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/brass_casing_inner.png differ diff --git a/src/main/resources/assets/create/textures/block/cocoa_log_0.png b/src/main/resources/assets/create/textures/block/cocoa_log_0.png deleted file mode 100644 index 1fd79d31b..000000000 Binary files a/src/main/resources/assets/create/textures/block/cocoa_log_0.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/cocoa_log_1.png b/src/main/resources/assets/create/textures/block/cocoa_log_1.png deleted file mode 100644 index 043796233..000000000 Binary files a/src/main/resources/assets/create/textures/block/cocoa_log_1.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/cocoa_log_2.png b/src/main/resources/assets/create/textures/block/cocoa_log_2.png deleted file mode 100644 index 904d50096..000000000 Binary files a/src/main/resources/assets/create/textures/block/cocoa_log_2.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/flexpulsepeater_off.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/idle.png similarity index 100% rename from src/main/resources/assets/create/textures/block/flexpulsepeater_off.png rename to src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/idle.png diff --git a/src/main/resources/assets/create/textures/block/flexpulsepeater_item.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/item.png similarity index 100% rename from src/main/resources/assets/create/textures/block/flexpulsepeater_item.png rename to src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/item.png diff --git a/src/main/resources/assets/create/textures/block/flexpulsepeater_on.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered.png similarity index 100% rename from src/main/resources/assets/create/textures/block/flexpulsepeater_on.png rename to src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered.png 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 new file mode 100644 index 000000000..2d6d50c09 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powered_powering.png 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 new file mode 100644 index 000000000..a5bd9cd36 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/diodes/adjustable_pulse_repeater/powering.png differ diff --git a/src/main/resources/assets/create/textures/block/flexpeater_off.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/idle.png similarity index 100% rename from src/main/resources/assets/create/textures/block/flexpeater_off.png rename to src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/idle.png diff --git a/src/main/resources/assets/create/textures/block/flexpeater_item.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/item.png similarity index 100% rename from src/main/resources/assets/create/textures/block/flexpeater_item.png rename to src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/item.png diff --git a/src/main/resources/assets/create/textures/block/flexpeater_charging.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered.png similarity index 100% rename from src/main/resources/assets/create/textures/block/flexpeater_charging.png rename to src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered.png diff --git a/src/main/resources/assets/create/textures/block/flexpeater_on.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered_powering.png similarity index 100% rename from src/main/resources/assets/create/textures/block/flexpeater_on.png rename to src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powered_powering.png diff --git a/src/main/resources/assets/create/textures/block/flexpeater_powering.png b/src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powering.png similarity index 100% rename from src/main/resources/assets/create/textures/block/flexpeater_powering.png rename to src/main/resources/assets/create/textures/block/diodes/adjustable_repeater/powering.png diff --git a/src/main/resources/assets/create/textures/block/redstone_latch.png b/src/main/resources/assets/create/textures/block/diodes/powered_latch/idle.png similarity index 100% rename from src/main/resources/assets/create/textures/block/redstone_latch.png rename to src/main/resources/assets/create/textures/block/diodes/powered_latch/idle.png diff --git a/src/main/resources/assets/create/textures/block/redstone_latch_powered.png b/src/main/resources/assets/create/textures/block/diodes/powered_latch/powering.png similarity index 100% rename from src/main/resources/assets/create/textures/block/redstone_latch_powered.png rename to src/main/resources/assets/create/textures/block/diodes/powered_latch/powering.png diff --git a/src/main/resources/assets/create/textures/block/toggle_latch.png b/src/main/resources/assets/create/textures/block/diodes/powered_toggle_latch/idle.png similarity index 100% rename from src/main/resources/assets/create/textures/block/toggle_latch.png rename to src/main/resources/assets/create/textures/block/diodes/powered_toggle_latch/idle.png diff --git a/src/main/resources/assets/create/textures/block/toggle_latch_powered.png b/src/main/resources/assets/create/textures/block/diodes/powered_toggle_latch/powered.png similarity index 100% rename from src/main/resources/assets/create/textures/block/toggle_latch_powered.png rename to src/main/resources/assets/create/textures/block/diodes/powered_toggle_latch/powered.png diff --git a/src/main/resources/assets/create/textures/block/toggle_latch_powered_powering.png b/src/main/resources/assets/create/textures/block/diodes/powered_toggle_latch/powered_powering.png similarity index 100% rename from src/main/resources/assets/create/textures/block/toggle_latch_powered_powering.png rename to src/main/resources/assets/create/textures/block/diodes/powered_toggle_latch/powered_powering.png diff --git a/src/main/resources/assets/create/textures/block/toggle_latch_powering.png b/src/main/resources/assets/create/textures/block/diodes/powered_toggle_latch/powering.png similarity index 100% rename from src/main/resources/assets/create/textures/block/toggle_latch_powering.png rename to src/main/resources/assets/create/textures/block/diodes/powered_toggle_latch/powering.png diff --git a/src/main/resources/assets/create/textures/block/pulse_repeater.png b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/idle.png similarity index 100% rename from src/main/resources/assets/create/textures/block/pulse_repeater.png rename to src/main/resources/assets/create/textures/block/diodes/pulse_repeater/idle.png diff --git a/src/main/resources/assets/create/textures/block/pulse_repeater_powered.png b/src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered.png similarity index 100% rename from src/main/resources/assets/create/textures/block/pulse_repeater_powered.png rename to src/main/resources/assets/create/textures/block/diodes/pulse_repeater/powered.png diff --git a/src/main/resources/assets/create/textures/block/package_funnel_horizontal.png b/src/main/resources/assets/create/textures/block/funnel_horizontal.png similarity index 100% rename from src/main/resources/assets/create/textures/block/package_funnel_horizontal.png rename to src/main/resources/assets/create/textures/block/funnel_horizontal.png diff --git a/src/main/resources/assets/create/textures/block/package_funnel_vertical.png b/src/main/resources/assets/create/textures/block/funnel_vertical.png similarity index 100% rename from src/main/resources/assets/create/textures/block/package_funnel_vertical.png rename to src/main/resources/assets/create/textures/block/funnel_vertical.png diff --git a/src/main/resources/assets/create/textures/block/indicator/0.png b/src/main/resources/assets/create/textures/block/indicator/0.png index 587a8cf84..48796b897 100644 Binary files a/src/main/resources/assets/create/textures/block/indicator/0.png and b/src/main/resources/assets/create/textures/block/indicator/0.png differ diff --git a/src/main/resources/assets/create/textures/block/indicator/1.png b/src/main/resources/assets/create/textures/block/indicator/1.png index 99db8f666..06d58a33c 100644 Binary files a/src/main/resources/assets/create/textures/block/indicator/1.png and b/src/main/resources/assets/create/textures/block/indicator/1.png differ diff --git a/src/main/resources/assets/create/textures/block/indicator/2.png b/src/main/resources/assets/create/textures/block/indicator/2.png index f0b9cdd5c..074f83e94 100644 Binary files a/src/main/resources/assets/create/textures/block/indicator/2.png and b/src/main/resources/assets/create/textures/block/indicator/2.png differ diff --git a/src/main/resources/assets/create/textures/block/indicator/3.png b/src/main/resources/assets/create/textures/block/indicator/3.png index fdee59c07..04f07e234 100644 Binary files a/src/main/resources/assets/create/textures/block/indicator/3.png and b/src/main/resources/assets/create/textures/block/indicator/3.png differ diff --git a/src/main/resources/assets/create/textures/block/indicator/4.png b/src/main/resources/assets/create/textures/block/indicator/4.png index 886099dfe..01bdf1442 100644 Binary files a/src/main/resources/assets/create/textures/block/indicator/4.png and b/src/main/resources/assets/create/textures/block/indicator/4.png differ diff --git a/src/main/resources/assets/create/textures/block/indicator/5.png b/src/main/resources/assets/create/textures/block/indicator/5.png index 289ff99db..340859fc2 100644 Binary files a/src/main/resources/assets/create/textures/block/indicator/5.png and b/src/main/resources/assets/create/textures/block/indicator/5.png differ diff --git a/src/main/resources/assets/create/textures/block/indicator/6.png b/src/main/resources/assets/create/textures/block/indicator/6.png index 43826d8c2..9254eb340 100644 Binary files a/src/main/resources/assets/create/textures/block/indicator/6.png and b/src/main/resources/assets/create/textures/block/indicator/6.png differ diff --git a/src/main/resources/assets/create/textures/block/mossy_gabbro_bricks.png b/src/main/resources/assets/create/textures/block/mossy_gabbro_bricks.png deleted file mode 100644 index e8468d2cd..000000000 Binary files a/src/main/resources/assets/create/textures/block/mossy_gabbro_bricks.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/slightly_mossy_gabbro_bricks.png b/src/main/resources/assets/create/textures/block/slightly_mossy_gabbro_bricks.png deleted file mode 100644 index 9d45f4511..000000000 Binary files a/src/main/resources/assets/create/textures/block/slightly_mossy_gabbro_bricks.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/stockpile_switch_end.png b/src/main/resources/assets/create/textures/block/stockpile_switch_end.png index dc60158a2..89751b111 100644 Binary files a/src/main/resources/assets/create/textures/block/stockpile_switch_end.png and b/src/main/resources/assets/create/textures/block/stockpile_switch_end.png differ diff --git a/src/main/resources/assets/create/textures/block/windowed_belttunnel.png b/src/main/resources/assets/create/textures/block/windowed_belttunnel.png deleted file mode 100644 index c7194a2a6..000000000 Binary files a/src/main/resources/assets/create/textures/block/windowed_belttunnel.png and /dev/null differ diff --git a/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_crate.json similarity index 87% rename from src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_crate.json index b6a5eeb5e..61a5854aa 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/flexcrate.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_crate.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "create:flexcrate", + "item": "create:adjustable_crate", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/flexpulsepeater.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_pulse_repeater.json similarity index 70% rename from src/main/resources/data/create/recipes/crafting_shaped/flexpulsepeater.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_pulse_repeater.json index 2c64cf03c..3aae7c147 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/flexpulsepeater.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_pulse_repeater.json @@ -5,14 +5,14 @@ ], "key": { "P": { - "item": "create:flexpeater" + "item": "create:adjustable_repeater" }, "S": { "item": "create:pulse_repeater" } }, "result": { - "item": "create:flexpulsepeater", + "item": "create:adjustable_pulse_repeater", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/flexpeater.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_repeater.json similarity index 91% rename from src/main/resources/data/create/recipes/crafting_shaped/flexpeater.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_repeater.json index 1e7784270..7388e25a3 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/flexpeater.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/adjustable_repeater.json @@ -19,7 +19,7 @@ } }, "result": { - "item": "create:flexpeater", + "item": "create:adjustable_repeater", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/belt_observer.json similarity index 89% rename from src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/belt_observer.json index cd435b700..81cb5f8a4 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/entity_detector.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/belt_observer.json @@ -19,7 +19,7 @@ } }, "result": { - "item": "create:entity_detector", + "item": "create:belt_observer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/belt_tunnel.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/belt_tunnel.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/belt_tunnel.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/extractor.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/extractor.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/extractor.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/extractor.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/funnel.json similarity index 90% rename from src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/funnel.json index fdfe4ac60..db043947f 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/belt_funnel.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/funnel.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "create:belt_funnel", + "item": "create:funnel", "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/redstone_latch.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/powered_latch.json similarity index 92% rename from src/main/resources/data/create/recipes/crafting_shaped/redstone_latch.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/powered_latch.json index 0739ef907..ee918aa2d 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/redstone_latch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/powered_latch.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "create:redstone_latch", + "item": "create:powered_latch", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/toggle_latch.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/powered_toggle_latch.json similarity index 90% rename from src/main/resources/data/create/recipes/crafting_shaped/toggle_latch.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/powered_toggle_latch.json index 9de7d5a25..a0387b9f1 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/toggle_latch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/powered_toggle_latch.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "create:toggle_latch", + "item": "create:powered_toggle_latch", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/pulse_repeater.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/pulse_repeater.json similarity index 100% rename from src/main/resources/data/create/recipes/crafting_shaped/pulse_repeater.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/pulse_repeater.json diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contact.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/redstone_contact.json similarity index 87% rename from src/main/resources/data/create/recipes/crafting_shaped/contact.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/redstone_contact.json index abee0ef3c..0120ff567 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contact.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/redstone_contact.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "create:contact", + "item": "create:redstone_contact", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/redstone_bridge.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/redstone_link.json similarity index 90% rename from src/main/resources/data/create/recipes/crafting_shaped/redstone_bridge.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/redstone_link.json index 755930779..0151f604f 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/redstone_bridge.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/redstone_link.json @@ -16,7 +16,7 @@ } }, "result": { - "item": "create:redstone_bridge", + "item": "create:redstone_link", "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/stockpile_switch.json similarity index 88% rename from src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/stockpile_switch.json index e9abe18ed..db67132d6 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/stockswitch.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/stockpile_switch.json @@ -19,7 +19,7 @@ } }, "result": { - "item": "create:stockswitch", + "item": "create:stockpile_switch", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/transposer.json b/src/main/resources/data/create/recipes/crafting_shaped/logistics/transposer.json similarity index 85% rename from src/main/resources/data/create/recipes/crafting_shaped/transposer.json rename to src/main/resources/data/create/recipes/crafting_shaped/logistics/transposer.json index d265f7749..463850124 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/transposer.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/logistics/transposer.json @@ -5,7 +5,7 @@ ], "key": { "P": { - "item": "create:belt_funnel" + "item": "create:funnel" }, "S": { "item": "create:extractor"