diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 78fe2c7e0..342abde45 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -5,27 +5,36 @@ f0d6baaabda94151134f569246d61a6e710c35a9 assets\create\blockstates\acacia_window 4e8d61aa2c8490301317ef747f67f0169ebfc2ed assets\create\blockstates\andesite_bricks_slab.json da63a8be3191d6d72afef6c79e3aea3f607631f9 assets\create\blockstates\andesite_bricks_stairs.json a579c40c43dc2174afb66f42d00d0c4a0efaaeee assets\create\blockstates\andesite_bricks_wall.json +9999a75c7766781eadb12510a09264600bc846e4 assets\create\blockstates\andesite_casing.json 3af4ea3c44b5ebc7e1e3fb73fb8356faf067a613 assets\create\blockstates\andesite_cobblestone.json 97adf53a7cb99d7652fb39adc957e9e34cbaca47 assets\create\blockstates\andesite_cobblestone_slab.json 96b5284693da168ab8e0809d86515b5f1a7e763f assets\create\blockstates\andesite_cobblestone_stairs.json 82bd82270aff7d51e9239680ef4dd7b5c899ceb0 assets\create\blockstates\andesite_cobblestone_wall.json 9210df936a886dc4727deec204f06359dd1f14e9 assets\create\blockstates\andesite_pillar.json +f9fa6aa530eb0891a74eadfbebc663172a57147a assets\create\blockstates\basin.json 96a4fae5883eda130f8ec1a57d34534f6d0793c4 assets\create\blockstates\belt.json cf9045eb16e5299a1d917c4cb536289f49411276 assets\create\blockstates\birch_window.json 94a1a91403eb4b035fec48071e7fcae57a8a6abd assets\create\blockstates\birch_window_pane.json 8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets\create\blockstates\brass_block.json +b8dd6e505943e06706d0718ece620ab3cf943650 assets\create\blockstates\brass_casing.json +4a5e49de9e0d6b278f737af936a743e03a6c361a assets\create\blockstates\cart_assembler.json 7299cea212d879d6d5611bd139b24768b9af236f assets\create\blockstates\chiseled_dark_scoria.json 0f01f813388d3e6907c1cfd992e4b21c914e267e assets\create\blockstates\chiseled_dolomite.json 324488e0c228f38f2597b2f76849e962bc1a7d90 assets\create\blockstates\chiseled_gabbro.json 2ca82a3c4bf7ba1a9cf3bb674e786d9b23b020a4 assets\create\blockstates\chiseled_limestone.json cbcdab42d01f8085db9e5f8db884f8adf7f17625 assets\create\blockstates\chiseled_scoria.json 291952556c52fba2af5bbd793c71af81abd27e71 assets\create\blockstates\chiseled_weathered_limestone.json +4947c261310445fa55b92038326ac82967d192dd assets\create\blockstates\clockwork_bearing.json 86101bf2f0a5cec159c8b0e4c45ff0a73759c8b6 assets\create\blockstates\clutch.json 10e6e789e00253da08db14e885a2cd24b7306047 assets\create\blockstates\cogwheel.json f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets\create\blockstates\copper_block.json +cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets\create\blockstates\copper_casing.json 3355a852cdc717e257ca19b3db836068964733e3 assets\create\blockstates\copper_ore.json dc76bca1fdd41c8e6ada27fd59a2b73d7adc9596 assets\create\blockstates\copper_shingles.json f0031f5e970b3d5695472ed384950b8631b015ed assets\create\blockstates\creative_motor.json +46af6c7d1e9041e44f5ea495b0b61dcf662b9b70 assets\create\blockstates\crushing_wheel.json +a1dd6cb3daa97ea871290ef7b178d28b564ee2a2 assets\create\blockstates\crushing_wheel_controller.json +b1126c191877cff86b4e2de83e1fcbd151451cb7 assets\create\blockstates\cuckoo_clock.json 1726b1b9e04a0634e7e1fdcf1cf4cc898efc5c2f assets\create\blockstates\dark_oak_window.json 50d4627d8e8b5adade12de764ab528ddacfa9ea5 assets\create\blockstates\dark_oak_window_pane.json 21e435ad3baf69970446b0acd3db0d6d02dc9fcb assets\create\blockstates\dark_scoria.json @@ -38,6 +47,7 @@ bfab7d9b2e01183d47a828f2827125771efa97fc assets\create\blockstates\dark_scoria_b f86eea3f7df0988fffbe90e29b74141a7203cd15 assets\create\blockstates\dark_scoria_cobblestone_stairs.json f1020a33fcb1a362b6c55b5aa8ce093e47ebde09 assets\create\blockstates\dark_scoria_cobblestone_wall.json 1cbba7ea7b2456b617a8b6e71059beb037462a00 assets\create\blockstates\dark_scoria_pillar.json +ac85f55d82d96fc15750e6b954297cfd1e00d04d assets\create\blockstates\deployer.json c890ec9b3778aebb16c6b2eb2ca79bfbe7bf7435 assets\create\blockstates\diorite_bricks.json 894d5ca00c3765553deaac44b83257983acf502d assets\create\blockstates\diorite_bricks_slab.json e42f2ebe5a2fdaeed62b9bc289252664a1e8705b assets\create\blockstates\diorite_bricks_stairs.json @@ -57,6 +67,7 @@ a2b7259dacf7b582e3b819e12015b5e18a1768e5 assets\create\blockstates\dolomite_cobb e7c1db7226df5858f1884f0cf328a733fec22c3d assets\create\blockstates\dolomite_cobblestone_stairs.json f63a5816d4bfe643aa098d03c3b54462dd06fe19 assets\create\blockstates\dolomite_cobblestone_wall.json 6d7f0c92ee978366d2b019e35cf2fc6a2e4de37d assets\create\blockstates\dolomite_pillar.json +5fca916e329ccf449f6e60eb5ac7dd7efd250a23 assets\create\blockstates\drill.json 7b1c40891b07c8f3238537625d9e25c8627e7333 assets\create\blockstates\encased_belt.json 7b2b836649e729feafa60972bf95e3afb2143131 assets\create\blockstates\encased_fan.json 373ac3c29b553322291599e93eac12000c4a87f8 assets\create\blockstates\encased_shaft.json @@ -96,8 +107,10 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets\create\blockstates\fancy_scoria_ fc9ac0a7e7191b93516719455a17177fa6524ecc assets\create\blockstates\fancy_weathered_limestone_bricks_slab.json b2a7c321b1795f20e7433f81a55ce4683de081b8 assets\create\blockstates\fancy_weathered_limestone_bricks_stairs.json 6372fe02ba0065acb0758121c45a15a1a8fdc5de assets\create\blockstates\fancy_weathered_limestone_bricks_wall.json +e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets\create\blockstates\flywheel.json ac00d40e1ef50a37041c0481afa1a23a14dea78e assets\create\blockstates\framed_glass.json 61df7769fa61f6dd2868a4377e54320fdd473b4e assets\create\blockstates\framed_glass_pane.json +3cf49f4812732f00f578fa73785e14ffdf340f21 assets\create\blockstates\furnace_engine.json f512b70d7fd0ca10184f21f5bfb71c83ab11f8ef assets\create\blockstates\gabbro.json d2358eb3d9337741f55339f0b94b2e81d73965c8 assets\create\blockstates\gabbro_bricks.json a5c87f9f5b8dd1573c1f2f770a5558f3dc244f96 assets\create\blockstates\gabbro_bricks_slab.json @@ -119,6 +132,8 @@ a4b0337149cb0617cc60061477c7178d37dbb831 assets\create\blockstates\granite_cobbl d97fdea02187e63f6b63913357c79a18660d676d assets\create\blockstates\granite_cobblestone_stairs.json 9ce66b5a61c3aad398756d26e4efee2b9e12a275 assets\create\blockstates\granite_cobblestone_wall.json b51450d748285d3b13951a46deef940da7ae18ad assets\create\blockstates\granite_pillar.json +6ab675fa06317e6d07c0c1a453e7bb43e3f46b3b assets\create\blockstates\hand_crank.json +d7aad9c1ec992c42576490f633c9a3317983945c assets\create\blockstates\harvester.json be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets\create\blockstates\horizontal_framed_glass.json 18d9fdaa1352a7e2ec91135e46dae5c02ccd8f8f assets\create\blockstates\horizontal_framed_glass_pane.json 5d851c90d23de5087ce546d4bbe509e112b84c49 assets\create\blockstates\jungle_window.json @@ -144,6 +159,14 @@ 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 +ddcf4bb281e046fbb1026b8f46a2cf12448598df assets\create\blockstates\mechanical_bearing.json +5586beef2d9183dc34d8e8d2723620c0569592ae assets\create\blockstates\mechanical_crafter.json +d9afcfa27c42df5fd54a7b783acb0eb45ddf5aa5 assets\create\blockstates\mechanical_mixer.json +da612a05f94dc19e07e250efc35a7b2839d2ee76 assets\create\blockstates\mechanical_piston.json +94ec340a50b2406f833735f7501a1840c692e32a assets\create\blockstates\mechanical_piston_head.json +92269fe66d7b83095a2e04e121af0be792f55dd6 assets\create\blockstates\mechanical_press.json +4e48ad0936647065c2322390e7c0fe115c853a98 assets\create\blockstates\millstone.json +468202df0802e17c75fcad0993daf1bc5300ca91 assets\create\blockstates\minecart_anchor.json 6a42f86aaff8ced70aaa6adb9460614ab40c21e5 assets\create\blockstates\mossy_andesite.json bd49d8df2c3b0e07f599026db5dc1e67f4fa6199 assets\create\blockstates\mossy_dark_scoria.json d1fad9fa7f6d948fd68a31a86fe1b952bf80817b assets\create\blockstates\mossy_diorite.json @@ -153,7 +176,9 @@ a3ae5fb61cb07ae6fcb78ba68435bda8c31d4430 assets\create\blockstates\mossy_granite 6bc9137697dc2b3f0aa4b20d1802814885ccb059 assets\create\blockstates\mossy_limestone.json 5b75b8e8e922b00c43ce030740da5472df207868 assets\create\blockstates\mossy_scoria.json 3feafb33a6ba03687a521c1b196536c0427fff77 assets\create\blockstates\mossy_weathered_limestone.json +b1126c191877cff86b4e2de83e1fcbd151451cb7 assets\create\blockstates\mysterious_cuckoo_clock.json 8d56251190c94204fa238ff32734a0761273669f assets\create\blockstates\natural_scoria.json +36e46e65003a8d0b8555fe5e8f8dc980d6559bc5 assets\create\blockstates\nozzle.json cf60989f63f02067fc4e4ad25033ac83167cdeb0 assets\create\blockstates\oak_window.json 4a796509c3953171f04f957351282205840b3760 assets\create\blockstates\oak_window_pane.json 8e2028e1a0450a592eed5e10276ba19b1195a206 assets\create\blockstates\ornate_iron_window.json @@ -203,6 +228,8 @@ c17d334e938dcb742550ba8307ca8266a1fc9b49 assets\create\blockstates\paved_weather cb23aef25f3106b06c8fa8f152c638bb0d2185d8 assets\create\blockstates\paved_weathered_limestone_slab.json d62b0992cec1de45dad1f2c273132225f4ef33a0 assets\create\blockstates\paved_weathered_limestone_stairs.json dba4cf86e82ed4502fffed363fbce226a445e774 assets\create\blockstates\paved_weathered_limestone_wall.json +975c97018e9e2419943eaab43aed0970e96feaf7 assets\create\blockstates\piston_extension_pole.json +eec748fc6c0d770f03188f63edc046ea4fc18253 assets\create\blockstates\plough.json 2f764f460aa1d75ba995da180bc6f8d2bd9db385 assets\create\blockstates\polished_dark_scoria.json 262b22dcf3e151e63f58710f6b6fe4fc4fc2a70c assets\create\blockstates\polished_dark_scoria_slab.json a0dbcb7651b02a4f5c747ad2c6d35da60f768d9b assets\create\blockstates\polished_dark_scoria_stairs.json @@ -227,6 +254,13 @@ c8467d55bc22d2e2256b8b732c06c9fdc64d336f assets\create\blockstates\polished_weat 5d811eab3c5e8411f98e2ea98d93d35955ce18fc assets\create\blockstates\polished_weathered_limestone_slab.json 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 +3a739f9d4276828d83f2d2750bf3227c87bcd438 assets\create\blockstates\pulley_magnet.json +e2990fe70ad5d10437a376e70e167d1856277cc1 assets\create\blockstates\rope.json +e14d5f7252105934295b4e156ec0e6d62d3d6b1c assets\create\blockstates\rope_pulley.json +c9f668eba43bb6deb536883f33a5b63d2f2cbbd6 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 7120f29e4b88a1c40125a8cdbe8af3570f4ee352 assets\create\blockstates\schematic_table.json a5befc14551f043675e985027609aeb7e6bacc0d assets\create\blockstates\scoria.json @@ -239,11 +273,18 @@ be96a5541f211a6929fa04ec3535cb62ce7d4a2d assets\create\blockstates\scoria_cobble 41d1fbbdfb038e474254bee5284561342fea0fc9 assets\create\blockstates\scoria_cobblestone_stairs.json b6e50f46a02f833f2f2bafa8585a909b6da5e229 assets\create\blockstates\scoria_cobblestone_wall.json b3f0bf24585f495a7936bcaf5ecd36420378563a assets\create\blockstates\scoria_pillar.json +81931eb1027dfb42ba4b2186185a4c0a36e0dbe4 assets\create\blockstates\sequenced_gearshift.json 1c77f8a4618ccd25e77fd6d2b9faafa3a9320ce7 assets\create\blockstates\shaft.json +e815bfd854c2653f10828bb11950f7fb991d7efc assets\create\blockstates\speedometer.json d62b7908119fa4f51715a186d0882b388bb25cab assets\create\blockstates\spruce_window.json 8d7dfa60630a8b4bae4e8eca5c66e1cfa34dda1f assets\create\blockstates\spruce_window_pane.json +3d93eabbb327aecc526beae9c62283f1d43eb710 assets\create\blockstates\sticky_mechanical_piston.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 +a8094531617e27a545c4815ab2062bf0ffca3633 assets\create\blockstates\turntable.json 69dfe8afaa8eb6105dae9f76ab8b7847bf90b8c6 assets\create\blockstates\vertical_framed_glass.json c4db76b9d36cfb098df0d158cb6f8b82768ebe14 assets\create\blockstates\vertical_framed_glass_pane.json d995547bcd71603ba7378d8998098e462030bfd0 assets\create\blockstates\water_wheel.json @@ -259,8 +300,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 -350ccf4bf90982344b692676638a64756bd7643d assets\create\lang\en_ud.json -4534b8c0efe107d7afc925ed0616246b7c7ea7ff assets\create\lang\en_us.json +2b653a2b4e363bc91c4a56b082483fa9326d142e assets\create\lang\en_ud.json +a38c07513ebb78240dd4d8362dec06beadb057a5 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 @@ -285,6 +326,7 @@ d190170ebddb64c7874ef18e380dc6ece8f46007 assets\create\models\block\adjustable_p 87d60652c7ceb8f03a26c2e0853243d1f397555a assets\create\models\block\andesite_bricks_stairs_outer.json f0a955282f7abd5ce0b412ec7b59024113ca970a assets\create\models\block\andesite_bricks_wall_post.json 0ed2fa65af49b5c92c4e5c688c155e37d3d6b118 assets\create\models\block\andesite_bricks_wall_side.json +b9943c5585fc081385ea49a4199efeb6c7c22423 assets\create\models\block\andesite_casing.json 77a045e855eb37d2da7ed8f7d27a85b9546c0ab8 assets\create\models\block\andesite_cobblestone.json 7d816d54c85bc7d0cc8db9c68abcba960daa7b43 assets\create\models\block\andesite_cobblestone_slab.json 5179ecd1f926bf3211a1a3f033dfd1d2368eeb20 assets\create\models\block\andesite_cobblestone_slab_top.json @@ -301,12 +343,15 @@ b1d0bb538fc8285b7d3fd77a977d78a104b83b62 assets\create\models\block\andesite_pil 62b3f2edc5ef5d7dabbcff19220921b0e3582376 assets\create\models\block\birch_window_pane_side.json 95d4230eb366f5e7684820c9337e3956ed34042a assets\create\models\block\birch_window_pane_side_alt.json 0934933df6bfbb19a1b14cd0e3cab2c18d5a3ebc assets\create\models\block\brass_block.json +166a5c053a81e6aadc24509ed24dc144a7255969 assets\create\models\block\brass_casing.json 028a07b49c05fe8a93f1d8c229d81e73d887c2df assets\create\models\block\chiseled_dark_scoria.json b1f9ee4867373dd8f976625bab744a1c72c7fd16 assets\create\models\block\chiseled_dolomite.json cd7751090cf3d55296b8e415d0af9b6f18d69770 assets\create\models\block\chiseled_gabbro.json d2e195aa2e90c712e51d855a9a4a334b52f62a69 assets\create\models\block\chiseled_limestone.json ac07568fa7b2d3fa84d0fe89a498514d30514291 assets\create\models\block\chiseled_scoria.json 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 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 @@ -519,6 +564,7 @@ abef3f97c28321ded3bafc90918377981038d7b2 assets\create\models\block\limestone_co eee8ae85daa99fcd594da3d4af393726af69493b assets\create\models\block\limestone_cobblestone_wall_post.json 0effd13c1ff224f4c2d7017c6505f48d31815934 assets\create\models\block\limestone_cobblestone_wall_side.json 7336e008b3af80e054c9f15be381b7fe307e97d4 assets\create\models\block\limestone_pillar.json +0492070642fda75b943080022368505f2d065730 assets\create\models\block\mechanical_bearing.json edf6ee4e590ebf162c00aa952d992f1bee2cad8a assets\create\models\block\mossy_andesite.json 55256e4df0038a619d80d3e6c50b0f3e3682e90a assets\create\models\block\mossy_dark_scoria.json 7b9609eaf8933de6db1a7114fd6631e7d9a16dd1 assets\create\models\block\mossy_diorite.json @@ -709,6 +755,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 +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 +ed7a94b10fb1f0284d20bbe1842f2600e8d9e566 assets\create\models\block\rotation_chassis_side_y_sticky.json +1a253849de1e01e815ea2aac7288259df07390c2 assets\create\models\block\rotation_chassis_side_z.json +5e70e4a838330aebfd224fd2be01733c0cd9d006 assets\create\models\block\rotation_chassis_side_z_sticky.json c145d8e0d7f8f41afa80b9727a107b2ad2f0c3c9 assets\create\models\block\scoria.json 59c6f6a4ffe43485244a8561d7e8341f796e268b assets\create\models\block\scoria_bricks.json d86ca38a0c1bac89e545916c59f23f6f0c9f7d7a assets\create\models\block\scoria_bricks_slab.json @@ -739,6 +791,14 @@ aea7061aed39bc8c9ab51c8d7d0d86b11fc9e6b4 assets\create\models\block\spruce_windo 3d293702831960ba6d924753d1fd35de71256c13 assets\create\models\block\tiled_glass_pane_post.json efed7cdc64a732129964e8f8a9a20ff015f7d287 assets\create\models\block\tiled_glass_pane_side.json 1384613ed9e7f9cd737190703d932466a7143f35 assets\create\models\block\tiled_glass_pane_side_alt.json +7ec582cc46eee26589f462b8009a284931cde9fd assets\create\models\block\translation_chassis.json +c751862776ab7bdeaded3fdffc1ded04805d723a assets\create\models\block\translation_chassis_bottom.json +f5b9739f78ba79590068e22ee75e277a938599df assets\create\models\block\translation_chassis_secondary.json +b0ff692b3708fa360511de9e9f7b18628a2ff154 assets\create\models\block\translation_chassis_secondary_bottom.json +2702f3b837ff4668afd259634dce865f3d2c3a48 assets\create\models\block\translation_chassis_secondary_top.json +187668fcba3526e0255ec6b7363db741e586d9c2 assets\create\models\block\translation_chassis_secondary_top_bottom.json +b73f22068491dab6a4c26d1da11015e27f85ad74 assets\create\models\block\translation_chassis_top.json +ecfeadf4fd4cb61500c0200b8485ce8fbe1df989 assets\create\models\block\translation_chassis_top_bottom.json 9730fcb02f679087e81e24c836751e625be6a298 assets\create\models\block\vertical_framed_glass.json d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets\create\models\block\vertical_framed_glass_pane_noside.json 3e975bec02e2670ce2b1868cebcbd780a5ebf3f8 assets\create\models\block\vertical_framed_glass_pane_noside_alt.json @@ -772,26 +832,34 @@ a513af38f164a48fd44693b70a93012f3546caff assets\create\models\item\andesite_bric 851090d21c6e6c67444324d975c6b3270eaf4ff2 assets\create\models\item\andesite_bricks_slab.json d283f86cd05ed378efd82ce46cf49bc83783069b assets\create\models\item\andesite_bricks_stairs.json 3954907be88f0b6713cec8dcfe0ff665ce33bbd4 assets\create\models\item\andesite_bricks_wall.json +174c9705d25f149052835fdcf7c85626afead90b assets\create\models\item\andesite_casing.json 1fd20e35848e47483f4f3e3ca3376b0519178952 assets\create\models\item\andesite_cobblestone.json 1ceb0e49f2c46f1d5414d5fd6edfc2bdd3afa6f7 assets\create\models\item\andesite_cobblestone_slab.json b0f664dd6de3d0ee9afcb6223fbcd53b97fa0d65 assets\create\models\item\andesite_cobblestone_stairs.json 4856d13a72ec0af9f10226b4a4bf0567eb580b9a assets\create\models\item\andesite_cobblestone_wall.json 75b8b00c2418b9660d35a7fabd0774925cf1c02f assets\create\models\item\andesite_pillar.json +bf1fc6bdf7fca6f1958a2d3e96202c1cecb50669 assets\create\models\item\basin.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 +f5a18f4279c2e845a5967b1c2f9e807c2bb77afb assets\create\models\item\brass_casing.json +7fcb2a4d0bbe434f269b5bcaffebe410913297be assets\create\models\item\cart_assembler.json 99d64b76b3baa84c3bd4b96ccd3376ca12425950 assets\create\models\item\chiseled_dark_scoria.json 83d3571eacde52568786802b268f24c6578c1e5d assets\create\models\item\chiseled_dolomite.json afd697168c9786eb80e54eccdc6a23afa6c7fb0e assets\create\models\item\chiseled_gabbro.json 0cb1692f6cdd007ac690fd1f0222dde3429d136f assets\create\models\item\chiseled_limestone.json a47fbe5f2da79080d99ef0975bfa8da4d08f8be4 assets\create\models\item\chiseled_scoria.json 70232ce9b88119fb383717e2c1ad113f7aad6a99 assets\create\models\item\chiseled_weathered_limestone.json +b1531a7bd3f7f27b9587d13e818a93dc2d088bc8 assets\create\models\item\clockwork_bearing.json 0a2a0f0aafeab0088172f77afd40c1fa2cc1f2b8 assets\create\models\item\clutch.json dcb09deae110077bcddf090996b51cc66e9a7de3 assets\create\models\item\cogwheel.json 965a90a882d85dba93b30af9bce7ecf8e68ce747 assets\create\models\item\copper_block.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 5b39403f6c81f05e566b621b62e267267de47c41 assets\create\models\item\creative_motor.json +823c91f63565db54ec3944a1e90e7aee18e41062 assets\create\models\item\crushing_wheel.json +dae5cffa4e1263d6a113469f79fba8695fa8232a assets\create\models\item\cuckoo_clock.json f786a43e296d9f10d7c302fe3ae9cddf4ba9984e assets\create\models\item\dark_oak_window.json e3e9ebbc694edad1f473e5c3a897d95cc87528ae assets\create\models\item\dark_oak_window_pane.json f0e98871e4bb68c29954f2de24566a6404f21d9c assets\create\models\item\dark_scoria.json @@ -804,6 +872,7 @@ b50e3471476783be80f28bb4e3543f5a426b9eb6 assets\create\models\item\dark_scoria_b e67fe11e9036c81f0f54d368b41a971822a84a32 assets\create\models\item\dark_scoria_cobblestone_stairs.json 59c87e6a439fbcbbbb254e07e7b48209ea31e40c assets\create\models\item\dark_scoria_cobblestone_wall.json f5b2995929ac9dca9857d4618660ffa7778d5618 assets\create\models\item\dark_scoria_pillar.json +2104c1276259ab67b94f3d4fe97e14b6bc6941ac assets\create\models\item\deployer.json a97ca9b6fc3e10a9c9409b27458a852222045e4e assets\create\models\item\diorite_bricks.json 7a28bb619d37a37ed82509d2ff395d76b4435961 assets\create\models\item\diorite_bricks_slab.json 920804b7380cca2c477d9f901e045597234246d7 assets\create\models\item\diorite_bricks_stairs.json @@ -823,6 +892,7 @@ f92bc71df40567367d08798a6ea45e7e8d0b07b0 assets\create\models\item\dolomite_cobb be7de1e1529fb2a2e842204136520a760676d4e9 assets\create\models\item\dolomite_cobblestone_stairs.json 6b03f2be8fa1e62a89d59859e7d40f9e45ab8b65 assets\create\models\item\dolomite_cobblestone_wall.json e974cd23a5456baef8b634f2d21fd8c3822931ab assets\create\models\item\dolomite_pillar.json +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 @@ -862,8 +932,10 @@ ce6ee1fe4a92e26af75c2eaebd5055efdbdff169 assets\create\models\item\fancy_scoria_ 8fc219b471382cf67d2271edda14d173d40ae661 assets\create\models\item\fancy_weathered_limestone_bricks_slab.json 7c1ed1241d55b105f7acb997d7c0e24b4b945293 assets\create\models\item\fancy_weathered_limestone_bricks_stairs.json 7bdb3d8a59586654df0c2a84d73a346b898d247b assets\create\models\item\fancy_weathered_limestone_bricks_wall.json +8707332c0cb6ee123e7962d08536a60725c64ce8 assets\create\models\item\flywheel.json d62b93d3c274d280f3eec22a28b5175943411d25 assets\create\models\item\framed_glass.json 1041d462c6e856f7f3f2365c299c0599703d1ed7 assets\create\models\item\framed_glass_pane.json +0bee2855dc9bad52e941153b87e9c35797c246ee assets\create\models\item\furnace_engine.json 2c1608c114ccc285a84e936dc3f1233c535e1a26 assets\create\models\item\gabbro.json c35900cae8508c292a73239e560cebae17980f96 assets\create\models\item\gabbro_bricks.json b10971277417369f421324b28f0a4b47ce4c8625 assets\create\models\item\gabbro_bricks_slab.json @@ -885,6 +957,8 @@ c1bb87fdbbefaf74e1ead186c43417a051ab3965 assets\create\models\item\granite_cobbl 3c5f83809f945134a861d4ea600a1708de58a422 assets\create\models\item\granite_cobblestone_stairs.json e2d8561a8048fe6144362d13478bba4825588810 assets\create\models\item\granite_cobblestone_wall.json b84a947a1b297513c85bb8d2dbbb780304c95e43 assets\create\models\item\granite_pillar.json +398b1a7c76c7bdb6a23b1248fdce98f6d835467f assets\create\models\item\hand_crank.json +74d745d5e702d3561921d3abb763534cee7d1cf7 assets\create\models\item\harvester.json e7ec65ad5be13cae5f7d60836b8df9e4a5baad56 assets\create\models\item\horizontal_framed_glass.json f0e3b2b8a553b6e61746c922c27302dabfff71b6 assets\create\models\item\horizontal_framed_glass_pane.json 83fa8699318e51f838b483b40b3e897c34ed53d1 assets\create\models\item\jungle_window.json @@ -910,6 +984,12 @@ 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 +49dcc373c33f6fc3760add10eb51bd96cd4fd028 assets\create\models\item\mechanical_bearing.json +65ac4f19973ddeb1bb4d672f57319130e736e116 assets\create\models\item\mechanical_crafter.json +06553037470a5ca5386c0d0bb1011d20580c0e76 assets\create\models\item\mechanical_mixer.json +f8d0d4b2a890ea7a69ab0c390947b48fe0478d3f assets\create\models\item\mechanical_piston.json +6c2acb80e53256fbb85f76851f335f9248ace6da assets\create\models\item\mechanical_press.json +0eb5726c8c0de462f432411c210d6132b2c446a4 assets\create\models\item\millstone.json dc43c88dc8ae1f425e1c10f422b09d97719af5bc assets\create\models\item\mossy_andesite.json 4ce9aabf9fa9e9e6af6b4339291e635708bdbcdf assets\create\models\item\mossy_dark_scoria.json d084f03d068d0b8c3b7c4d00014c168f61836770 assets\create\models\item\mossy_diorite.json @@ -919,7 +999,9 @@ ec459f0f04f75e5c2c27bdad0375adb9768d1ba1 assets\create\models\item\mossy_gabbro. 38d9a51ca24786b85398c4670a1e8cb9dc794037 assets\create\models\item\mossy_limestone.json 055f6c58addfd02d889ef6436d344b4d308a65a6 assets\create\models\item\mossy_scoria.json f384d2e28309c54207bd1c33abff99d015d698bd assets\create\models\item\mossy_weathered_limestone.json +dae5cffa4e1263d6a113469f79fba8695fa8232a assets\create\models\item\mysterious_cuckoo_clock.json b5c73d353fbe1d073f6a2901f221f178b858e385 assets\create\models\item\natural_scoria.json +366a60447bbbd61eb25aecf191a01e8d9417ad61 assets\create\models\item\nozzle.json 7a336a340f3e4927d7a35f9d79e8a03693b802aa assets\create\models\item\oak_window.json f274fe391ac584656c9817a5650b1c1e38e44c58 assets\create\models\item\oak_window_pane.json 0ffe242e3165d9a0e3fe16ad4c4ca91c7e9828b2 assets\create\models\item\ornate_iron_window.json @@ -969,6 +1051,8 @@ d60c4fb6e0e68d8f6c137a0c601145c342236c18 assets\create\models\item\paved_limesto 5ec22c676e301a7004ff7d127d20b46f49063c64 assets\create\models\item\paved_weathered_limestone_slab.json d81f85aea5e683539a0f3c805c154b76a9d88a9d assets\create\models\item\paved_weathered_limestone_stairs.json 25eaccadfbabb60301f487807b0e839d525f2c80 assets\create\models\item\paved_weathered_limestone_wall.json +04ce23dc141bedccc75b4512263da8b498f13205 assets\create\models\item\piston_extension_pole.json +ad38b068d8a58d162406db6a318042e9a142dc8a assets\create\models\item\plough.json 1f7846aa06c3c22614c98cbec9112cc8632fa1b8 assets\create\models\item\polished_dark_scoria.json c46f1191cfa225fa76973208646e7bd86d7fcb5f assets\create\models\item\polished_dark_scoria_slab.json db8c0604529f47f7ef50c5a91ec3eab112a649a0 assets\create\models\item\polished_dark_scoria_stairs.json @@ -993,6 +1077,11 @@ e95125318055b8557afd7d108488cf0bdd81fe49 assets\create\models\item\polished_scor 68fb04f7a89c8117bb641e347df9bfc1f1248335 assets\create\models\item\polished_weathered_limestone_slab.json 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 +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 +03027a6080a9f1c2f0d8e4eb09a0f6647bf860de assets\create\models\item\saw.json 0a1c4080ca572106c19a0ba6e2df4baba5f45d35 assets\create\models\item\schematicannon.json 8dd5caa4d7a0ee45bd9b39e09c4503159933d089 assets\create\models\item\schematic_table.json 22a6dfdc3cbb1b6ac20ec123b490e15c72dfbfcf assets\create\models\item\scoria.json @@ -1005,11 +1094,18 @@ f4107d5e5a573810873e1a52aaacda674d371e1b assets\create\models\item\scoria_cobble fe8c7476b1386fc05a57a93319f71455ba4cf29b assets\create\models\item\scoria_cobblestone_stairs.json b0061419cf7b7bd2dd548ff00ee28f1227ee2663 assets\create\models\item\scoria_cobblestone_wall.json 1f0cfa084107c05b010556f609371285295a0d12 assets\create\models\item\scoria_pillar.json +0df94333da5700f01dcf4ffa46e3f3bf26bb8cf7 assets\create\models\item\sequenced_gearshift.json 106ae694f7e03a218c37003dca8291b1d39b3c55 assets\create\models\item\shaft.json +d6fb0d38b1b5bcc199b52ac8889eaecd167f6725 assets\create\models\item\speedometer.json 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 +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 +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 ae20383b0b0806431d0fdd8ffdd16fe2b0cc61ad assets\create\models\item\water_wheel.json @@ -1055,13 +1151,13 @@ df6f220e693f5256bb3df8d6c7769bc931820ae5 data\create\advancements\recipes\create 22e0798a182df482aa6e7b3da5312ea2e21b9e7d data\create\advancements\recipes\create.base\copper_shingles.json 82280c50b78dd7e8c179cb8e8f0c074b26ec9586 data\create\advancements\recipes\create.base\zinc_block.json e0b9edc5e59647e7dd99be17369b263dadf407d4 data\create\advancements\refined_radiance.json -f381c97192bce5279f846c72b41100e702c5bc98 data\create\advancements\root.json +fc12b590ab8f5ac901db21c67ba3850f157e1421 data\create\advancements\root.json 29932febc2c1e5fdb4b0074ff70963b3f1777e1c data\create\advancements\saw.json 8529fc7919b6a3240ede2bb8043906bb72fb7f9e data\create\advancements\shadow_end.json c1f162e773518f6b1481221e3e63f9ba33fed647 data\create\advancements\shadow_steel.json 290e1248254abcfd7f1e73906be25662331378ec data\create\advancements\shifting_gears.json -561dd0501ba0cff080a6ff415b9b7522505d6595 data\create\advancements\speed_gauge.json -5d41ce33f3fe14331fa9fb8bc2bdb8206081330a data\create\advancements\stress_gauge.json +7eac9a5f9f96087a74cab1576c59b1b4a9f99ffe data\create\advancements\speed_gauge.json +b457a54be7202999be24bb6bcce534f310489412 data\create\advancements\stress_gauge.json 5e460cc958989e6e72ac5d6604430711d8099690 data\create\advancements\symmetry_wand.json ff5f41874304e709d6f3a59da00edd033047b81b data\create\advancements\upgraded_zapper.json 50935316d27336ef0858d5a7c5ccc563d288a494 data\create\advancements\water_wheel.json @@ -1107,6 +1203,7 @@ a5a7ba88a1d38da83b37bbe842dc7cc0544f37be data\create\loot_tables\blocks\copper_s b160899aa785dc54d8c6cc095337f70b81f3e44f data\create\loot_tables\blocks\creative_crate.json d8f2f8921b9200b1d9476a77ee1be32c25308ac3 data\create\loot_tables\blocks\creative_motor.json c28fa42746a4d5ca2f824001b67e58673810169e data\create\loot_tables\blocks\crushing_wheel.json +205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\crushing_wheel_controller.json d370ee874b5b6b98e9a8c368218fe61f644d956d data\create\loot_tables\blocks\cuckoo_clock.json 077c2f6f957afcc1925a96f80b6261fca484263a data\create\loot_tables\blocks\dark_oak_window.json 5abd6030828decc9f84963786dce88d194cdbcdb data\create\loot_tables\blocks\dark_oak_window_pane.json @@ -1243,8 +1340,10 @@ dac789cf53b00eed34308848b5e267b7ccec090c data\create\loot_tables\blocks\linked_e e93872a90e4f4642a003539e7db28fdacfdcd114 data\create\loot_tables\blocks\mechanical_crafter.json b12efeeef5682966016ce6ea2d171eecd33d9667 data\create\loot_tables\blocks\mechanical_mixer.json 2599be757a55464af338ef0a01e3772690d7eaf8 data\create\loot_tables\blocks\mechanical_piston.json +205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\mechanical_piston_head.json 0e0742d066bda87ba5cc835a4028efb99e70b2f2 data\create\loot_tables\blocks\mechanical_press.json efbd4689e7d6740b80357203d1e02196f0752efa data\create\loot_tables\blocks\millstone.json +205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\minecart_anchor.json 53215ac772bee2f88052266b82213aaf668660e9 data\create\loot_tables\blocks\mossy_andesite.json 1bf4a13a44e5cc03d730b2aa537e60426062786e data\create\loot_tables\blocks\mossy_dark_scoria.json 956e6cc0c6314c9c01610b643785eed48d2d9317 data\create\loot_tables\blocks\mossy_diorite.json @@ -1306,7 +1405,7 @@ dfeba5c6de20e9ec0252e43b7c4046f017284d3d data\create\loot_tables\blocks\paved_we 32eed137f13c25a7b9db2fb457901e0c03cabb16 data\create\loot_tables\blocks\paved_weathered_limestone_slab.json 67b9227237ed2a8c09c4183c0f2ab1b3bd07084b data\create\loot_tables\blocks\paved_weathered_limestone_stairs.json d3e4ab984aef19ee21a1c5b868eb3fde96c05afd data\create\loot_tables\blocks\paved_weathered_limestone_wall.json -38ff0bfbac300a78a817011ab97a142b518068d5 data\create\loot_tables\blocks\piston_pole.json +1087b6c6d88dc7c71ed81e1d3e180fe065e6d098 data\create\loot_tables\blocks\piston_extension_pole.json 265b1deb1392ab5d04e725fa75656cd49d36ae46 data\create\loot_tables\blocks\plough.json 05302657546d8d410e367e84d4d5e01f01523236 data\create\loot_tables\blocks\polished_dark_scoria.json 1b323a883816428ff851462f61d00eaee7255e33 data\create\loot_tables\blocks\polished_dark_scoria_slab.json @@ -1333,9 +1432,11 @@ 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 +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 +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 aa6af37356d65105efab2503ffe75f778cfe873b data\create\loot_tables\blocks\rotation_speed_controller.json @@ -1354,12 +1455,12 @@ d2139e9daa55c09cd262b15c980d65c554347e45 data\create\loot_tables\blocks\scoria_c 82fb40738f53892571ad83789ff45315e887c811 data\create\loot_tables\blocks\scoria_pillar.json e4f6dccb8bce21b5214c1d8cfb440fc0ba4159d7 data\create\loot_tables\blocks\sequenced_gearshift.json b127cb6920e6d7d9c8b2402cb186402a9a8dd3fc data\create\loot_tables\blocks\shaft.json -9ab3c754ccceef95e6d951f65eda1a1f4de3002f data\create\loot_tables\blocks\speed_gauge.json +70b6e82e9198d3910877e62c2eab86d46ca27089 data\create\loot_tables\blocks\speedometer.json 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 -066d06ffcb4b74af2483a1d9fb17b04b4acc7aeb data\create\loot_tables\blocks\stress_gauge.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 diff --git a/src/generated/resources/assets/create/blockstates/andesite_casing.json b/src/generated/resources/assets/create/blockstates/andesite_casing.json new file mode 100644 index 000000000..7fdc66c31 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/andesite_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/andesite_casing" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/basin.json b/src/generated/resources/assets/create/blockstates/basin.json new file mode 100644 index 000000000..2bc6fd9d1 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/basin.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/basin" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/brass_casing.json b/src/generated/resources/assets/create/blockstates/brass_casing.json new file mode 100644 index 000000000..4cc3d6e46 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/brass_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/brass_casing" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/cart_assembler.json b/src/generated/resources/assets/create/blockstates/cart_assembler.json new file mode 100644 index 000000000..2972bbf8f --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/cart_assembler.json @@ -0,0 +1,18 @@ +{ + "variants": { + "powered=false,shape=north_south": { + "model": "create:block/cart_assembler/block" + }, + "powered=true,shape=north_south": { + "model": "create:block/cart_assembler/block_powered" + }, + "powered=false,shape=east_west": { + "model": "create:block/cart_assembler/block", + "y": 90 + }, + "powered=true,shape=east_west": { + "model": "create:block/cart_assembler/block_powered", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/clockwork_bearing.json b/src/generated/resources/assets/create/blockstates/clockwork_bearing.json new file mode 100644 index 000000000..38ad28d30 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/clockwork_bearing.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/clockwork_bearing", + "x": 180 + }, + "facing=up": { + "model": "create:block/clockwork_bearing" + }, + "facing=north": { + "model": "create:block/clockwork_bearing", + "x": 90 + }, + "facing=south": { + "model": "create:block/clockwork_bearing", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/clockwork_bearing", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/clockwork_bearing", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/copper_casing.json b/src/generated/resources/assets/create/blockstates/copper_casing.json new file mode 100644 index 000000000..56b13703f --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/copper_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/copper_casing" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/crushing_wheel.json b/src/generated/resources/assets/create/blockstates/crushing_wheel.json new file mode 100644 index 000000000..59167f20b --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/crushing_wheel.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "create:block/crushing_wheel", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "create:block/crushing_wheel" + }, + "axis=z": { + "model": "create:block/crushing_wheel", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/crushing_wheel_controller.json b/src/generated/resources/assets/create/blockstates/crushing_wheel_controller.json new file mode 100644 index 000000000..2f859dc9e --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/crushing_wheel_controller.json @@ -0,0 +1,10 @@ +{ + "variants": { + "valid=false": { + "model": "minecraft:block/air" + }, + "valid=true": { + "model": "minecraft:block/air" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/cuckoo_clock.json b/src/generated/resources/assets/create/blockstates/cuckoo_clock.json new file mode 100644 index 000000000..df80ece2d --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/cuckoo_clock.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "create:block/cuckoo_clock/block" + }, + "facing=south": { + "model": "create:block/cuckoo_clock/block", + "y": 180 + }, + "facing=west": { + "model": "create:block/cuckoo_clock/block", + "y": 270 + }, + "facing=east": { + "model": "create:block/cuckoo_clock/block", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/deployer.json b/src/generated/resources/assets/create/blockstates/deployer.json new file mode 100644 index 000000000..e2be81afe --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/deployer.json @@ -0,0 +1,52 @@ +{ + "variants": { + "axis_along_first=false,facing=down": { + "model": "create:block/deployer/horizontal", + "x": 270, + "y": 90 + }, + "axis_along_first=true,facing=down": { + "model": "create:block/deployer/horizontal", + "x": 270 + }, + "axis_along_first=false,facing=up": { + "model": "create:block/deployer/horizontal", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=up": { + "model": "create:block/deployer/horizontal", + "x": 90 + }, + "axis_along_first=false,facing=north": { + "model": "create:block/deployer/vertical", + "y": 180 + }, + "axis_along_first=true,facing=north": { + "model": "create:block/deployer/horizontal", + "y": 180 + }, + "axis_along_first=false,facing=south": { + "model": "create:block/deployer/vertical" + }, + "axis_along_first=true,facing=south": { + "model": "create:block/deployer/horizontal" + }, + "axis_along_first=false,facing=west": { + "model": "create:block/deployer/horizontal", + "y": 90 + }, + "axis_along_first=true,facing=west": { + "model": "create:block/deployer/vertical", + "y": 90 + }, + "axis_along_first=false,facing=east": { + "model": "create:block/deployer/horizontal", + "y": 270 + }, + "axis_along_first=true,facing=east": { + "model": "create:block/deployer/vertical", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/drill.json b/src/generated/resources/assets/create/blockstates/drill.json new file mode 100644 index 000000000..a73831728 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/drill.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/drill/block", + "x": 180 + }, + "facing=up": { + "model": "create:block/drill/block" + }, + "facing=north": { + "model": "create:block/drill/block", + "x": 90 + }, + "facing=south": { + "model": "create:block/drill/block", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/drill/block", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/drill/block", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/flywheel.json b/src/generated/resources/assets/create/blockstates/flywheel.json new file mode 100644 index 000000000..380bc21bb --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/flywheel.json @@ -0,0 +1,49 @@ +{ + "variants": { + "connection=none,facing=north": { + "model": "create:block/flywheel/casing_none", + "y": 270 + }, + "connection=left,facing=north": { + "model": "create:block/flywheel/casing_left", + "y": 270 + }, + "connection=right,facing=north": { + "model": "create:block/flywheel/casing_right", + "y": 270 + }, + "connection=none,facing=south": { + "model": "create:block/flywheel/casing_none", + "y": 90 + }, + "connection=left,facing=south": { + "model": "create:block/flywheel/casing_left", + "y": 90 + }, + "connection=right,facing=south": { + "model": "create:block/flywheel/casing_right", + "y": 90 + }, + "connection=none,facing=west": { + "model": "create:block/flywheel/casing_none", + "y": 180 + }, + "connection=left,facing=west": { + "model": "create:block/flywheel/casing_left", + "y": 180 + }, + "connection=right,facing=west": { + "model": "create:block/flywheel/casing_right", + "y": 180 + }, + "connection=none,facing=east": { + "model": "create:block/flywheel/casing_none" + }, + "connection=left,facing=east": { + "model": "create:block/flywheel/casing_left" + }, + "connection=right,facing=east": { + "model": "create:block/flywheel/casing_right" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/furnace_engine.json b/src/generated/resources/assets/create/blockstates/furnace_engine.json new file mode 100644 index 000000000..6d10935d6 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/furnace_engine.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "create:block/furnace_engine/block" + }, + "facing=south": { + "model": "create:block/furnace_engine/block", + "y": 180 + }, + "facing=west": { + "model": "create:block/furnace_engine/block", + "y": 270 + }, + "facing=east": { + "model": "create:block/furnace_engine/block", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/hand_crank.json b/src/generated/resources/assets/create/blockstates/hand_crank.json new file mode 100644 index 000000000..e10d67ce0 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/hand_crank.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/hand_crank/block", + "x": 180 + }, + "facing=up": { + "model": "create:block/hand_crank/block" + }, + "facing=north": { + "model": "create:block/hand_crank/block", + "x": 90 + }, + "facing=south": { + "model": "create:block/hand_crank/block", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/hand_crank/block", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/hand_crank/block", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/harvester.json b/src/generated/resources/assets/create/blockstates/harvester.json new file mode 100644 index 000000000..b8fd40611 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/harvester.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "create:block/harvester/block" + }, + "facing=south": { + "model": "create:block/harvester/block", + "y": 180 + }, + "facing=west": { + "model": "create:block/harvester/block", + "y": 270 + }, + "facing=east": { + "model": "create:block/harvester/block", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/mechanical_bearing.json b/src/generated/resources/assets/create/blockstates/mechanical_bearing.json new file mode 100644 index 000000000..97fd52d1f --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/mechanical_bearing.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/mechanical_bearing", + "x": 180 + }, + "facing=up": { + "model": "create:block/mechanical_bearing" + }, + "facing=north": { + "model": "create:block/mechanical_bearing", + "x": 90 + }, + "facing=south": { + "model": "create:block/mechanical_bearing", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/mechanical_bearing", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/mechanical_bearing", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/mechanical_crafter.json b/src/generated/resources/assets/create/blockstates/mechanical_crafter.json new file mode 100644 index 000000000..4a74d8676 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/mechanical_crafter.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=north,pointing=up": { + "model": "create:block/mechanical_crafter/block" + }, + "facing=south,pointing=up": { + "model": "create:block/mechanical_crafter/block", + "y": 180 + }, + "facing=west,pointing=up": { + "model": "create:block/mechanical_crafter/block", + "y": 270 + }, + "facing=east,pointing=up": { + "model": "create:block/mechanical_crafter/block", + "y": 90 + }, + "facing=north,pointing=left": { + "model": "create:block/mechanical_crafter/block" + }, + "facing=south,pointing=left": { + "model": "create:block/mechanical_crafter/block", + "y": 180 + }, + "facing=west,pointing=left": { + "model": "create:block/mechanical_crafter/block", + "y": 270 + }, + "facing=east,pointing=left": { + "model": "create:block/mechanical_crafter/block", + "y": 90 + }, + "facing=north,pointing=down": { + "model": "create:block/mechanical_crafter/block" + }, + "facing=south,pointing=down": { + "model": "create:block/mechanical_crafter/block", + "y": 180 + }, + "facing=west,pointing=down": { + "model": "create:block/mechanical_crafter/block", + "y": 270 + }, + "facing=east,pointing=down": { + "model": "create:block/mechanical_crafter/block", + "y": 90 + }, + "facing=north,pointing=right": { + "model": "create:block/mechanical_crafter/block" + }, + "facing=south,pointing=right": { + "model": "create:block/mechanical_crafter/block", + "y": 180 + }, + "facing=west,pointing=right": { + "model": "create:block/mechanical_crafter/block", + "y": 270 + }, + "facing=east,pointing=right": { + "model": "create:block/mechanical_crafter/block", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/mechanical_mixer.json b/src/generated/resources/assets/create/blockstates/mechanical_mixer.json new file mode 100644 index 000000000..3f9b0b0d8 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/mechanical_mixer.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/mechanical_mixer/block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/mechanical_piston.json b/src/generated/resources/assets/create/blockstates/mechanical_piston.json new file mode 100644 index 000000000..0b7e8ebfb --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/mechanical_piston.json @@ -0,0 +1,160 @@ +{ + "variants": { + "axis_along_first=false,facing=down,state=retracted": { + "model": "create:block/mechanical_piston/normal/block", + "x": 180 + }, + "axis_along_first=true,facing=down,state=retracted": { + "model": "create:block/mechanical_piston/normal/block_rotated", + "x": 180 + }, + "axis_along_first=false,facing=up,state=retracted": { + "model": "create:block/mechanical_piston/normal/block" + }, + "axis_along_first=true,facing=up,state=retracted": { + "model": "create:block/mechanical_piston/normal/block_rotated" + }, + "axis_along_first=false,facing=north,state=retracted": { + "model": "create:block/mechanical_piston/normal/block", + "x": 90 + }, + "axis_along_first=true,facing=north,state=retracted": { + "model": "create:block/mechanical_piston/normal/block_rotated", + "x": 90 + }, + "axis_along_first=false,facing=south,state=retracted": { + "model": "create:block/mechanical_piston/normal/block", + "x": 90, + "y": 180 + }, + "axis_along_first=true,facing=south,state=retracted": { + "model": "create:block/mechanical_piston/normal/block_rotated", + "x": 90, + "y": 180 + }, + "axis_along_first=false,facing=west,state=retracted": { + "model": "create:block/mechanical_piston/normal/block_rotated", + "x": 90, + "y": 270 + }, + "axis_along_first=true,facing=west,state=retracted": { + "model": "create:block/mechanical_piston/normal/block", + "x": 90, + "y": 270 + }, + "axis_along_first=false,facing=east,state=retracted": { + "model": "create:block/mechanical_piston/normal/block_rotated", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=east,state=retracted": { + "model": "create:block/mechanical_piston/normal/block", + "x": 90, + "y": 90 + }, + "axis_along_first=false,facing=down,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 180 + }, + "axis_along_first=true,facing=down,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 180 + }, + "axis_along_first=false,facing=up,state=moving": { + "model": "create:block/mechanical_piston/moving/block" + }, + "axis_along_first=true,facing=up,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated" + }, + "axis_along_first=false,facing=north,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 90 + }, + "axis_along_first=true,facing=north,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 90 + }, + "axis_along_first=false,facing=south,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 90, + "y": 180 + }, + "axis_along_first=true,facing=south,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 90, + "y": 180 + }, + "axis_along_first=false,facing=west,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 90, + "y": 270 + }, + "axis_along_first=true,facing=west,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 90, + "y": 270 + }, + "axis_along_first=false,facing=east,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=east,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 90, + "y": 90 + }, + "axis_along_first=false,facing=down,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 180 + }, + "axis_along_first=true,facing=down,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 180 + }, + "axis_along_first=false,facing=up,state=extended": { + "model": "create:block/mechanical_piston/extended/block" + }, + "axis_along_first=true,facing=up,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated" + }, + "axis_along_first=false,facing=north,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 90 + }, + "axis_along_first=true,facing=north,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 90 + }, + "axis_along_first=false,facing=south,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 90, + "y": 180 + }, + "axis_along_first=true,facing=south,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 90, + "y": 180 + }, + "axis_along_first=false,facing=west,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 90, + "y": 270 + }, + "axis_along_first=true,facing=west,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 90, + "y": 270 + }, + "axis_along_first=false,facing=east,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=east,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/mechanical_piston_head.json b/src/generated/resources/assets/create/blockstates/mechanical_piston_head.json new file mode 100644 index 000000000..a97257b0a --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/mechanical_piston_head.json @@ -0,0 +1,56 @@ +{ + "variants": { + "facing=down,type=normal": { + "model": "create:block/mechanical_piston/normal/head", + "x": 180 + }, + "facing=up,type=normal": { + "model": "create:block/mechanical_piston/normal/head" + }, + "facing=north,type=normal": { + "model": "create:block/mechanical_piston/normal/head", + "x": 90 + }, + "facing=south,type=normal": { + "model": "create:block/mechanical_piston/normal/head", + "x": 90, + "y": 180 + }, + "facing=west,type=normal": { + "model": "create:block/mechanical_piston/normal/head", + "x": 90, + "y": 270 + }, + "facing=east,type=normal": { + "model": "create:block/mechanical_piston/normal/head", + "x": 90, + "y": 90 + }, + "facing=down,type=sticky": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 180 + }, + "facing=up,type=sticky": { + "model": "create:block/mechanical_piston/sticky/head" + }, + "facing=north,type=sticky": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 90 + }, + "facing=south,type=sticky": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 90, + "y": 180 + }, + "facing=west,type=sticky": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 90, + "y": 270 + }, + "facing=east,type=sticky": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/mechanical_press.json b/src/generated/resources/assets/create/blockstates/mechanical_press.json new file mode 100644 index 000000000..5508dd837 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/mechanical_press.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "create:block/mechanical_press/block" + }, + "facing=south": { + "model": "create:block/mechanical_press/block", + "y": 180 + }, + "facing=west": { + "model": "create:block/mechanical_press/block", + "y": 270 + }, + "facing=east": { + "model": "create:block/mechanical_press/block", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/millstone.json b/src/generated/resources/assets/create/blockstates/millstone.json new file mode 100644 index 000000000..6d97d9aab --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/millstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/millstone/block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/minecart_anchor.json b/src/generated/resources/assets/create/blockstates/minecart_anchor.json new file mode 100644 index 000000000..e2be29cc3 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/minecart_anchor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/cart_assembler/minecart_anchor" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/mysterious_cuckoo_clock.json b/src/generated/resources/assets/create/blockstates/mysterious_cuckoo_clock.json new file mode 100644 index 000000000..df80ece2d --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/mysterious_cuckoo_clock.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "create:block/cuckoo_clock/block" + }, + "facing=south": { + "model": "create:block/cuckoo_clock/block", + "y": 180 + }, + "facing=west": { + "model": "create:block/cuckoo_clock/block", + "y": 270 + }, + "facing=east": { + "model": "create:block/cuckoo_clock/block", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/nozzle.json b/src/generated/resources/assets/create/blockstates/nozzle.json new file mode 100644 index 000000000..f8b8eef95 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/nozzle.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/nozzle/block", + "x": 180 + }, + "facing=up": { + "model": "create:block/nozzle/block" + }, + "facing=north": { + "model": "create:block/nozzle/block", + "x": 90 + }, + "facing=south": { + "model": "create:block/nozzle/block", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/nozzle/block", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/nozzle/block", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/piston_extension_pole.json b/src/generated/resources/assets/create/blockstates/piston_extension_pole.json new file mode 100644 index 000000000..987043b22 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/piston_extension_pole.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/piston_extension_pole", + "x": 180 + }, + "facing=up": { + "model": "create:block/piston_extension_pole" + }, + "facing=north": { + "model": "create:block/piston_extension_pole", + "x": 90 + }, + "facing=south": { + "model": "create:block/piston_extension_pole", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/piston_extension_pole", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/piston_extension_pole", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/plough.json b/src/generated/resources/assets/create/blockstates/plough.json new file mode 100644 index 000000000..f9463ecb8 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/plough.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "create:block/plough" + }, + "facing=south": { + "model": "create:block/plough", + "y": 180 + }, + "facing=west": { + "model": "create:block/plough", + "y": 270 + }, + "facing=east": { + "model": "create:block/plough", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/portable_storage_interface.json b/src/generated/resources/assets/create/blockstates/portable_storage_interface.json new file mode 100644 index 000000000..463c071a2 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/portable_storage_interface.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/portable_storage_interface", + "x": 180 + }, + "facing=up": { + "model": "create:block/portable_storage_interface" + }, + "facing=north": { + "model": "create:block/portable_storage_interface", + "x": 90 + }, + "facing=south": { + "model": "create:block/portable_storage_interface", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/portable_storage_interface", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/portable_storage_interface", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/pulley_magnet.json b/src/generated/resources/assets/create/blockstates/pulley_magnet.json new file mode 100644 index 000000000..00052c498 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/pulley_magnet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/rope_pulley/pulley_magnet" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/rope.json b/src/generated/resources/assets/create/blockstates/rope.json new file mode 100644 index 000000000..30114f6af --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/rope.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/rope_pulley/rope" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/rope_pulley.json b/src/generated/resources/assets/create/blockstates/rope_pulley.json new file mode 100644 index 000000000..e9fc41c9f --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/rope_pulley.json @@ -0,0 +1,11 @@ +{ + "variants": { + "axis=x": { + "model": "create:block/rope_pulley/block", + "y": 90 + }, + "axis=z": { + "model": "create:block/rope_pulley/block" + } + } +} \ 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 new file mode 100644 index 000000000..98cbb8d30 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/rotation_chassis.json @@ -0,0 +1,267 @@ +{ + "multipart": [ + { + "when": { + "axis": "x" + }, + "apply": { + "model": "create:block/rotation_chassis/base", + "x": 90, + "y": 90 + } + }, + { + "when": { + "axis": "y" + }, + "apply": { + "model": "create:block/rotation_chassis/base" + } + }, + { + "when": { + "axis": "z" + }, + "apply": { + "model": "create:block/rotation_chassis/base", + "x": 90 + } + }, + { + "when": { + "axis": "x", + "sticky_south": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x_sticky", + "x": 180 + } + }, + { + "when": { + "axis": "y", + "sticky_south": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_y_sticky" + } + }, + { + "when": { + "axis": "z", + "sticky_south": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x_sticky", + "x": 180, + "y": 90 + } + }, + { + "when": { + "axis": "x", + "sticky_south": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x", + "x": 180 + } + }, + { + "when": { + "axis": "y", + "sticky_south": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_y" + } + }, + { + "when": { + "axis": "z", + "sticky_south": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x", + "x": 180, + "y": 90 + } + }, + { + "when": { + "axis": "x", + "sticky_west": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x_sticky", + "x": 90 + } + }, + { + "when": { + "axis": "y", + "sticky_west": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_y_sticky", + "y": 90 + } + }, + { + "when": { + "axis": "z", + "sticky_west": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_z_sticky", + "y": 180 + } + }, + { + "when": { + "axis": "x", + "sticky_west": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x", + "x": 90 + } + }, + { + "when": { + "axis": "y", + "sticky_west": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_y", + "y": 90 + } + }, + { + "when": { + "axis": "z", + "sticky_west": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_z", + "y": 180 + } + }, + { + "when": { + "axis": "x", + "sticky_north": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x_sticky" + } + }, + { + "when": { + "axis": "y", + "sticky_north": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_y_sticky", + "y": 180 + } + }, + { + "when": { + "axis": "z", + "sticky_north": "true" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x_sticky", + "y": 90 + } + }, + { + "when": { + "axis": "x", + "sticky_north": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x" + } + }, + { + "when": { + "axis": "y", + "sticky_north": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_y", + "y": 180 + } + }, + { + "when": { + "axis": "z", + "sticky_north": "false" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x", + "y": 90 + } + }, + { + "when": { + "sticky_east": "true", + "axis": "x" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x_sticky", + "x": 270 + } + }, + { + "when": { + "sticky_east": "true", + "axis": "y" + }, + "apply": { + "model": "create:block/rotation_chassis_side_y_sticky", + "y": 270 + } + }, + { + "when": { + "sticky_east": "true", + "axis": "z" + }, + "apply": { + "model": "create:block/rotation_chassis_side_z_sticky" + } + }, + { + "when": { + "sticky_east": "false", + "axis": "x" + }, + "apply": { + "model": "create:block/rotation_chassis_side_x", + "x": 270 + } + }, + { + "when": { + "sticky_east": "false", + "axis": "y" + }, + "apply": { + "model": "create:block/rotation_chassis_side_y", + "y": 270 + } + }, + { + "when": { + "sticky_east": "false", + "axis": "z" + }, + "apply": { + "model": "create:block/rotation_chassis_side_z" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/rotation_speed_controller.json b/src/generated/resources/assets/create/blockstates/rotation_speed_controller.json new file mode 100644 index 000000000..ebae30eac --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/rotation_speed_controller.json @@ -0,0 +1,11 @@ +{ + "variants": { + "axis=x": { + "model": "create:block/rotation_speed_controller/block", + "y": 90 + }, + "axis=z": { + "model": "create:block/rotation_speed_controller/block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/saw.json b/src/generated/resources/assets/create/blockstates/saw.json new file mode 100644 index 000000000..7c19c0aae --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/saw.json @@ -0,0 +1,96 @@ +{ + "variants": { + "axis_along_first=false,facing=down,running=false": { + "model": "create:block/saw/vertical_inactive", + "x": 180 + }, + "axis_along_first=true,facing=down,running=false": { + "model": "create:block/saw/vertical_inactive", + "x": 180, + "y": 90 + }, + "axis_along_first=false,facing=up,running=false": { + "model": "create:block/saw/vertical_inactive" + }, + "axis_along_first=true,facing=up,running=false": { + "model": "create:block/saw/vertical_inactive", + "y": 90 + }, + "axis_along_first=false,facing=north,running=false": { + "model": "create:block/saw/horizontal_inactive", + "y": 180 + }, + "axis_along_first=true,facing=north,running=false": { + "model": "create:block/saw/horizontal_inactive", + "y": 180 + }, + "axis_along_first=false,facing=south,running=false": { + "model": "create:block/saw/horizontal_inactive" + }, + "axis_along_first=true,facing=south,running=false": { + "model": "create:block/saw/horizontal_inactive" + }, + "axis_along_first=false,facing=west,running=false": { + "model": "create:block/saw/horizontal_inactive", + "y": 90 + }, + "axis_along_first=true,facing=west,running=false": { + "model": "create:block/saw/horizontal_inactive", + "y": 90 + }, + "axis_along_first=false,facing=east,running=false": { + "model": "create:block/saw/horizontal_inactive", + "y": 270 + }, + "axis_along_first=true,facing=east,running=false": { + "model": "create:block/saw/horizontal_inactive", + "y": 270 + }, + "axis_along_first=false,facing=down,running=true": { + "model": "create:block/saw/vertical", + "x": 180 + }, + "axis_along_first=true,facing=down,running=true": { + "model": "create:block/saw/vertical", + "x": 180, + "y": 90 + }, + "axis_along_first=false,facing=up,running=true": { + "model": "create:block/saw/vertical" + }, + "axis_along_first=true,facing=up,running=true": { + "model": "create:block/saw/vertical", + "y": 90 + }, + "axis_along_first=false,facing=north,running=true": { + "model": "create:block/saw/horizontal", + "y": 180 + }, + "axis_along_first=true,facing=north,running=true": { + "model": "create:block/saw/horizontal", + "y": 180 + }, + "axis_along_first=false,facing=south,running=true": { + "model": "create:block/saw/horizontal" + }, + "axis_along_first=true,facing=south,running=true": { + "model": "create:block/saw/horizontal" + }, + "axis_along_first=false,facing=west,running=true": { + "model": "create:block/saw/horizontal", + "y": 90 + }, + "axis_along_first=true,facing=west,running=true": { + "model": "create:block/saw/horizontal", + "y": 90 + }, + "axis_along_first=false,facing=east,running=true": { + "model": "create:block/saw/horizontal", + "y": 270 + }, + "axis_along_first=true,facing=east,running=true": { + "model": "create:block/saw/horizontal", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/sequenced_gearshift.json b/src/generated/resources/assets/create/blockstates/sequenced_gearshift.json new file mode 100644 index 000000000..c8dca37cc --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/sequenced_gearshift.json @@ -0,0 +1,100 @@ +{ + "variants": { + "axis=x,state=0,vertical=false": { + "model": "create:block/sequenced_gearshift/idle", + "y": 90 + }, + "axis=z,state=0,vertical=false": { + "model": "create:block/sequenced_gearshift/idle" + }, + "axis=x,state=1,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_1", + "y": 90 + }, + "axis=z,state=1,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_1" + }, + "axis=x,state=2,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_2", + "y": 90 + }, + "axis=z,state=2,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_2" + }, + "axis=x,state=3,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_3", + "y": 90 + }, + "axis=z,state=3,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_3" + }, + "axis=x,state=4,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_4", + "y": 90 + }, + "axis=z,state=4,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_4" + }, + "axis=x,state=5,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_5", + "y": 90 + }, + "axis=z,state=5,vertical=false": { + "model": "create:block/sequenced_gearshift/seq_5" + }, + "axis=x,state=0,vertical=true": { + "model": "create:block/sequenced_gearshift/idle", + "x": 90, + "y": 90 + }, + "axis=z,state=0,vertical=true": { + "model": "create:block/sequenced_gearshift/idle", + "x": 90 + }, + "axis=x,state=1,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_1", + "x": 90, + "y": 90 + }, + "axis=z,state=1,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_1", + "x": 90 + }, + "axis=x,state=2,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_2", + "x": 90, + "y": 90 + }, + "axis=z,state=2,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_2", + "x": 90 + }, + "axis=x,state=3,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_3", + "x": 90, + "y": 90 + }, + "axis=z,state=3,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_3", + "x": 90 + }, + "axis=x,state=4,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_4", + "x": 90, + "y": 90 + }, + "axis=z,state=4,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_4", + "x": 90 + }, + "axis=x,state=5,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_5", + "x": 90, + "y": 90 + }, + "axis=z,state=5,vertical=true": { + "model": "create:block/sequenced_gearshift/seq_5", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/speedometer.json b/src/generated/resources/assets/create/blockstates/speedometer.json new file mode 100644 index 000000000..1946e3d39 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/speedometer.json @@ -0,0 +1,54 @@ +{ + "variants": { + "axis_along_first=false,facing=down": { + "model": "create:block/gauge/base", + "x": 180 + }, + "axis_along_first=true,facing=down": { + "model": "create:block/gauge/base", + "x": 180, + "y": 90 + }, + "axis_along_first=false,facing=up": { + "model": "create:block/gauge/base" + }, + "axis_along_first=true,facing=up": { + "model": "create:block/gauge/base", + "y": 90 + }, + "axis_along_first=false,facing=north": { + "model": "create:block/gauge/base_wall", + "x": 90, + "y": 270 + }, + "axis_along_first=true,facing=north": { + "model": "create:block/gauge/base_wall", + "y": 270 + }, + "axis_along_first=false,facing=south": { + "model": "create:block/gauge/base_wall", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=south": { + "model": "create:block/gauge/base_wall", + "y": 90 + }, + "axis_along_first=false,facing=west": { + "model": "create:block/gauge/base_wall", + "y": 180 + }, + "axis_along_first=true,facing=west": { + "model": "create:block/gauge/base_wall", + "x": 90, + "y": 180 + }, + "axis_along_first=false,facing=east": { + "model": "create:block/gauge/base_wall" + }, + "axis_along_first=true,facing=east": { + "model": "create:block/gauge/base_wall", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/sticky_mechanical_piston.json b/src/generated/resources/assets/create/blockstates/sticky_mechanical_piston.json new file mode 100644 index 000000000..755bd2516 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/sticky_mechanical_piston.json @@ -0,0 +1,160 @@ +{ + "variants": { + "axis_along_first=false,facing=down,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block", + "x": 180 + }, + "axis_along_first=true,facing=down,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block_rotated", + "x": 180 + }, + "axis_along_first=false,facing=up,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block" + }, + "axis_along_first=true,facing=up,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block_rotated" + }, + "axis_along_first=false,facing=north,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block", + "x": 90 + }, + "axis_along_first=true,facing=north,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block_rotated", + "x": 90 + }, + "axis_along_first=false,facing=south,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block", + "x": 90, + "y": 180 + }, + "axis_along_first=true,facing=south,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block_rotated", + "x": 90, + "y": 180 + }, + "axis_along_first=false,facing=west,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block_rotated", + "x": 90, + "y": 270 + }, + "axis_along_first=true,facing=west,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block", + "x": 90, + "y": 270 + }, + "axis_along_first=false,facing=east,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block_rotated", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=east,state=retracted": { + "model": "create:block/mechanical_piston/sticky/block", + "x": 90, + "y": 90 + }, + "axis_along_first=false,facing=down,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 180 + }, + "axis_along_first=true,facing=down,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 180 + }, + "axis_along_first=false,facing=up,state=moving": { + "model": "create:block/mechanical_piston/moving/block" + }, + "axis_along_first=true,facing=up,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated" + }, + "axis_along_first=false,facing=north,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 90 + }, + "axis_along_first=true,facing=north,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 90 + }, + "axis_along_first=false,facing=south,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 90, + "y": 180 + }, + "axis_along_first=true,facing=south,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 90, + "y": 180 + }, + "axis_along_first=false,facing=west,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 90, + "y": 270 + }, + "axis_along_first=true,facing=west,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 90, + "y": 270 + }, + "axis_along_first=false,facing=east,state=moving": { + "model": "create:block/mechanical_piston/moving/block_rotated", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=east,state=moving": { + "model": "create:block/mechanical_piston/moving/block", + "x": 90, + "y": 90 + }, + "axis_along_first=false,facing=down,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 180 + }, + "axis_along_first=true,facing=down,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 180 + }, + "axis_along_first=false,facing=up,state=extended": { + "model": "create:block/mechanical_piston/extended/block" + }, + "axis_along_first=true,facing=up,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated" + }, + "axis_along_first=false,facing=north,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 90 + }, + "axis_along_first=true,facing=north,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 90 + }, + "axis_along_first=false,facing=south,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 90, + "y": 180 + }, + "axis_along_first=true,facing=south,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 90, + "y": 180 + }, + "axis_along_first=false,facing=west,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 90, + "y": 270 + }, + "axis_along_first=true,facing=west,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 90, + "y": 270 + }, + "axis_along_first=false,facing=east,state=extended": { + "model": "create:block/mechanical_piston/extended/block_rotated", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=east,state=extended": { + "model": "create:block/mechanical_piston/extended/block", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/stressometer.json b/src/generated/resources/assets/create/blockstates/stressometer.json new file mode 100644 index 000000000..1946e3d39 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/stressometer.json @@ -0,0 +1,54 @@ +{ + "variants": { + "axis_along_first=false,facing=down": { + "model": "create:block/gauge/base", + "x": 180 + }, + "axis_along_first=true,facing=down": { + "model": "create:block/gauge/base", + "x": 180, + "y": 90 + }, + "axis_along_first=false,facing=up": { + "model": "create:block/gauge/base" + }, + "axis_along_first=true,facing=up": { + "model": "create:block/gauge/base", + "y": 90 + }, + "axis_along_first=false,facing=north": { + "model": "create:block/gauge/base_wall", + "x": 90, + "y": 270 + }, + "axis_along_first=true,facing=north": { + "model": "create:block/gauge/base_wall", + "y": 270 + }, + "axis_along_first=false,facing=south": { + "model": "create:block/gauge/base_wall", + "x": 90, + "y": 90 + }, + "axis_along_first=true,facing=south": { + "model": "create:block/gauge/base_wall", + "y": 90 + }, + "axis_along_first=false,facing=west": { + "model": "create:block/gauge/base_wall", + "y": 180 + }, + "axis_along_first=true,facing=west": { + "model": "create:block/gauge/base_wall", + "x": 90, + "y": 180 + }, + "axis_along_first=false,facing=east": { + "model": "create:block/gauge/base_wall" + }, + "axis_along_first=true,facing=east": { + "model": "create:block/gauge/base_wall", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/translation_chassis.json b/src/generated/resources/assets/create/blockstates/translation_chassis.json new file mode 100644 index 000000000..ce8469a2c --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/translation_chassis.json @@ -0,0 +1,52 @@ +{ + "variants": { + "axis=x,sticky_bottom=false,sticky_top=false": { + "model": "create:block/translation_chassis", + "x": 90, + "y": 90 + }, + "axis=y,sticky_bottom=false,sticky_top=false": { + "model": "create:block/translation_chassis" + }, + "axis=z,sticky_bottom=false,sticky_top=false": { + "model": "create:block/translation_chassis", + "x": 90 + }, + "axis=x,sticky_bottom=true,sticky_top=false": { + "model": "create:block/translation_chassis_bottom", + "x": 90, + "y": 90 + }, + "axis=y,sticky_bottom=true,sticky_top=false": { + "model": "create:block/translation_chassis_bottom" + }, + "axis=z,sticky_bottom=true,sticky_top=false": { + "model": "create:block/translation_chassis_bottom", + "x": 90 + }, + "axis=x,sticky_bottom=false,sticky_top=true": { + "model": "create:block/translation_chassis_top", + "x": 90, + "y": 90 + }, + "axis=y,sticky_bottom=false,sticky_top=true": { + "model": "create:block/translation_chassis_top" + }, + "axis=z,sticky_bottom=false,sticky_top=true": { + "model": "create:block/translation_chassis_top", + "x": 90 + }, + "axis=x,sticky_bottom=true,sticky_top=true": { + "model": "create:block/translation_chassis_top_bottom", + "x": 90, + "y": 90 + }, + "axis=y,sticky_bottom=true,sticky_top=true": { + "model": "create:block/translation_chassis_top_bottom" + }, + "axis=z,sticky_bottom=true,sticky_top=true": { + "model": "create:block/translation_chassis_top_bottom", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/translation_chassis_secondary.json b/src/generated/resources/assets/create/blockstates/translation_chassis_secondary.json new file mode 100644 index 000000000..775ce3fb9 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/translation_chassis_secondary.json @@ -0,0 +1,52 @@ +{ + "variants": { + "axis=x,sticky_bottom=false,sticky_top=false": { + "model": "create:block/translation_chassis_secondary", + "x": 90, + "y": 90 + }, + "axis=y,sticky_bottom=false,sticky_top=false": { + "model": "create:block/translation_chassis_secondary" + }, + "axis=z,sticky_bottom=false,sticky_top=false": { + "model": "create:block/translation_chassis_secondary", + "x": 90 + }, + "axis=x,sticky_bottom=true,sticky_top=false": { + "model": "create:block/translation_chassis_secondary_bottom", + "x": 90, + "y": 90 + }, + "axis=y,sticky_bottom=true,sticky_top=false": { + "model": "create:block/translation_chassis_secondary_bottom" + }, + "axis=z,sticky_bottom=true,sticky_top=false": { + "model": "create:block/translation_chassis_secondary_bottom", + "x": 90 + }, + "axis=x,sticky_bottom=false,sticky_top=true": { + "model": "create:block/translation_chassis_secondary_top", + "x": 90, + "y": 90 + }, + "axis=y,sticky_bottom=false,sticky_top=true": { + "model": "create:block/translation_chassis_secondary_top" + }, + "axis=z,sticky_bottom=false,sticky_top=true": { + "model": "create:block/translation_chassis_secondary_top", + "x": 90 + }, + "axis=x,sticky_bottom=true,sticky_top=true": { + "model": "create:block/translation_chassis_secondary_top_bottom", + "x": 90, + "y": 90 + }, + "axis=y,sticky_bottom=true,sticky_top=true": { + "model": "create:block/translation_chassis_secondary_top_bottom" + }, + "axis=z,sticky_bottom=true,sticky_top=true": { + "model": "create:block/translation_chassis_secondary_top_bottom", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/turntable.json b/src/generated/resources/assets/create/blockstates/turntable.json new file mode 100644 index 000000000..27b800e77 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/turntable.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/turntable" + } + } +} \ 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 f62f63772..a5f63cdb5 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -6,27 +6,36 @@ "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", "block.create.andesite_bricks_wall": "\u05DF\u05DF\u0250M s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F", + "block.create.andesite_casing": "bu\u0131s\u0250\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone": "\u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.andesite_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "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.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", + "block.create.brass_casing": "bu\u0131s\u0250\u0186 ss\u0250\u0279\u15FA", + "block.create.cart_assembler": "\u0279\u01DD\u05DFq\u026F\u01DDss\u2C6F \u0287\u0279\u0250\u0186", "block.create.chiseled_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_dolomite": "\u01DD\u0287\u0131\u026Fo\u05DFo\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_gabbro": "o\u0279qq\u0250\u2141 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_scoria": "\u0250\u0131\u0279o\u0254S p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", + "block.create.clockwork_bearing": "bu\u0131\u0279\u0250\u01DD\u15FA \u029E\u0279o\u028D\u029E\u0254o\u05DF\u0186", "block.create.clutch": "\u0265\u0254\u0287n\u05DF\u0186", "block.create.cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186", "block.create.copper_block": "\u029E\u0254o\u05DF\u15FA \u0279\u01DDddo\u0186", + "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_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", + "block.create.cuckoo_clock": "\u029E\u0254o\u05DF\u0186 oo\u029E\u0254n\u0186", "block.create.dark_oak_window": "\u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1", "block.create.dark_oak_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1", "block.create.dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", @@ -39,6 +48,7 @@ "block.create.dark_scoria_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", "block.create.dark_scoria_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", "block.create.dark_scoria_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", + "block.create.deployer": "\u0279\u01DD\u028Eo\u05DFd\u01DD\u15E1", "block.create.diorite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131\u0279o\u0131\u15E1", "block.create.diorite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131\u0279o\u0131\u15E1", "block.create.diorite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131\u0279o\u0131\u15E1", @@ -58,6 +68,7 @@ "block.create.dolomite_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", "block.create.dolomite_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", "block.create.dolomite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", + "block.create.drill": "\u05DF\u05DF\u0131\u0279\u15E1 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "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", @@ -97,8 +108,10 @@ "block.create.fancy_weathered_limestone_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM \u028E\u0254u\u0250\u2132", "block.create.fancy_weathered_limestone_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM \u028E\u0254u\u0250\u2132", "block.create.fancy_weathered_limestone_bricks_wall": "\u05DF\u05DF\u0250M s\u029E\u0254\u0131\u0279\u15FA \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM \u028E\u0254u\u0250\u2132", + "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.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", "block.create.gabbro_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA o\u0279qq\u0250\u2141", @@ -120,6 +133,8 @@ "block.create.granite_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131u\u0250\u0279\u2141", "block.create.granite_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131u\u0250\u0279\u2141", "block.create.granite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131u\u0250\u0279\u2141", + "block.create.hand_crank": "\u029Eu\u0250\u0279\u0186 pu\u0250H", + "block.create.harvester": "\u0279\u01DD\u0287s\u01DD\u028C\u0279\u0250H \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.horizontal_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", "block.create.horizontal_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", "block.create.jungle_window": "\u028Dopu\u0131M \u01DD\u05DFbun\u017F", @@ -145,6 +160,14 @@ "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.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", + "block.create.mechanical_piston": "uo\u0287s\u0131\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", + "block.create.mechanical_piston_head": "p\u0250\u01DDH uo\u0287s\u0131\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", + "block.create.mechanical_press": "ss\u01DD\u0279\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", + "block.create.millstone": "\u01DDuo\u0287s\u05DF\u05DF\u0131W", + "block.create.minecart_anchor": "\u0279o\u0265\u0254u\u2C6F \u0287\u0279\u0250\u0254\u01DDu\u0131W", "block.create.mossy_andesite": "\u01DD\u0287\u0131s\u01DDpu\u2C6F \u028EssoW", "block.create.mossy_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 \u028EssoW", "block.create.mossy_diorite": "\u01DD\u0287\u0131\u0279o\u0131\u15E1 \u028EssoW", @@ -154,7 +177,9 @@ "block.create.mossy_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 \u028EssoW", "block.create.mossy_scoria": "\u0250\u0131\u0279o\u0254S \u028EssoW", "block.create.mossy_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM \u028EssoW", + "block.create.mysterious_cuckoo_clock": "\u029E\u0254o\u05DF\u0186 oo\u029E\u0254n\u0186", "block.create.natural_scoria": "\u0250\u0131\u0279o\u0254S \u05DF\u0250\u0279n\u0287\u0250N", + "block.create.nozzle": "\u01DD\u05DFzzoN", "block.create.oak_window": "\u028Dopu\u0131M \u029E\u0250O", "block.create.oak_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u029E\u0250O", "block.create.ornate_iron_window": "\u028Dopu\u0131M uo\u0279I \u01DD\u0287\u0250u\u0279O", @@ -204,6 +229,8 @@ "block.create.paved_weathered_limestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u028C\u0250\u0500", "block.create.paved_weathered_limestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u028C\u0250\u0500", "block.create.paved_weathered_limestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u028C\u0250\u0500", + "block.create.piston_extension_pole": "\u01DD\u05DFo\u0500 uo\u0131su\u01DD\u0287x\u018E uo\u0287s\u0131\u0500", + "block.create.plough": "\u0265bno\u05DF\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.polished_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u0265s\u0131\u05DFo\u0500", "block.create.polished_dark_scoria_slab": "q\u0250\u05DFS \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u0265s\u0131\u05DFo\u0500", "block.create.polished_dark_scoria_stairs": "s\u0279\u0131\u0250\u0287S \u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u0265s\u0131\u05DFo\u0500", @@ -228,6 +255,13 @@ "block.create.polished_weathered_limestone_slab": "q\u0250\u05DFS \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_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.pulley_magnet": "\u0287\u01DDub\u0250W \u028E\u01DD\u05DF\u05DFn\u0500", + "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", + "block.create.rotation_speed_controller": "\u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186 p\u01DD\u01DDdS uo\u0131\u0287\u0250\u0287o\u1D1A", + "block.create.saw": "\u028D\u0250S \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.schematic_table": "\u01DD\u05DFq\u0250\u27D8 \u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S", "block.create.schematicannon": "uouu\u0250\u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S", "block.create.scoria": "\u0250\u0131\u0279o\u0254S", @@ -240,11 +274,18 @@ "block.create.scoria_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S", "block.create.scoria_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S", "block.create.scoria_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u0250\u0131\u0279o\u0254S", + "block.create.sequenced_gearshift": "\u0287\u025F\u0131\u0265s\u0279\u0250\u01DD\u2141 p\u01DD\u0254u\u01DDnb\u01DDS", "block.create.shaft": "\u0287\u025F\u0250\u0265S", + "block.create.speedometer": "\u0279\u01DD\u0287\u01DD\u026Fop\u01DD\u01DDdS", "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.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.turntable": "\u01DD\u05DFq\u0250\u0287u\u0279n\u27D8", "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.water_wheel": "\u05DF\u01DD\u01DD\u0265M \u0279\u01DD\u0287\u0250M", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 0ee79146d..06202f1c7 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -6,27 +6,36 @@ "block.create.andesite_bricks_slab": "Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "Andesite Bricks Wall", + "block.create.andesite_casing": "Andesite Casing", "block.create.andesite_cobblestone": "Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "Andesite Cobblestone Stairs", "block.create.andesite_cobblestone_wall": "Andesite Cobblestone Wall", "block.create.andesite_pillar": "Andesite Pillar", + "block.create.basin": "Basin", "block.create.belt": "Belt", "block.create.birch_window": "Birch Window", "block.create.birch_window_pane": "Birch Window Pane", "block.create.brass_block": "Brass Block", + "block.create.brass_casing": "Brass Casing", + "block.create.cart_assembler": "Cart Assembler", "block.create.chiseled_dark_scoria": "Chiseled Dark Scoria", "block.create.chiseled_dolomite": "Chiseled Dolomite", "block.create.chiseled_gabbro": "Chiseled Gabbro", "block.create.chiseled_limestone": "Chiseled Limestone", "block.create.chiseled_scoria": "Chiseled Scoria", "block.create.chiseled_weathered_limestone": "Chiseled Weathered Limestone", + "block.create.clockwork_bearing": "Clockwork Bearing", "block.create.clutch": "Clutch", "block.create.cogwheel": "Cogwheel", "block.create.copper_block": "Copper Block", + "block.create.copper_casing": "Copper Casing", "block.create.copper_ore": "Copper Ore", "block.create.copper_shingles": "Copper Shingles", "block.create.creative_motor": "Creative Motor", + "block.create.crushing_wheel": "Crushing Wheel", + "block.create.crushing_wheel_controller": "Crushing Wheel Controller", + "block.create.cuckoo_clock": "Cuckoo Clock", "block.create.dark_oak_window": "Dark Oak Window", "block.create.dark_oak_window_pane": "Dark Oak Window Pane", "block.create.dark_scoria": "Dark Scoria", @@ -39,6 +48,7 @@ "block.create.dark_scoria_cobblestone_stairs": "Dark Scoria Cobblestone Stairs", "block.create.dark_scoria_cobblestone_wall": "Dark Scoria Cobblestone Wall", "block.create.dark_scoria_pillar": "Dark Scoria Pillar", + "block.create.deployer": "Deployer", "block.create.diorite_bricks": "Diorite Bricks", "block.create.diorite_bricks_slab": "Diorite Bricks Slab", "block.create.diorite_bricks_stairs": "Diorite Bricks Stairs", @@ -58,6 +68,7 @@ "block.create.dolomite_cobblestone_stairs": "Dolomite Cobblestone Stairs", "block.create.dolomite_cobblestone_wall": "Dolomite Cobblestone Wall", "block.create.dolomite_pillar": "Dolomite Pillar", + "block.create.drill": "Mechanical Drill", "block.create.encased_belt": "Encased Belt", "block.create.encased_fan": "Encased Fan", "block.create.encased_shaft": "Encased Shaft", @@ -97,8 +108,10 @@ "block.create.fancy_weathered_limestone_bricks_slab": "Fancy Weathered Limestone Bricks Slab", "block.create.fancy_weathered_limestone_bricks_stairs": "Fancy Weathered Limestone Bricks Stairs", "block.create.fancy_weathered_limestone_bricks_wall": "Fancy Weathered Limestone Bricks Wall", + "block.create.flywheel": "Flywheel", "block.create.framed_glass": "Framed Glass", "block.create.framed_glass_pane": "Framed Glass Pane", + "block.create.furnace_engine": "Furnace Engine", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Gabbro Bricks", "block.create.gabbro_bricks_slab": "Gabbro Bricks Slab", @@ -120,6 +133,8 @@ "block.create.granite_cobblestone_stairs": "Granite Cobblestone Stairs", "block.create.granite_cobblestone_wall": "Granite Cobblestone Wall", "block.create.granite_pillar": "Granite Pillar", + "block.create.hand_crank": "Hand Crank", + "block.create.harvester": "Mechanical Harvester", "block.create.horizontal_framed_glass": "Horizontal Framed Glass", "block.create.horizontal_framed_glass_pane": "Horizontal Framed Glass Pane", "block.create.jungle_window": "Jungle Window", @@ -145,6 +160,14 @@ "block.create.limestone_cobblestone_stairs": "Limestone Cobblestone Stairs", "block.create.limestone_cobblestone_wall": "Limestone Cobblestone Wall", "block.create.limestone_pillar": "Limestone Pillar", + "block.create.mechanical_bearing": "Mechanical Bearing", + "block.create.mechanical_crafter": "Mechanical Crafter", + "block.create.mechanical_mixer": "Mechanical Mixer", + "block.create.mechanical_piston": "Mechanical Piston", + "block.create.mechanical_piston_head": "Mechanical Piston Head", + "block.create.mechanical_press": "Mechanical Press", + "block.create.millstone": "Millstone", + "block.create.minecart_anchor": "Minecart Anchor", "block.create.mossy_andesite": "Mossy Andesite", "block.create.mossy_dark_scoria": "Mossy Dark Scoria", "block.create.mossy_diorite": "Mossy Diorite", @@ -154,7 +177,9 @@ "block.create.mossy_limestone": "Mossy Limestone", "block.create.mossy_scoria": "Mossy Scoria", "block.create.mossy_weathered_limestone": "Mossy Weathered Limestone", + "block.create.mysterious_cuckoo_clock": "Cuckoo Clock", "block.create.natural_scoria": "Natural Scoria", + "block.create.nozzle": "Nozzle", "block.create.oak_window": "Oak Window", "block.create.oak_window_pane": "Oak Window Pane", "block.create.ornate_iron_window": "Ornate Iron Window", @@ -204,6 +229,8 @@ "block.create.paved_weathered_limestone_slab": "Paved Weathered Limestone Slab", "block.create.paved_weathered_limestone_stairs": "Paved Weathered Limestone Stairs", "block.create.paved_weathered_limestone_wall": "Paved Weathered Limestone Wall", + "block.create.piston_extension_pole": "Piston Extension Pole", + "block.create.plough": "Mechanical Plough", "block.create.polished_dark_scoria": "Polished Dark Scoria", "block.create.polished_dark_scoria_slab": "Polished Dark Scoria Slab", "block.create.polished_dark_scoria_stairs": "Polished Dark Scoria Stairs", @@ -228,6 +255,13 @@ "block.create.polished_weathered_limestone_slab": "Polished Weathered Limestone Slab", "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.pulley_magnet": "Pulley Magnet", + "block.create.rope": "Rope", + "block.create.rope_pulley": "Rope Pulley", + "block.create.rotation_chassis": "Radial Chassis", + "block.create.rotation_speed_controller": "Rotation Speed Controller", + "block.create.saw": "Mechanical Saw", "block.create.schematic_table": "Schematic Table", "block.create.schematicannon": "Schematicannon", "block.create.scoria": "Scoria", @@ -240,11 +274,18 @@ "block.create.scoria_cobblestone_stairs": "Scoria Cobblestone Stairs", "block.create.scoria_cobblestone_wall": "Scoria Cobblestone Wall", "block.create.scoria_pillar": "Scoria Pillar", + "block.create.sequenced_gearshift": "Sequenced Gearshift", "block.create.shaft": "Shaft", + "block.create.speedometer": "Speedometer", "block.create.spruce_window": "Spruce Window", "block.create.spruce_window_pane": "Spruce Window Pane", + "block.create.sticky_mechanical_piston": "Sticky Mechanical Piston", + "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.turntable": "Turntable", "block.create.vertical_framed_glass": "Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "Vertical Framed Glass Pane", "block.create.water_wheel": "Water Wheel", diff --git a/src/generated/resources/assets/create/models/block/andesite_casing.json b/src/generated/resources/assets/create/models/block/andesite_casing.json new file mode 100644 index 000000000..c4b39bf55 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/andesite_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/andesite_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_casing.json b/src/generated/resources/assets/create/models/block/brass_casing.json new file mode 100644 index 000000000..0035c746d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/brass_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/clockwork_bearing.json b/src/generated/resources/assets/create/models/block/clockwork_bearing.json new file mode 100644 index 000000000..144a26a78 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/clockwork_bearing.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/bearing/block", + "textures": { + "side": "create:block/clockwork_bearing_side", + "back": "create:block/brass_gearbox" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/copper_casing.json b/src/generated/resources/assets/create/models/block/copper_casing.json new file mode 100644 index 000000000..db9e23c06 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/copper_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/copper_casing" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/mechanical_bearing.json b/src/generated/resources/assets/create/models/block/mechanical_bearing.json new file mode 100644 index 000000000..9e50b2ade --- /dev/null +++ b/src/generated/resources/assets/create/models/block/mechanical_bearing.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/bearing/block", + "textures": { + "side": "create:block/mechanical_bearing_side", + "back": "create:block/gearbox" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rotation_chassis_side_x.json b/src/generated/resources/assets/create/models/block/rotation_chassis_side_x.json new file mode 100644 index 000000000..91994fea7 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rotation_chassis_side_x.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/rotation_chassis/side_x", + "textures": { + "side": "create:block/rotation_chassis_side" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rotation_chassis_side_x_sticky.json b/src/generated/resources/assets/create/models/block/rotation_chassis_side_x_sticky.json new file mode 100644 index 000000000..9da1e5d96 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rotation_chassis_side_x_sticky.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/rotation_chassis/side_x", + "textures": { + "side": "create:block/rotation_chassis_side_sticky" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rotation_chassis_side_y.json b/src/generated/resources/assets/create/models/block/rotation_chassis_side_y.json new file mode 100644 index 000000000..d91b21354 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rotation_chassis_side_y.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/rotation_chassis/side_y", + "textures": { + "side": "create:block/rotation_chassis_side" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rotation_chassis_side_y_sticky.json b/src/generated/resources/assets/create/models/block/rotation_chassis_side_y_sticky.json new file mode 100644 index 000000000..5a48c052d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rotation_chassis_side_y_sticky.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/rotation_chassis/side_y", + "textures": { + "side": "create:block/rotation_chassis_side_sticky" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rotation_chassis_side_z.json b/src/generated/resources/assets/create/models/block/rotation_chassis_side_z.json new file mode 100644 index 000000000..b459c2289 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rotation_chassis_side_z.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/rotation_chassis/side_z", + "textures": { + "side": "create:block/rotation_chassis_side" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/rotation_chassis_side_z_sticky.json b/src/generated/resources/assets/create/models/block/rotation_chassis_side_z_sticky.json new file mode 100644 index 000000000..6a634e9f9 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/rotation_chassis_side_z_sticky.json @@ -0,0 +1,6 @@ +{ + "parent": "create:block/rotation_chassis/side_z", + "textures": { + "side": "create:block/rotation_chassis_side_sticky" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/translation_chassis.json b/src/generated/resources/assets/create/models/block/translation_chassis.json new file mode 100644 index 000000000..594f4d588 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/translation_chassis.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "create:block/translation_chassis_side", + "bottom": "create:block/translation_chassis_end", + "top": "create:block/translation_chassis_end" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/translation_chassis_bottom.json b/src/generated/resources/assets/create/models/block/translation_chassis_bottom.json new file mode 100644 index 000000000..470507bb5 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/translation_chassis_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "create:block/translation_chassis_side", + "bottom": "create:block/translation_chassis_end_sticky", + "top": "create:block/translation_chassis_end" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/translation_chassis_secondary.json b/src/generated/resources/assets/create/models/block/translation_chassis_secondary.json new file mode 100644 index 000000000..4a1583c2c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/translation_chassis_secondary.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "create:block/translation_chassis_secondary_side", + "bottom": "create:block/translation_chassis_end", + "top": "create:block/translation_chassis_end" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/translation_chassis_secondary_bottom.json b/src/generated/resources/assets/create/models/block/translation_chassis_secondary_bottom.json new file mode 100644 index 000000000..2b33e7eaa --- /dev/null +++ b/src/generated/resources/assets/create/models/block/translation_chassis_secondary_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "create:block/translation_chassis_secondary_side", + "bottom": "create:block/translation_chassis_end_sticky", + "top": "create:block/translation_chassis_end" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/translation_chassis_secondary_top.json b/src/generated/resources/assets/create/models/block/translation_chassis_secondary_top.json new file mode 100644 index 000000000..9f6d3a724 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/translation_chassis_secondary_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "create:block/translation_chassis_secondary_side", + "bottom": "create:block/translation_chassis_end", + "top": "create:block/translation_chassis_end_sticky" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/translation_chassis_secondary_top_bottom.json b/src/generated/resources/assets/create/models/block/translation_chassis_secondary_top_bottom.json new file mode 100644 index 000000000..95650e023 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/translation_chassis_secondary_top_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "create:block/translation_chassis_secondary_side", + "bottom": "create:block/translation_chassis_end_sticky", + "top": "create:block/translation_chassis_end_sticky" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/translation_chassis_top.json b/src/generated/resources/assets/create/models/block/translation_chassis_top.json new file mode 100644 index 000000000..dcf5f924d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/translation_chassis_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "create:block/translation_chassis_side", + "bottom": "create:block/translation_chassis_end", + "top": "create:block/translation_chassis_end_sticky" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/translation_chassis_top_bottom.json b/src/generated/resources/assets/create/models/block/translation_chassis_top_bottom.json new file mode 100644 index 000000000..ba29c8750 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/translation_chassis_top_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "create:block/translation_chassis_side", + "bottom": "create:block/translation_chassis_end_sticky", + "top": "create:block/translation_chassis_end_sticky" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/andesite_casing.json b/src/generated/resources/assets/create/models/item/andesite_casing.json new file mode 100644 index 000000000..b2defbd5f --- /dev/null +++ b/src/generated/resources/assets/create/models/item/andesite_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/andesite_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/basin.json b/src/generated/resources/assets/create/models/item/basin.json new file mode 100644 index 000000000..1dc14b2e8 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/basin.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/basin" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/brass_casing.json b/src/generated/resources/assets/create/models/item/brass_casing.json new file mode 100644 index 000000000..c020a8481 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/brass_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/brass_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/cart_assembler.json b/src/generated/resources/assets/create/models/item/cart_assembler.json new file mode 100644 index 000000000..e2c6cd154 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/cart_assembler.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/cart_assembler/block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/clockwork_bearing.json b/src/generated/resources/assets/create/models/item/clockwork_bearing.json new file mode 100644 index 000000000..3272b7f57 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/clockwork_bearing.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/bearing/item", + "textures": { + "side": "create:block/clockwork_bearing_side", + "back": "create:block/brass_gearbox" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/copper_casing.json b/src/generated/resources/assets/create/models/item/copper_casing.json new file mode 100644 index 000000000..5d0413ea1 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/copper_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/copper_casing" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/crushing_wheel.json b/src/generated/resources/assets/create/models/item/crushing_wheel.json new file mode 100644 index 000000000..5a8ad3362 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/crushing_wheel.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/crushing_wheel" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/cuckoo_clock.json b/src/generated/resources/assets/create/models/item/cuckoo_clock.json new file mode 100644 index 000000000..e7876338c --- /dev/null +++ b/src/generated/resources/assets/create/models/item/cuckoo_clock.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/cuckoo_clock/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/deployer.json b/src/generated/resources/assets/create/models/item/deployer.json new file mode 100644 index 000000000..bfa9ca452 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/deployer.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/deployer/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/drill.json b/src/generated/resources/assets/create/models/item/drill.json new file mode 100644 index 000000000..62ae203c1 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/drill.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/drill/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/flywheel.json b/src/generated/resources/assets/create/models/item/flywheel.json new file mode 100644 index 000000000..cfcb4e073 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/flywheel.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/flywheel/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/furnace_engine.json b/src/generated/resources/assets/create/models/item/furnace_engine.json new file mode 100644 index 000000000..c23656217 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/furnace_engine.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/furnace_engine/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/hand_crank.json b/src/generated/resources/assets/create/models/item/hand_crank.json new file mode 100644 index 000000000..ccf268ad9 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/hand_crank.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/hand_crank/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/harvester.json b/src/generated/resources/assets/create/models/item/harvester.json new file mode 100644 index 000000000..e40936382 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/harvester.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/harvester/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/mechanical_bearing.json b/src/generated/resources/assets/create/models/item/mechanical_bearing.json new file mode 100644 index 000000000..868aa2268 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/mechanical_bearing.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/bearing/item", + "textures": { + "side": "create:block/mechanical_bearing_side", + "back": "create:block/gearbox" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/mechanical_crafter.json b/src/generated/resources/assets/create/models/item/mechanical_crafter.json new file mode 100644 index 000000000..ea103c495 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/mechanical_crafter.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/mechanical_crafter/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/mechanical_mixer.json b/src/generated/resources/assets/create/models/item/mechanical_mixer.json new file mode 100644 index 000000000..710f187de --- /dev/null +++ b/src/generated/resources/assets/create/models/item/mechanical_mixer.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/mechanical_mixer/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/mechanical_piston.json b/src/generated/resources/assets/create/models/item/mechanical_piston.json new file mode 100644 index 000000000..2d1259863 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/mechanical_piston.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/mechanical_piston/normal/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/mechanical_press.json b/src/generated/resources/assets/create/models/item/mechanical_press.json new file mode 100644 index 000000000..dd30f1e9c --- /dev/null +++ b/src/generated/resources/assets/create/models/item/mechanical_press.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/mechanical_press/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/millstone.json b/src/generated/resources/assets/create/models/item/millstone.json new file mode 100644 index 000000000..c30e0f930 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/millstone.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/millstone/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/mysterious_cuckoo_clock.json b/src/generated/resources/assets/create/models/item/mysterious_cuckoo_clock.json new file mode 100644 index 000000000..e7876338c --- /dev/null +++ b/src/generated/resources/assets/create/models/item/mysterious_cuckoo_clock.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/cuckoo_clock/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/nozzle.json b/src/generated/resources/assets/create/models/item/nozzle.json new file mode 100644 index 000000000..18fbc536c --- /dev/null +++ b/src/generated/resources/assets/create/models/item/nozzle.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/nozzle/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/piston_extension_pole.json b/src/generated/resources/assets/create/models/item/piston_extension_pole.json new file mode 100644 index 000000000..c90cb5736 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/piston_extension_pole.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/piston_extension_pole" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/plough.json b/src/generated/resources/assets/create/models/item/plough.json new file mode 100644 index 000000000..95c3a8567 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/plough.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/plough" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/portable_storage_interface.json b/src/generated/resources/assets/create/models/item/portable_storage_interface.json new file mode 100644 index 000000000..87d2165ba --- /dev/null +++ b/src/generated/resources/assets/create/models/item/portable_storage_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/portable_storage_interface" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/rope_pulley.json b/src/generated/resources/assets/create/models/item/rope_pulley.json new file mode 100644 index 000000000..0aec91520 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/rope_pulley.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/rope_pulley/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/rotation_chassis.json b/src/generated/resources/assets/create/models/item/rotation_chassis.json new file mode 100644 index 000000000..f3630a49a --- /dev/null +++ b/src/generated/resources/assets/create/models/item/rotation_chassis.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "side": "create:block/rotation_chassis_side", + "end": "create:block/rotation_chassis_end" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/rotation_speed_controller.json b/src/generated/resources/assets/create/models/item/rotation_speed_controller.json new file mode 100644 index 000000000..68d28e80d --- /dev/null +++ b/src/generated/resources/assets/create/models/item/rotation_speed_controller.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/rotation_speed_controller/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/saw.json b/src/generated/resources/assets/create/models/item/saw.json new file mode 100644 index 000000000..f3896ee35 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/saw.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/saw/horizontal" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/sequenced_gearshift.json b/src/generated/resources/assets/create/models/item/sequenced_gearshift.json new file mode 100644 index 000000000..88f27bdbd --- /dev/null +++ b/src/generated/resources/assets/create/models/item/sequenced_gearshift.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/sequenced_gearshift/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/speedometer.json b/src/generated/resources/assets/create/models/item/speedometer.json new file mode 100644 index 000000000..883efed14 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/speedometer.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/gauge/speedometer/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/sticky_mechanical_piston.json b/src/generated/resources/assets/create/models/item/sticky_mechanical_piston.json new file mode 100644 index 000000000..313b5e174 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/sticky_mechanical_piston.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/mechanical_piston/sticky/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/stressometer.json b/src/generated/resources/assets/create/models/item/stressometer.json new file mode 100644 index 000000000..d4fa361cf --- /dev/null +++ b/src/generated/resources/assets/create/models/item/stressometer.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/gauge/stressometer/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/translation_chassis.json b/src/generated/resources/assets/create/models/item/translation_chassis.json new file mode 100644 index 000000000..bbea3639b --- /dev/null +++ b/src/generated/resources/assets/create/models/item/translation_chassis.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/translation_chassis" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/translation_chassis_secondary.json b/src/generated/resources/assets/create/models/item/translation_chassis_secondary.json new file mode 100644 index 000000000..aaa5fc52e --- /dev/null +++ b/src/generated/resources/assets/create/models/item/translation_chassis_secondary.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/translation_chassis_secondary" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/turntable.json b/src/generated/resources/assets/create/models/item/turntable.json new file mode 100644 index 000000000..5784408a1 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/turntable.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/turntable" +} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/root.json b/src/generated/resources/data/create/advancements/root.json index 8242acf23..87ea85f7c 100644 --- a/src/generated/resources/data/create/advancements/root.json +++ b/src/generated/resources/data/create/advancements/root.json @@ -13,7 +13,7 @@ "show_toast": false, "announce_to_chat": false, "hidden": false, - "background": "create:textures/block/scoria_bricks.png" + "background": "create:textures/block/palettes/gabbro/bricks.png" }, "criteria": { "0": { diff --git a/src/generated/resources/data/create/advancements/speed_gauge.json b/src/generated/resources/data/create/advancements/speed_gauge.json index 3b738054c..735db4553 100644 --- a/src/generated/resources/data/create/advancements/speed_gauge.json +++ b/src/generated/resources/data/create/advancements/speed_gauge.json @@ -2,7 +2,7 @@ "parent": "create:goggles", "display": { "icon": { - "item": "create:speed_gauge" + "item": "create:speedometer" }, "title": { "translate": "advancement.create.speed_gauge" @@ -19,13 +19,13 @@ "0": { "trigger": "minecraft:placed_block", "conditions": { - "block": "create:speed_gauge" + "block": "create:speedometer" } }, "1": { "trigger": "create:kinetic_block", "conditions": { - "block": "create:speed_gauge" + "block": "create:speedometer" } } }, diff --git a/src/generated/resources/data/create/advancements/stress_gauge.json b/src/generated/resources/data/create/advancements/stress_gauge.json index cb6bd9b88..54c093c55 100644 --- a/src/generated/resources/data/create/advancements/stress_gauge.json +++ b/src/generated/resources/data/create/advancements/stress_gauge.json @@ -2,7 +2,7 @@ "parent": "create:goggles", "display": { "icon": { - "item": "create:stress_gauge" + "item": "create:stressometer" }, "title": { "translate": "advancement.create.stress_gauge" @@ -19,13 +19,13 @@ "0": { "trigger": "minecraft:placed_block", "conditions": { - "block": "create:stress_gauge" + "block": "create:stressometer" } }, "1": { "trigger": "create:kinetic_block", "conditions": { - "block": "create:stress_gauge" + "block": "create:stressometer" } } }, diff --git a/src/generated/resources/data/create/loot_tables/blocks/piston_pole.json b/src/generated/resources/data/create/loot_tables/blocks/crushing_wheel_controller.json similarity index 87% rename from src/generated/resources/data/create/loot_tables/blocks/piston_pole.json rename to src/generated/resources/data/create/loot_tables/blocks/crushing_wheel_controller.json index aca93ffb0..78793172c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/piston_pole.json +++ b/src/generated/resources/data/create/loot_tables/blocks/crushing_wheel_controller.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:piston_pole" + "name": "minecraft:air" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/speed_gauge.json b/src/generated/resources/data/create/loot_tables/blocks/mechanical_piston_head.json similarity index 87% rename from src/generated/resources/data/create/loot_tables/blocks/speed_gauge.json rename to src/generated/resources/data/create/loot_tables/blocks/mechanical_piston_head.json index e517d29c4..78793172c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/speed_gauge.json +++ b/src/generated/resources/data/create/loot_tables/blocks/mechanical_piston_head.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:speed_gauge" + "name": "minecraft:air" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/stress_gauge.json b/src/generated/resources/data/create/loot_tables/blocks/minecart_anchor.json similarity index 86% rename from src/generated/resources/data/create/loot_tables/blocks/stress_gauge.json rename to src/generated/resources/data/create/loot_tables/blocks/minecart_anchor.json index aa1ddccb1..78793172c 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/stress_gauge.json +++ b/src/generated/resources/data/create/loot_tables/blocks/minecart_anchor.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "create:stress_gauge" + "name": "minecraft:air" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/piston_extension_pole.json b/src/generated/resources/data/create/loot_tables/blocks/piston_extension_pole.json new file mode 100644 index 000000000..7f5453a57 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/piston_extension_pole.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:piston_extension_pole" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/pulley_magnet.json b/src/generated/resources/data/create/loot_tables/blocks/pulley_magnet.json new file mode 100644 index 000000000..78793172c --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/pulley_magnet.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:air" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/rope.json b/src/generated/resources/data/create/loot_tables/blocks/rope.json new file mode 100644 index 000000000..78793172c --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/rope.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:air" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/speedometer.json b/src/generated/resources/data/create/loot_tables/blocks/speedometer.json new file mode 100644 index 000000000..77c13c6fd --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/speedometer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:speedometer" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/stressometer.json b/src/generated/resources/data/create/loot_tables/blocks/stressometer.json new file mode 100644 index 000000000..67e752d47 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/stressometer.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:stressometer" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index b0429b7d4..10d874f67 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -30,20 +30,20 @@ public enum AllBlockPartials { ENCASED_FAN_INNER("encased_fan/propeller"), HAND_CRANK_HANDLE("hand_crank/handle"), - MECHANICAL_PRESS_HEAD, - MECHANICAL_MIXER_POLE("mixer_pole"), - MECHANICAL_MIXER_HEAD("mixer_head"), - MECHANICAL_CRAFTER_LID("crafter/lid"), - MECHANICAL_CRAFTER_ARROW("crafter/arrow"), - MECHANICAL_CRAFTER_BELT_FRAME("crafter/belt"), - MECHANICAL_CRAFTER_BELT("crafter/belt_animated"), + MECHANICAL_PRESS_HEAD("mechanical_press/head"), + MECHANICAL_MIXER_POLE("mechanical_mixer/pole"), + MECHANICAL_MIXER_HEAD("mechanical_mixer/head"), + MECHANICAL_CRAFTER_LID("mechanical_crafter/lid"), + MECHANICAL_CRAFTER_ARROW("mechanical_crafter/arrow"), + MECHANICAL_CRAFTER_BELT_FRAME("mechanical_crafter/belt"), + MECHANICAL_CRAFTER_BELT("mechanical_crafter/belt_animated"), GAUGE_DIAL("gauge/dial"), GAUGE_INDICATOR("gauge/indicator"), - GAUGE_HEAD_SPEED("gauge/speed"), - GAUGE_HEAD_STRESS("gauge/stress"), - MECHANICAL_BEARING_TOP("bearing/top"), - DRILL, - HARVESTER_BLADE, + GAUGE_HEAD_SPEED("gauge/speedometer/head"), + GAUGE_HEAD_STRESS("gauge/stressometer/head"), + BEARING_TOP("bearing/top"), + DRILL_HEAD("drill/head"), + HARVESTER_BLADE("harvester/blade"), DEPLOYER_POLE("deployer/pole"), DEPLOYER_HAND_POINTING("deployer/hand_pointing"), DEPLOYER_HAND_PUNCHING("deployer/hand_punching"), @@ -65,9 +65,9 @@ public enum AllBlockPartials { CUCKOO_RIGHT_DOOR("cuckoo_clock/right_door"), CUCKOO_PIG("cuckoo_clock/pig"), CUCKOO_CREEPER("cuckoo_clock/creeper"), - ROPE_COIL("pulley/rope_coil"), - ROPE_HALF("pulley/rope_half"), - ROPE_HALF_MAGNET("pulley/rope_half_magnet"), + ROPE_COIL("rope_pulley/rope_coil"), + ROPE_HALF("rope_pulley/rope_half"), + ROPE_HALF_MAGNET("rope_pulley/rope_half_magnet"), MILLSTONE_COG("millstone/inner"), SYMMETRY_PLANE("symmetry_effect/plane"), diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index b50916405..0013c4182 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -10,42 +10,8 @@ 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.CasingBlock; -import com.simibubi.create.modules.contraptions.components.actors.DrillBlock; -import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock; -import com.simibubi.create.modules.contraptions.components.actors.PloughBlock; -import com.simibubi.create.modules.contraptions.components.actors.PortableStorageInterfaceBlock; -import com.simibubi.create.modules.contraptions.components.clock.CuckooClockBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkBearingBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.bearing.MechanicalBearingBlock; -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.contraptions.components.contraptions.mounted.CartAssemblerBlock.MinecartAnchorBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonHeadBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.PistonPoleBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock; -import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock; -import com.simibubi.create.modules.contraptions.components.crank.HandCrankBlock; -import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelBlock; -import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerBlock; -import com.simibubi.create.modules.contraptions.components.deployer.DeployerBlock; -import com.simibubi.create.modules.contraptions.components.fan.NozzleBlock; -import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelBlock; -import com.simibubi.create.modules.contraptions.components.flywheel.engine.FurnaceEngineBlock; -import com.simibubi.create.modules.contraptions.components.millstone.MillstoneBlock; -import com.simibubi.create.modules.contraptions.components.mixer.BasinOperatorBlockItem; -import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerBlock; -import com.simibubi.create.modules.contraptions.components.press.MechanicalPressBlock; -import com.simibubi.create.modules.contraptions.components.saw.SawBlock; -import com.simibubi.create.modules.contraptions.components.turntable.TurntableBlock; -import com.simibubi.create.modules.contraptions.processing.BasinBlock; import com.simibubi.create.modules.contraptions.redstone.AnalogLeverBlock; import com.simibubi.create.modules.contraptions.redstone.ContactBlock; -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.gauge.GaugeBlock; 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; @@ -107,53 +73,52 @@ public enum AllBlocks implements NonNullSupplier { // CREATIVE_MOTOR(MotorBlock::new), // WATER_WHEEL(WaterWheelBlock::new), // ENCASED_FAN(EncasedFanBlock::new), - NOZZLE(NozzleBlock::new), - TURNTABLE(TurntableBlock::new), - HAND_CRANK(HandCrankBlock::new), - CUCKOO_CLOCK(() -> new CuckooClockBlock(false)), - MYSTERIOUS_CUCKOO_CLOCK(() -> new CuckooClockBlock(true)), +// NOZZLE(NozzleBlock::new), +// TURNTABLE(TurntableBlock::new), +// HAND_CRANK(HandCrankBlock::new), +// CUCKOO_CLOCK(() -> new CuckooClockBlock(false)), +// MYSTERIOUS_CUCKOO_CLOCK(() -> new CuckooClockBlock(true)), - MILLSTONE(MillstoneBlock::new), - CRUSHING_WHEEL(CrushingWheelBlock::new), - CRUSHING_WHEEL_CONTROLLER(CrushingWheelControllerBlock::new, ComesWith.NO_BLOCKITEM), - MECHANICAL_PRESS(MechanicalPressBlock::new, BasinOperatorBlockItem::new), - MECHANICAL_MIXER(MechanicalMixerBlock::new, BasinOperatorBlockItem::new), - BASIN(BasinBlock::new), - SPEED_GAUGE(() -> new GaugeBlock(GaugeBlock.Type.SPEED)), - STRESS_GAUGE(() -> new GaugeBlock(GaugeBlock.Type.STRESS)), +// MILLSTONE(MillstoneBlock::new), +// CRUSHING_WHEEL(CrushingWheelBlock::new), +// CRUSHING_WHEEL_CONTROLLER(CrushingWheelControllerBlock::new, ComesWith.NO_BLOCKITEM), +// MECHANICAL_PRESS(MechanicalPressBlock::new, BasinOperatorBlockItem::new), +// MECHANICAL_MIXER(MechanicalMixerBlock::new, BasinOperatorBlockItem::new), +// BASIN(BasinBlock::new), +// SPEED_GAUGE(() -> new GaugeBlock(GaugeBlock.Type.SPEED)), +// STRESS_GAUGE(() -> new GaugeBlock(GaugeBlock.Type.STRESS)), - MECHANICAL_PISTON(() -> new MechanicalPistonBlock(false)), - STICKY_MECHANICAL_PISTON(() -> new MechanicalPistonBlock(true)), - MECHANICAL_PISTON_HEAD(MechanicalPistonHeadBlock::new, ComesWith.NO_BLOCKITEM), - PISTON_POLE(PistonPoleBlock::new), - MECHANICAL_BEARING(MechanicalBearingBlock::new), - CLOCKWORK_BEARING(ClockworkBearingBlock::new), - ROPE_PULLEY(PulleyBlock::new), - ROPE(PulleyBlock.RopeBlock::new, ComesWith.NO_BLOCKITEM), - PULLEY_MAGNET(PulleyBlock.MagnetBlock::new, ComesWith.NO_BLOCKITEM), - CART_ASSEMBLER(CartAssemblerBlock::new, ITaggable.create() - .withVanillaTags(ITaggable.BLOCK, "rails")), - MINECART_ANCHOR(MinecartAnchorBlock::new, ComesWith.NO_BLOCKITEM), - TRANSLATION_CHASSIS(LinearChassisBlock::new), - TRANSLATION_CHASSIS_SECONDARY(LinearChassisBlock::new), - ROTATION_CHASSIS(RadialChassisBlock::new), - DRILL(DrillBlock::new), - SAW(SawBlock::new), - DEPLOYER(DeployerBlock::new), - PORTABLE_STORAGE_INTERFACE(PortableStorageInterfaceBlock::new), - HARVESTER(HarvesterBlock::new), - PLOUGH(PloughBlock::new), - ANALOG_LEVER(AnalogLeverBlock::new), +// MECHANICAL_PISTON(() -> new MechanicalPistonBlock(false)), +// STICKY_MECHANICAL_PISTON(() -> new MechanicalPistonBlock(true)), +// MECHANICAL_PISTON_HEAD(MechanicalPistonHeadBlock::new, ComesWith.NO_BLOCKITEM), +// PISTON_POLE(PistonPoleBlock::new), +// MECHANICAL_BEARING(MechanicalBearingBlock::new), +// CLOCKWORK_BEARING(ClockworkBearingBlock::new), +// ROPE_PULLEY(PulleyBlock::new), +// ROPE(PulleyBlock.RopeBlock::new, ComesWith.NO_BLOCKITEM), +// PULLEY_MAGNET(PulleyBlock.MagnetBlock::new, ComesWith.NO_BLOCKITEM), +// CART_ASSEMBLER(CartAssemblerBlock::new, ITaggable.create() +// .withVanillaTags(ITaggable.BLOCK, "rails")), +// MINECART_ANCHOR(MinecartAnchorBlock::new, ComesWith.NO_BLOCKITEM), +// TRANSLATION_CHASSIS(LinearChassisBlock::new), +// TRANSLATION_CHASSIS_SECONDARY(LinearChassisBlock::new), +// ROTATION_CHASSIS(RadialChassisBlock::new), +// DRILL(DrillBlock::new), +// SAW(SawBlock::new), +// DEPLOYER(DeployerBlock::new), +// PORTABLE_STORAGE_INTERFACE(PortableStorageInterfaceBlock::new), +// HARVESTER(HarvesterBlock::new), +// PLOUGH(PloughBlock::new), - ANDESITE_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))), - COPPER_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))), - BRASS_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))), +// ANDESITE_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))), +// COPPER_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))), +// BRASS_CASING(() -> new CasingBlock(Properties.from(Blocks.ANDESITE))), - MECHANICAL_CRAFTER(MechanicalCrafterBlock::new), - SEQUENCED_GEARSHIFT(SequencedGearshiftBlock::new), - FLYWHEEL(FlywheelBlock::new), - FURNACE_ENGINE(FurnaceEngineBlock::new), - ROTATION_SPEED_CONTROLLER(SpeedControllerBlock::new), +// MECHANICAL_CRAFTER(MechanicalCrafterBlock::new), +// SEQUENCED_GEARSHIFT(SequencedGearshiftBlock::new), +// FLYWHEEL(FlywheelBlock::new), +// FURNACE_ENGINE(FurnaceEngineBlock::new), +// ROTATION_SPEED_CONTROLLER(SpeedControllerBlock::new), _2_(Sections.LOGISTICS), @@ -174,6 +139,7 @@ public enum AllBlocks implements NonNullSupplier { 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), diff --git a/src/main/java/com/simibubi/create/AllBlocksNew.java b/src/main/java/com/simibubi/create/AllBlocksNew.java index 8a2e25e46..48cb2a22f 100644 --- a/src/main/java/com/simibubi/create/AllBlocksNew.java +++ b/src/main/java/com/simibubi/create/AllBlocksNew.java @@ -1,5 +1,6 @@ package com.simibubi.create; +import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; import static com.simibubi.create.foundation.utility.data.BlockStateGen.oxidizedBlockstate; import static com.simibubi.create.foundation.utility.data.ModelGen.customItemModel; import static com.simibubi.create.foundation.utility.data.ModelGen.oxidizedItemModel; @@ -9,12 +10,51 @@ import com.simibubi.create.config.StressConfigDefaults; import com.simibubi.create.foundation.registrate.CreateRegistrate; import com.simibubi.create.foundation.utility.data.AssetLookup; import com.simibubi.create.foundation.utility.data.BlockStateGen; +import com.simibubi.create.foundation.utility.data.BuilderTransformers; +import com.simibubi.create.foundation.utility.data.ModelGen; import com.simibubi.create.foundation.world.OxidizingBlock; import com.simibubi.create.modules.Sections; +import com.simibubi.create.modules.contraptions.CasingBlock; +import com.simibubi.create.modules.contraptions.components.actors.DrillBlock; +import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock; +import com.simibubi.create.modules.contraptions.components.actors.PloughBlock; +import com.simibubi.create.modules.contraptions.components.actors.PortableStorageInterfaceBlock; +import com.simibubi.create.modules.contraptions.components.clock.CuckooClockBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.bearing.ClockworkBearingBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.bearing.MechanicalBearingBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.chassis.LinearChassisBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.chassis.LinearChassisBlock.ChassisCTBehaviour; +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.contraptions.components.contraptions.mounted.CartAssemblerBlock.MinecartAnchorBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonHeadBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.piston.PistonExtensionPoleBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock; +import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock; +import com.simibubi.create.modules.contraptions.components.crank.HandCrankBlock; +import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelBlock; +import com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerBlock; +import com.simibubi.create.modules.contraptions.components.deployer.DeployerBlock; import com.simibubi.create.modules.contraptions.components.fan.EncasedFanBlock; +import com.simibubi.create.modules.contraptions.components.fan.NozzleBlock; +import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelBlock; +import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelGenerator; +import com.simibubi.create.modules.contraptions.components.flywheel.engine.FurnaceEngineBlock; +import com.simibubi.create.modules.contraptions.components.millstone.MillstoneBlock; +import com.simibubi.create.modules.contraptions.components.mixer.BasinOperatorBlockItem; +import com.simibubi.create.modules.contraptions.components.mixer.MechanicalMixerBlock; import com.simibubi.create.modules.contraptions.components.motor.MotorBlock; import com.simibubi.create.modules.contraptions.components.motor.MotorGenerator; +import com.simibubi.create.modules.contraptions.components.press.MechanicalPressBlock; +import com.simibubi.create.modules.contraptions.components.saw.SawBlock; +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.relays.advanced.SpeedControllerBlock; +import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock; +import com.simibubi.create.modules.contraptions.relays.advanced.sequencer.SequencedGearshiftGenerator; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltGenerator; import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock; @@ -26,6 +66,8 @@ import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltBlock; import com.simibubi.create.modules.contraptions.relays.encased.EncasedBeltGenerator; import com.simibubi.create.modules.contraptions.relays.encased.EncasedShaftBlock; 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.schematics.block.SchematicTableBlock; import com.simibubi.create.modules.schematics.block.SchematicannonBlock; @@ -42,11 +84,13 @@ import net.minecraft.block.material.MaterialColor; import net.minecraft.client.renderer.RenderType; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.state.properties.PistonType; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; import net.minecraft.tags.TagCollection; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.common.ToolType; public class AllBlocksNew { @@ -64,6 +108,7 @@ public class AllBlocksNew { REGISTRATE.block("schematicannon", SchematicannonBlock::new) .initialProperties(() -> Blocks.DISPENSER) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) + .item() .transform(customItemModel()) .register(); @@ -108,24 +153,28 @@ public class AllBlocksNew { REGISTRATE.block("encased_shaft", EncasedShaftBlock::new) .initialProperties(SharedProperties::kinetic) .blockstate(BlockStateGen.axisBlockProvider(true)) + .item() .transform(customItemModel()) .register(); public static final BlockEntry GEARBOX = REGISTRATE.block("gearbox", GearboxBlock::new) .initialProperties(SharedProperties::kinetic) .blockstate(BlockStateGen.axisBlockProvider(true)) + .item() .transform(customItemModel()) .register(); public static final BlockEntry CLUTCH = REGISTRATE.block("clutch", ClutchBlock::new) .initialProperties(SharedProperties::kinetic) .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) .blockstate((c, p) -> BlockStateGen.axisBlock(c, p, AssetLookup.forPowered(c, p))) + .item() .transform(customItemModel()) .register(); @@ -134,6 +183,7 @@ public class AllBlocksNew { .initialProperties(SharedProperties::kinetic) .blockstate((c, p) -> new EncasedBeltGenerator((state, suffix) -> p.models() .getExistingFile(p.modLoc("block/" + c.getName() + "/" + suffix))).generate(c, p)) + .item() .transform(customItemModel()) .register(); @@ -154,6 +204,7 @@ public class AllBlocksNew { public static final BlockEntry BELT = REGISTRATE.block("belt", BeltBlock::new) .initialProperties(SharedProperties.beltMaterial, MaterialColor.GRAY) + .properties(p -> p.sound(SoundType.CLOTH)) .transform(StressConfigDefaults.setImpact(1.0)) .blockstate(new BeltGenerator()::generate) .register(); @@ -162,6 +213,7 @@ public class AllBlocksNew { .initialProperties(SharedProperties::kinetic) .blockstate(new MotorGenerator()::generate) .transform(StressConfigDefaults.setCapacity(16384.0)) + .item() .transform(customItemModel()) .register(); @@ -179,9 +231,327 @@ public class AllBlocksNew { .addLayer(() -> RenderType::getCutoutMipped) .transform(StressConfigDefaults.setCapacity(16.0)) .transform(StressConfigDefaults.setImpact(2.0)) + .item() .transform(customItemModel()) .register(); + public static final BlockEntry NOZZLE = REGISTRATE.block("nozzle", NozzleBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.directionalBlockProvider(true)) + .addLayer(() -> RenderType::getCutoutMipped) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry TURNTABLE = REGISTRATE.block("turntable", TurntableBlock::new) + .initialProperties(SharedProperties::woodenKinetic) + .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) + .blockstate(BlockStateGen.directionalBlockProvider(true)) + .transform(StressConfigDefaults.setCapacity(32.0)) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry CUCKOO_CLOCK = + REGISTRATE.block("cuckoo_clock", CuckooClockBlock::regular) + .transform(BuilderTransformers.cuckooClock()) + .register(); + + public static final BlockEntry MYSTERIOUS_CUCKOO_CLOCK = + REGISTRATE.block("mysterious_cuckoo_clock", CuckooClockBlock::mysterious) + .transform(BuilderTransformers.cuckooClock()) + .lang("Cuckoo Clock") + .register(); + + public static final BlockEntry MILLSTONE = REGISTRATE.block("millstone", MillstoneBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) + .transform(StressConfigDefaults.setImpact(4.0)) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry CRUSHING_WHEEL = + REGISTRATE.block("crushing_wheel", CrushingWheelBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.axisBlockProvider(false)) + .addLayer(() -> RenderType::getCutoutMipped) + .transform(StressConfigDefaults.setImpact(8.0)) + .simpleItem() + .register(); + + public static final BlockEntry CRUSHING_WHEEL_CONTROLLER = + REGISTRATE.block("crushing_wheel_controller", CrushingWheelControllerBlock::new) + .initialProperties(() -> Blocks.AIR) + .blockstate((c, p) -> p.getVariantBuilder(c.get()) + .forAllStates(state -> ConfiguredModel.builder() + .modelFile(p.models() + .getExistingFile(p.mcLoc("block/air"))) + .build())) + .register(); + + public static final BlockEntry MECHANICAL_PRESS = + REGISTRATE.block("mechanical_press", MechanicalPressBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.horizontalBlockProvider(true)) + .transform(StressConfigDefaults.setImpact(8.0)) + .item(BasinOperatorBlockItem::new) + .transform(customItemModel()) + .register(); + + public static final BlockEntry MECHANICAL_MIXER = + REGISTRATE.block("mechanical_mixer", MechanicalMixerBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) + .addLayer(() -> RenderType::getCutoutMipped) + .transform(StressConfigDefaults.setImpact(4.0)) + .item(BasinOperatorBlockItem::new) + .transform(customItemModel()) + .register(); + + public static final BlockEntry BASIN = REGISTRATE.block("basin", BasinBlock::new) + .initialProperties(SharedProperties::kinetic) + .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) + .blockstate(new GaugeGenerator()::generate) + .item() + .transform(ModelGen.customItemModel("gauge", "_")) + .register(); + + public static final BlockEntry STRESSOMETER = REGISTRATE.block("stressometer", GaugeBlock::stress) + .initialProperties(SharedProperties::woodenKinetic) + .blockstate(new GaugeGenerator()::generate) + .item() + .transform(ModelGen.customItemModel("gauge", "_")) + .register(); + + public static final BlockEntry MECHANICAL_PISTON = + REGISTRATE.block("mechanical_piston", MechanicalPistonBlock::normal) + .transform(BuilderTransformers.mechanicalPiston(PistonType.DEFAULT)) + .register(); + + public static final BlockEntry STICKY_MECHANICAL_PISTON = + REGISTRATE.block("sticky_mechanical_piston", MechanicalPistonBlock::sticky) + .transform(BuilderTransformers.mechanicalPiston(PistonType.STICKY)) + .register(); + + public static final BlockEntry MECHANICAL_PISTON_HEAD = + REGISTRATE.block("mechanical_piston_head", MechanicalPistonHeadBlock::new) + .initialProperties(() -> Blocks.PISTON_HEAD) + .blockstate((c, p) -> p.directionalBlock(c.get(), state -> p.models() + .getExistingFile(p.modLoc("block/mechanical_piston/" + state.get(MechanicalPistonHeadBlock.TYPE) + .getName() + "/head")))) + .register(); + + public static final BlockEntry PISTON_EXTENSION_POLE = + REGISTRATE.block("piston_extension_pole", PistonExtensionPoleBlock::new) + .initialProperties(() -> Blocks.PISTON_HEAD) + .blockstate(BlockStateGen.directionalBlockProvider(false)) + .simpleItem() + .register(); + + public static final BlockEntry MECHANICAL_BEARING = + REGISTRATE.block("mechanical_bearing", MechanicalBearingBlock::new) + .transform(BuilderTransformers.bearing("mechanical", "gearbox")) + .transform(StressConfigDefaults.setCapacity(512.0)) + .transform(StressConfigDefaults.setImpact(4.0)) + .register(); + + public static final BlockEntry CLOCKWORK_BEARING = + REGISTRATE.block("clockwork_bearing", ClockworkBearingBlock::new) + .transform(BuilderTransformers.bearing("clockwork", "brass_gearbox")) + .transform(StressConfigDefaults.setImpact(4.0)) + .register(); + + public static final BlockEntry ROPE_PULLEY = REGISTRATE.block("rope_pulley", PulleyBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.horizontalAxisBlockProvider(true)) + .transform(StressConfigDefaults.setImpact(4.0)) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry ROPE = REGISTRATE.block("rope", PulleyBlock.RopeBlock::new) + .initialProperties(SharedProperties.beltMaterial, MaterialColor.BROWN) + .properties(p -> p.sound(SoundType.CLOTH)) + .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() + .getExistingFile(p.modLoc("block/rope_pulley/" + c.getName())))) + .register(); + + public static final BlockEntry PULLEY_MAGNET = + REGISTRATE.block("pulley_magnet", PulleyBlock.MagnetBlock::new) + .initialProperties(SharedProperties::kinetic) + .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) + .blockstate(BlockStateGen.cartAssembler()) + .addLayer(() -> RenderType::getCutoutMipped) + .tag(BlockTags.RAILS) + .item() + .model((c, p) -> p.blockItem(() -> c.getEntry() + .getBlock(), "/block")) + .build() + .register(); + + public static final BlockEntry MINECART_ANCHOR = + REGISTRATE.block("minecart_anchor", MinecartAnchorBlock::new) + .initialProperties(SharedProperties::kinetic) + .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) + .blockstate(BlockStateGen.linearChassis()) + .transform(connectedTextures(new ChassisCTBehaviour())) + .lang("Linear Chassis") + .simpleItem() + .register(); + + public static final BlockEntry LINEAR_CHASSIS_SECONDARY = + REGISTRATE.block("translation_chassis_secondary", LinearChassisBlock::new) + .initialProperties(SharedProperties::woodenKinetic) + .blockstate(BlockStateGen.linearChassis()) + .transform(connectedTextures(new ChassisCTBehaviour())) + .lang("Secondary Linear Chassis") + .simpleItem() + .register(); + + public static final BlockEntry RADIAL_CHASSIS = + REGISTRATE.block("rotation_chassis", RadialChassisBlock::new) + .initialProperties(SharedProperties::woodenKinetic) + .blockstate(BlockStateGen.radialChassis()) + .lang("Radial Chassis") + .item() + .model((c, p) -> { + String path = "block/" + c.getName(); + p.cubeColumn(c.getName(), p.modLoc(path + "_side"), p.modLoc(path + "_end")); + }) + .build() + .register(); + + public static final BlockEntry DRILL = REGISTRATE.block("drill", DrillBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.directionalBlockProvider(true)) + .transform(StressConfigDefaults.setImpact(4.0)) + .lang("Mechanical Drill") + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry SAW = REGISTRATE.block("saw", SawBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(new SawGenerator()::generate) + .transform(StressConfigDefaults.setImpact(4.0)) + .addLayer(() -> RenderType::getCutoutMipped) + .lang("Mechanical Saw") + .item() + .model((c, p) -> p.blockItem(() -> c.getEntry() + .getBlock(), "/horizontal")) + .build() + .register(); + + public static final BlockEntry DEPLOYER = REGISTRATE.block("deployer", DeployerBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.directionalAxisBlockProvider()) + .transform(StressConfigDefaults.setImpact(4.0)) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry PORTABLE_STORAGE_INTERFACE = + REGISTRATE.block("portable_storage_interface", PortableStorageInterfaceBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.directionalBlockProvider(false)) + .simpleItem() + .register(); + + public static final BlockEntry HARVESTER = REGISTRATE.block("harvester", HarvesterBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.horizontalBlockProvider(true)) + .addLayer(() -> RenderType::getCutoutMipped) + .lang("Mechanical Harvester") + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry PLOUGH = REGISTRATE.block("plough", PloughBlock::new) + .initialProperties(SharedProperties::kinetic) + .blockstate(BlockStateGen.horizontalBlockProvider(false)) + .lang("Mechanical Plough") + .simpleItem() + .register(); + + public static final BlockEntry ANDESITE_CASING = REGISTRATE.block("andesite_casing", CasingBlock::new) + .transform(BuilderTransformers.casing(AllSpriteShifts.ANDESITE_CASING)) + .register(); + + public static final BlockEntry BRASS_CASING = REGISTRATE.block("brass_casing", CasingBlock::new) + .transform(BuilderTransformers.casing(AllSpriteShifts.BRASS_CASING)) + .register(); + + public static final BlockEntry COPPER_CASING = REGISTRATE.block("copper_casing", CasingBlock::new) + .transform(BuilderTransformers.casing(AllSpriteShifts.COPPER_CASING)) + .register(); + + public static final BlockEntry MECHANICAL_CRAFTER = + REGISTRATE.block("mechanical_crafter", MechanicalCrafterBlock::new) + .initialProperties(SharedProperties::metalKinetic) + .blockstate(BlockStateGen.horizontalBlockProvider(true)) + .transform(StressConfigDefaults.setImpact(2.0)) + .addLayer(() -> RenderType::getCutoutMipped) + .item() + .transform(customItemModel()) + .register(); + + public static final BlockEntry SEQUENCED_GEARSHIFT = + REGISTRATE.block("sequenced_gearshift", SequencedGearshiftBlock::new) + .initialProperties(SharedProperties::kinetic) + .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 FURNACE_ENGINE = + REGISTRATE.block("furnace_engine", FurnaceEngineBlock::new) + .initialProperties(SharedProperties::metalKinetic) + .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) + .blockstate(BlockStateGen.horizontalAxisBlockProvider(true)) + .item() + .transform(customItemModel()) + .register(); + // Materials static { diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index 75ba6db9e..1519cda48 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -38,8 +38,13 @@ public class AllSpriteShifts { CRAFTER_OTHERSIDE = getCT(CTType.HORIZONTAL, "crafter_side"); public static final CTSpriteShiftEntry - CHASSIS = getCT(CTType.OMNIDIRECTIONAL, "translation_chassis_top"), - CHASSIS_STICKY = getCT(CTType.OMNIDIRECTIONAL, "translation_chassis_top_sticky"); + ANDESITE_CASING = omni("andesite_casing"), + BRASS_CASING = omni("brass_casing"), + COPPER_CASING = omni("copper_casing"); + + public static final CTSpriteShiftEntry + CHASSIS = getCT(CTType.OMNIDIRECTIONAL, "translation_chassis_end"), + CHASSIS_STICKY = getCT(CTType.OMNIDIRECTIONAL, "translation_chassis_end_sticky"); public static final SpriteShiftEntry BELT = SpriteShifter.get("block/belt", "block/belt_animated"), diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index a3bf6e11a..4c76b44c8 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -8,8 +8,8 @@ import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.modules.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.modules.contraptions.components.actors.DrillTileEntity; import com.simibubi.create.modules.contraptions.components.actors.DrillTileEntityRenderer; +import com.simibubi.create.modules.contraptions.components.actors.HarvesterRenderer; import com.simibubi.create.modules.contraptions.components.actors.HarvesterTileEntity; -import com.simibubi.create.modules.contraptions.components.actors.HarvesterTileEntityRenderer; import com.simibubi.create.modules.contraptions.components.clock.CuckooClockRenderer; import com.simibubi.create.modules.contraptions.components.clock.CuckooClockTileEntity; import com.simibubi.create.modules.contraptions.components.contraptions.bearing.BearingTileEntityRenderer; @@ -108,48 +108,50 @@ public enum AllTileEntities { SCHEMATICTABLE(SchematicTableTileEntity::new, AllBlocksNew.SCHEMATIC_TABLE), // Kinetics - SHAFT(ShaftTileEntity::new, AllBlocksNew.SHAFT, AllBlocksNew.COGWHEEL, AllBlocksNew.LARGE_COGWHEEL, AllBlocksNew.ENCASED_SHAFT), + SHAFT(ShaftTileEntity::new, AllBlocksNew.SHAFT, AllBlocksNew.COGWHEEL, AllBlocksNew.LARGE_COGWHEEL, + AllBlocksNew.ENCASED_SHAFT), MOTOR(MotorTileEntity::new, AllBlocksNew.CREATIVE_MOTOR), GEARBOX(GearboxTileEntity::new, AllBlocksNew.GEARBOX), - TURNTABLE(TurntableTileEntity::new, AllBlocks.TURNTABLE), ENCASED_SHAFT(EncasedShaftTileEntity::new, AllBlocksNew.ENCASED_SHAFT, AllBlocksNew.ENCASED_BELT), ADJUSTABLE_PULLEY(AdjustablePulleyTileEntity::new, AllBlocksNew.ADJUSTABLE_PULLEY), ENCASED_FAN(EncasedFanTileEntity::new, AllBlocksNew.ENCASED_FAN), - NOZZLE(NozzleTileEntity::new, AllBlocks.NOZZLE), + NOZZLE(NozzleTileEntity::new, AllBlocksNew.NOZZLE), CLUTCH(ClutchTileEntity::new, AllBlocksNew.CLUTCH), GEARSHIFT(GearshiftTileEntity::new, AllBlocksNew.GEARSHIFT), - HAND_CRANK(HandCrankTileEntity::new, AllBlocks.HAND_CRANK), - CUCKOO_CLOCK(CuckooClockTileEntity::new, AllBlocks.CUCKOO_CLOCK, AllBlocks.MYSTERIOUS_CUCKOO_CLOCK), + TURNTABLE(TurntableTileEntity::new, AllBlocksNew.TURNTABLE), + HAND_CRANK(HandCrankTileEntity::new, AllBlocksNew.HAND_CRANK), + CUCKOO_CLOCK(CuckooClockTileEntity::new, AllBlocksNew.CUCKOO_CLOCK, AllBlocksNew.MYSTERIOUS_CUCKOO_CLOCK), BELT(BeltTileEntity::new, AllBlocksNew.BELT), BELT_TUNNEL(BeltTunnelTileEntity::new, AllBlocks.BELT_TUNNEL), - MECHANICAL_PISTON(MechanicalPistonTileEntity::new, AllBlocks.MECHANICAL_PISTON, AllBlocks.STICKY_MECHANICAL_PISTON), - MECHANICAL_BEARING(MechanicalBearingTileEntity::new, AllBlocks.MECHANICAL_BEARING), - CLOCKWORK_BEARING(ClockworkBearingTileEntity::new, AllBlocks.CLOCKWORK_BEARING), - ROPE_PULLEY(PulleyTileEntity::new, AllBlocks.ROPE_PULLEY), - CHASSIS(ChassisTileEntity::new, AllBlocks.ROTATION_CHASSIS, AllBlocks.TRANSLATION_CHASSIS, - AllBlocks.TRANSLATION_CHASSIS_SECONDARY), - DRILL(DrillTileEntity::new, AllBlocks.DRILL), - SAW(SawTileEntity::new, AllBlocks.SAW), - HARVESTER(HarvesterTileEntity::new, AllBlocks.HARVESTER), - FLYWHEEL(FlywheelTileEntity::new, AllBlocks.FLYWHEEL), - FURNACE_ENGINE(FurnaceEngineTileEntity::new, AllBlocks.FURNACE_ENGINE), - - MILLSTONE(MillstoneTileEntity::new, AllBlocks.MILLSTONE), - CRUSHING_WHEEL(CrushingWheelTileEntity::new, AllBlocks.CRUSHING_WHEEL), - CRUSHING_WHEEL_CONTROLLER(CrushingWheelControllerTileEntity::new, AllBlocks.CRUSHING_WHEEL_CONTROLLER), + MECHANICAL_PISTON(MechanicalPistonTileEntity::new, AllBlocksNew.MECHANICAL_PISTON, + AllBlocksNew.STICKY_MECHANICAL_PISTON), + MECHANICAL_BEARING(MechanicalBearingTileEntity::new, AllBlocksNew.MECHANICAL_BEARING), + CLOCKWORK_BEARING(ClockworkBearingTileEntity::new, AllBlocksNew.CLOCKWORK_BEARING), + ROPE_PULLEY(PulleyTileEntity::new, AllBlocksNew.ROPE_PULLEY), + CHASSIS(ChassisTileEntity::new, AllBlocksNew.RADIAL_CHASSIS, AllBlocksNew.LINEAR_CHASSIS, + AllBlocksNew.LINEAR_CHASSIS_SECONDARY), + DRILL(DrillTileEntity::new, AllBlocksNew.DRILL), + SAW(SawTileEntity::new, AllBlocksNew.SAW), + HARVESTER(HarvesterTileEntity::new, AllBlocksNew.HARVESTER), + FLYWHEEL(FlywheelTileEntity::new, AllBlocksNew.FLYWHEEL), + FURNACE_ENGINE(FurnaceEngineTileEntity::new, AllBlocksNew.FURNACE_ENGINE), + + MILLSTONE(MillstoneTileEntity::new, AllBlocksNew.MILLSTONE), + CRUSHING_WHEEL(CrushingWheelTileEntity::new, AllBlocksNew.CRUSHING_WHEEL), + CRUSHING_WHEEL_CONTROLLER(CrushingWheelControllerTileEntity::new, AllBlocksNew.CRUSHING_WHEEL_CONTROLLER), WATER_WHEEL(WaterWheelTileEntity::new, AllBlocksNew.WATER_WHEEL), - MECHANICAL_PRESS(MechanicalPressTileEntity::new, AllBlocks.MECHANICAL_PRESS), - MECHANICAL_MIXER(MechanicalMixerTileEntity::new, AllBlocks.MECHANICAL_MIXER), - DEPLOYER(DeployerTileEntity::new, AllBlocks.DEPLOYER), - BASIN(BasinTileEntity::new, AllBlocks.BASIN), - MECHANICAL_CRAFTER(MechanicalCrafterTileEntity::new, AllBlocks.MECHANICAL_CRAFTER), - SEQUENCED_GEARSHIFT(SequencedGearshiftTileEntity::new, AllBlocks.SEQUENCED_GEARSHIFT), - ROTATION_SPEED_CONTROLLER(SpeedControllerTileEntity::new, AllBlocks.ROTATION_SPEED_CONTROLLER), - SPEED_GAUGE(SpeedGaugeTileEntity::new, AllBlocks.SPEED_GAUGE), - STRESS_GAUGE(StressGaugeTileEntity::new, AllBlocks.STRESS_GAUGE), + MECHANICAL_PRESS(MechanicalPressTileEntity::new, AllBlocksNew.MECHANICAL_PRESS), + MECHANICAL_MIXER(MechanicalMixerTileEntity::new, AllBlocksNew.MECHANICAL_MIXER), + DEPLOYER(DeployerTileEntity::new, AllBlocksNew.DEPLOYER), + BASIN(BasinTileEntity::new, AllBlocksNew.BASIN), + 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), - CART_ASSEMBLER(CartAssemblerTileEntity::new, AllBlocks.CART_ASSEMBLER), + CART_ASSEMBLER(CartAssemblerTileEntity::new, AllBlocksNew.CART_ASSEMBLER), // Logistics REDSTONE_BRIDGE(RedstoneLinkTileEntity::new, AllBlocks.REDSTONE_BRIDGE), @@ -160,7 +162,7 @@ public enum AllTileEntities { 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), + 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), @@ -179,7 +181,8 @@ public enum AllTileEntities { } public boolean typeOf(TileEntity te) { - return te.getType().equals(type); + return te.getType() + .equals(type); } public static void register(RegistryEvent.Register> event) { @@ -189,9 +192,11 @@ public enum AllTileEntities { blocks[i] = tileEntity.blocks[i].get(); ResourceLocation resourceLocation = new ResourceLocation(Create.ID, Lang.asId(tileEntity.name())); - tileEntity.type = TileEntityType.Builder.create(tileEntity.supplier, blocks).build(null) - .setRegistryName(resourceLocation); - event.getRegistry().register(tileEntity.type); + tileEntity.type = TileEntityType.Builder.create(tileEntity.supplier, blocks) + .build(null) + .setRegistryName(resourceLocation); + event.getRegistry() + .register(tileEntity.type); } } @@ -221,7 +226,7 @@ public enum AllTileEntities { bind(MECHANICAL_BEARING, BearingTileEntityRenderer::new); bind(CLOCKWORK_BEARING, BearingTileEntityRenderer::new); bind(ROPE_PULLEY, PulleyRenderer::new); - bind(HARVESTER, HarvesterTileEntityRenderer::new); + bind(HARVESTER, HarvesterRenderer::new); bind(MILLSTONE, MillstoneRenderer::new); bind(CRUSHING_WHEEL, KineticTileEntityRenderer::new); @@ -248,10 +253,13 @@ public enum AllTileEntities { bind(FLEXPEATER, FlexpeaterTileEntityRenderer::new); } - @SuppressWarnings("unchecked") // TODO 1.15 this generic stuff is incompatible with the enum system - need strong types + @SuppressWarnings("unchecked") // TODO 1.15 this generic stuff is incompatible with the enum system - need + // strong types @OnlyIn(Dist.CLIENT) - private static void bind(AllTileEntities type, Function> renderer) { - ClientRegistry.bindTileEntityRenderer((TileEntityType) type.type, (Function>) renderer); + private static void bind(AllTileEntities type, + Function> renderer) { + ClientRegistry.bindTileEntityRenderer((TileEntityType) type.type, + (Function>) renderer); } } diff --git a/src/main/java/com/simibubi/create/SharedProperties.java b/src/main/java/com/simibubi/create/SharedProperties.java index 20e9ee23f..bb0042a89 100644 --- a/src/main/java/com/simibubi/create/SharedProperties.java +++ b/src/main/java/com/simibubi/create/SharedProperties.java @@ -8,14 +8,18 @@ import net.minecraft.block.material.PushReaction; public class SharedProperties { - static Material beltMaterial = + public static Material beltMaterial = new Material(MaterialColor.GRAY, false, true, true, true, true, false, false, PushReaction.NORMAL); - static Block kinetic() { + public static Block kinetic() { return Blocks.ANDESITE; } - static Block woodenKinetic() { + public static Block metalKinetic() { + return Blocks.GOLD_BLOCK; + } + + public static Block woodenKinetic() { 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 36dd65c61..995e2fa3a 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.stream.Collectors; import com.google.common.base.Predicate; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipes; @@ -154,24 +153,24 @@ public class CreateJEI implements IModPlugin { .setDisplayName( new StringTextComponent(TextFormatting.RESET + Lang.translate("recipe.blastingViaFan.fan"))); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.MILLSTONE.get()), millingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.CRUSHING_WHEEL.get()), crushingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.MILLSTONE.get()), millingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.CRUSHING_WHEEL.get()), crushingCategory.getUid()); registration.addRecipeCatalyst(splashingFan, splashingCategory.getUid()); registration.addRecipeCatalyst(smokingFan, smokingCategory.getUid()); registration.addRecipeCatalyst(blastingFan, blastingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_PRESS.get()), pressingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.MECHANICAL_PRESS.get()), pressingCategory.getUid()); registration.addRecipeCatalyst(new ItemStack(AllItems.PLACEMENT_HANDGUN.get()), blockzapperCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_MIXER.get()), mixingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.BASIN.get()), mixingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.SAW.get()), sawingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.SAW.get()), blockCuttingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.MECHANICAL_MIXER.get()), mixingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.BASIN.get()), mixingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.SAW.get()), sawingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.SAW.get()), blockCuttingCategory.getUid()); registration.addRecipeCatalyst(new ItemStack(Blocks.STONECUTTER), blockCuttingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_PRESS.get()), packingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocks.BASIN.get()), packingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.MECHANICAL_PRESS.get()), packingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.BASIN.get()), packingCategory.getUid()); registration.addRecipeCatalyst(AllItems.SAND_PAPER.asStack(), polishingCategory.getUid()); registration.addRecipeCatalyst(AllItems.RED_SAND_PAPER.asStack(), polishingCategory.getUid()); registration - .addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_CRAFTER.get()), + .addRecipeCatalyst(new ItemStack(AllBlocksNew.MECHANICAL_CRAFTER.get()), mechanicalCraftingCategory.getUid()); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java index b11f30e91..1be044a51 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java @@ -4,7 +4,7 @@ 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.ScreenResources; import com.simibubi.create.compat.jei.category.BlockCuttingCategory.CondensedBlockCuttingRecipe; import com.simibubi.create.compat.jei.category.animations.AnimatedSaw; @@ -26,7 +26,7 @@ public class BlockCuttingCategory extends CreateRecipeCategory { private AnimatedMixer mixer = new AnimatedMixer(); public MixingCategory() { - super("mixing", doubleItemIcon(AllBlocks.MECHANICAL_MIXER.get(), AllBlocks.BASIN.get()), + super("mixing", doubleItemIcon(AllBlocksNew.MECHANICAL_MIXER.get(), AllBlocksNew.BASIN.get()), emptyBackground(177, 70)); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java index b2a91f637..22f22b973 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei.category; import java.util.Arrays; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedPress; @@ -20,7 +20,7 @@ public class PackingCategory extends CreateRecipeCategory> { private AnimatedPress press = new AnimatedPress(true); public PackingCategory() { - super("packing", doubleItemIcon(AllBlocks.MECHANICAL_PRESS.get(), AllBlocks.BASIN.get()), + super("packing", doubleItemIcon(AllBlocksNew.MECHANICAL_PRESS.get(), AllBlocksNew.BASIN.get()), emptyBackground(177, 70)); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java index e01e749b4..4ed22fe8b 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java @@ -3,7 +3,7 @@ package com.simibubi.create.compat.jei.category; import java.util.Arrays; import java.util.List; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllItems; import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedPress; @@ -20,7 +20,7 @@ public class PressingCategory extends CreateRecipeCategory { private AnimatedPress press = new AnimatedPress(false); public PressingCategory() { - super("pressing", doubleItemIcon(AllBlocks.MECHANICAL_PRESS.get(), AllItems.IRON_SHEET.get()), + super("pressing", doubleItemIcon(AllBlocksNew.MECHANICAL_PRESS.get(), AllItems.IRON_SHEET.get()), emptyBackground(177, 70)); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java index c41b2d9ee..82ca90d2f 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java @@ -3,7 +3,7 @@ package com.simibubi.create.compat.jei.category; import java.util.Arrays; import java.util.List; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedSaw; import com.simibubi.create.modules.contraptions.components.saw.CuttingRecipe; @@ -20,7 +20,7 @@ public class SawingCategory extends CreateRecipeCategory { private AnimatedSaw saw = new AnimatedSaw(); public SawingCategory() { - super("sawing", doubleItemIcon(AllBlocks.SAW.get(), Items.OAK_LOG), emptyBackground(177, 70)); + super("sawing", doubleItemIcon(AllBlocksNew.SAW.get(), Items.OAK_LOG), emptyBackground(177, 70)); } @Override diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java index a00ad0f2a..57a3dc3af 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.GuiGameElement; @@ -23,7 +23,7 @@ public class AnimatedCrafter extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocks.MECHANICAL_CRAFTER.getDefault()) + GuiGameElement.of(AllBlocksNew.MECHANICAL_CRAFTER.getDefaultState()) .rotateBlock(0, 180, 0) .scale(scale) .render(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java index 1ae4cf281..068df3392 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.gui.GuiGameElement; import net.minecraft.block.BlockState; @@ -17,7 +17,7 @@ public class AnimatedCrushingWheels extends AnimatedKinetics { RenderSystem.rotatef(-22.5f, 0, 1, 0); int scale = 22; - BlockState wheel = AllBlocks.CRUSHING_WHEEL.get() + BlockState wheel = AllBlocksNew.CRUSHING_WHEEL.get() .getDefaultState() .with(BlockStateProperties.AXIS, Axis.X); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java index b0ef9dfd9..795db9fd6 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.GuiGameElement; @@ -21,7 +21,7 @@ public class AnimatedMillstone extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocks.MILLSTONE.getDefault()) + GuiGameElement.of(AllBlocksNew.MILLSTONE.getDefaultState()) .rotateBlock(22.5, 22.5, 0) .scale(scale) .render(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java index 6ee161b52..f25bdb2b0 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.gui.GuiGameElement; public class AnimatedMixer extends AnimatedKinetics { @@ -21,7 +21,7 @@ public class AnimatedMixer extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocks.MECHANICAL_MIXER.getDefault()) + GuiGameElement.of(AllBlocksNew.MECHANICAL_MIXER.getDefaultState()) .atLocal(0, 0, 0) .scale(scale) .render(); @@ -37,7 +37,7 @@ public class AnimatedMixer extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocks.BASIN.getDefault()) + GuiGameElement.of(AllBlocksNew.BASIN.getDefaultState()) .atLocal(0, 1.65, 0) .scale(scale) .render(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java index 4cb25e41b..924aa13e3 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java @@ -4,7 +4,7 @@ import static com.simibubi.create.foundation.utility.AnimationTickHolder.ticks; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.gui.GuiGameElement; import net.minecraft.client.Minecraft; @@ -31,7 +31,7 @@ public class AnimatedPress extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocks.MECHANICAL_PRESS.getDefault()) + GuiGameElement.of(AllBlocksNew.MECHANICAL_PRESS.getDefaultState()) .scale(scale) .render(); @@ -41,7 +41,7 @@ public class AnimatedPress extends AnimatedKinetics { .render(); if (basin) - GuiGameElement.of(AllBlocks.BASIN.getDefault()) + GuiGameElement.of(AllBlocksNew.BASIN.getDefaultState()) .atLocal(0, 1.65, 0) .scale(scale) .render(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java index 069de9139..f9af8e143 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.modules.contraptions.components.saw.SawBlock; @@ -28,7 +28,7 @@ public class AnimatedSaw extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocks.SAW.getDefault() + GuiGameElement.of(AllBlocksNew.SAW.getDefaultState() .with(SawBlock.FACING, Direction.UP) .with(SawBlock.RUNNING, true)) .rotateBlock(0, 0, 0) diff --git a/src/main/java/com/simibubi/create/config/StressConfigDefaults.java b/src/main/java/com/simibubi/create/config/StressConfigDefaults.java index 13816d34d..6414e0a2c 100644 --- a/src/main/java/com/simibubi/create/config/StressConfigDefaults.java +++ b/src/main/java/com/simibubi/create/config/StressConfigDefaults.java @@ -43,13 +43,13 @@ public class StressConfigDefaults { switch (block) { // case CREATIVE_MOTOR: // return 2048; - case FURNACE_ENGINE: - return 1024; - case MECHANICAL_BEARING: - return 512; +// case FURNACE_ENGINE: +// return 1024; +// case MECHANICAL_BEARING: +// return 512; // case ENCASED_FAN: - case HAND_CRANK: - return 32; +// case HAND_CRANK: +// return 32; // case WATER_WHEEL: // return 8; default: @@ -61,30 +61,30 @@ public class StressConfigDefaults { public static double getDefaultStressImpact(AllBlocks block) { switch (block) { - case CRUSHING_WHEEL: - case MECHANICAL_PRESS: - return 8; +// case CRUSHING_WHEEL: +// case MECHANICAL_PRESS: +// return 8; - case DRILL: - case SAW: - case DEPLOYER: - case MECHANICAL_MIXER: - case MILLSTONE: - return 4; +// case DRILL: +// case SAW: +// case DEPLOYER: +// case MECHANICAL_MIXER: +// case MILLSTONE: +// return 4; - case MECHANICAL_CRAFTER: - case TURNTABLE: - case MECHANICAL_PISTON: - case MECHANICAL_BEARING: - case CLOCKWORK_BEARING: - case ROPE_PULLEY: - case STICKY_MECHANICAL_PISTON: - return 2; +// case MECHANICAL_CRAFTER: +// case TURNTABLE: +// case MECHANICAL_PISTON: +// case MECHANICAL_BEARING: +// case CLOCKWORK_BEARING: +// case ROPE_PULLEY: +// case STICKY_MECHANICAL_PISTON: +// return 2; // case BELT: // case ENCASED_FAN: - case CUCKOO_CLOCK: - return 1; +// case CUCKOO_CLOCK: +// return 1; default: return 0; diff --git a/src/main/java/com/simibubi/create/data/CreateAdvancements.java b/src/main/java/com/simibubi/create/data/CreateAdvancements.java index dacaab574..295d555a1 100644 --- a/src/main/java/com/simibubi/create/data/CreateAdvancements.java +++ b/src/main/java/com/simibubi/create/data/CreateAdvancements.java @@ -11,7 +11,6 @@ import org.apache.logging.log4j.Logger; import com.google.common.collect.Sets; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllItems; import com.simibubi.create.Create; @@ -45,86 +44,82 @@ public class CreateAdvancements implements IDataProvider { public void register(Consumer t) { String id = Create.ID; - Advancement root = Advancement.Builder - .builder() - .withDisplay(AllItems.BRASS_HAND.asStack(), new TranslationTextComponent(LANG + "root"), - new TranslationTextComponent(LANG + "root.desc"), - new ResourceLocation(Create.ID, "textures/block/scoria_bricks.png"), FrameType.TASK, false, - false, false) - .withCriterion("0", InventoryChangeTrigger.Instance.forItems(new IItemProvider[] {})) - .register(t, id + ":root"); + Advancement root = Advancement.Builder.builder() + .withDisplay(AllItems.BRASS_HAND.asStack(), new TranslationTextComponent(LANG + "root"), + new TranslationTextComponent(LANG + "root.desc"), + new ResourceLocation(Create.ID, "textures/block/palettes/gabbro/bricks.png"), FrameType.TASK, false, + false, false) + .withCriterion("0", InventoryChangeTrigger.Instance.forItems(new IItemProvider[] {})) + .register(t, id + ":root"); - Advancement andesite_alloy = advancement("andesite_alloy", AllItems.ANDESITE_ALLOY.get(), TaskType.NORMAL) - .withParent(root) + Advancement andesite_alloy = + advancement("andesite_alloy", AllItems.ANDESITE_ALLOY.get(), TaskType.NORMAL).withParent(root) .withCriterion("0", itemGathered(AllItems.ANDESITE_ALLOY.get())) .register(t, id + ":andesite_alloy"); kineticsBranch(t, andesite_alloy); - Advancement water_wheel = advancement("water_wheel", AllBlocksNew.WATER_WHEEL.get(), TaskType.NORMAL) - .withParent(andesite_alloy) + Advancement water_wheel = + advancement("water_wheel", AllBlocksNew.WATER_WHEEL.get(), TaskType.NORMAL).withParent(andesite_alloy) .withCriterion("0", placeBlock(AllBlocksNew.WATER_WHEEL.get())) .withCriterion("1", AllTriggers.WATER_WHEEL.instance()) .register(t, id + ":water_wheel"); - Advancement lava_wheel = advancement("lava_wheel", Items.LAVA_BUCKET, TaskType.SECRET) - .withParent(water_wheel) - .withCriterion("0", AllTriggers.LAVA_WHEEL.instance()) - .register(t, id + ":lava_wheel"); + Advancement lava_wheel = advancement("lava_wheel", Items.LAVA_BUCKET, TaskType.SECRET).withParent(water_wheel) + .withCriterion("0", AllTriggers.LAVA_WHEEL.instance()) + .register(t, id + ":lava_wheel"); - Advancement millstone = kinecticAdvancement("millstone", AllBlocks.MILLSTONE, TaskType.NORMAL) - .withParent(andesite_alloy) + Advancement millstone = + kinecticAdvancement("millstone", AllBlocksNew.MILLSTONE.get(), TaskType.NORMAL).withParent(andesite_alloy) .register(t, id + ":millstone"); - Advancement andesite_casing = advancement("andesite_casing", AllBlocks.ANDESITE_CASING.get(), TaskType.GOAL) - .withParent(andesite_alloy) - .withCriterion("0", itemGathered(AllBlocks.ANDESITE_CASING.get())) + Advancement andesite_casing = + advancement("andesite_casing", AllBlocksNew.ANDESITE_CASING.get(), TaskType.GOAL).withParent(andesite_alloy) + .withCriterion("0", itemGathered(AllBlocksNew.ANDESITE_CASING.get())) .register(t, id + ":andesite_casing"); andesiteExpertLane(t, andesite_casing); - Advancement drill = kinecticAdvancement("drill", AllBlocks.DRILL, TaskType.NORMAL) - .withParent(andesite_casing) + Advancement drill = + kinecticAdvancement("drill", AllBlocksNew.DRILL.get(), TaskType.NORMAL).withParent(andesite_casing) .register(t, id + ":drill"); - Advancement press = advancement("press", AllBlocks.MECHANICAL_PRESS.get(), TaskType.MILESTONE) - .withParent(andesite_casing) + Advancement press = + advancement("press", AllBlocksNew.MECHANICAL_PRESS.get(), TaskType.MILESTONE).withParent(andesite_casing) .withCriterion("0", AllTriggers.BONK.instance()) .register(t, id + ":press"); Advancement rose_quartz = itemAdvancement("polished_rose_quartz", AllItems.POLISHED_ROSE_QUARTZ, TaskType.NORMAL) - .withParent(andesite_casing) - .register(t, id + ":polished_rose_quartz"); + .withParent(andesite_casing) + .register(t, id + ":polished_rose_quartz"); - Advancement electron_tube = itemAdvancement("electron_tube", AllItems.ELECTRON_TUBE, TaskType.NORMAL) - .withParent(rose_quartz) + Advancement electron_tube = + itemAdvancement("electron_tube", AllItems.ELECTRON_TUBE, TaskType.NORMAL).withParent(rose_quartz) .register(t, id + ":electron_tube"); - Advancement saw = - kinecticAdvancement("saw", AllBlocks.SAW, TaskType.NORMAL).withParent(press).register(t, id + ":saw"); + Advancement saw = kinecticAdvancement("saw", AllBlocksNew.SAW.get(), TaskType.NORMAL).withParent(press) + .register(t, id + ":saw"); - Advancement basin = advancement("basin", AllBlocks.BASIN.get(), TaskType.NORMAL) - .withParent(press) - .withCriterion("0", placeBlock(AllBlocks.BASIN.get())) - .withCriterion("1", AllTriggers.BASIN_THROW.instance()) - .register(t, id + ":basin"); + Advancement basin = advancement("basin", AllBlocksNew.BASIN.get(), TaskType.NORMAL).withParent(press) + .withCriterion("0", placeBlock(AllBlocksNew.BASIN.get())) + .withCriterion("1", AllTriggers.BASIN_THROW.instance()) + .register(t, id + ":basin"); - Advancement mixer = advancement("mixer", AllBlocks.MECHANICAL_MIXER.get(), TaskType.MILESTONE) - .withCriterion("0", placeBlock(AllBlocks.MECHANICAL_MIXER.get())) - .withCriterion("1", isPowered(AllBlocks.MECHANICAL_MIXER.get())) - .withCriterion("2", AllTriggers.MIXER_MIX.instance()) - .withParent(basin) - .register(t, id + ":mixer"); + Advancement mixer = advancement("mixer", AllBlocksNew.MECHANICAL_MIXER.get(), TaskType.MILESTONE) + .withCriterion("0", placeBlock(AllBlocksNew.MECHANICAL_MIXER.get())) + .withCriterion("1", isPowered(AllBlocksNew.MECHANICAL_MIXER.get())) + .withCriterion("2", AllTriggers.MIXER_MIX.instance()) + .withParent(basin) + .register(t, id + ":mixer"); Advancement compact = advancement("compact", Blocks.IRON_BLOCK, TaskType.NORMAL) - .withCriterion("0", AllTriggers.PRESS_COMPACT.instance()) - .withParent(basin) - .register(t, id + ":compact"); + .withCriterion("0", AllTriggers.PRESS_COMPACT.instance()) + .withParent(basin) + .register(t, id + ":compact"); - Advancement brass = itemAdvancement("brass", AllItems.BRASS_INGOT, TaskType.NORMAL) - .withParent(mixer) - .register(t, id + ":brass"); + Advancement brass = itemAdvancement("brass", AllItems.BRASS_INGOT, TaskType.NORMAL).withParent(mixer) + .register(t, id + ":brass"); brassAge(t, brass); copperAge(t, press); @@ -133,121 +128,113 @@ public class CreateAdvancements implements IDataProvider { void kineticsBranch(Consumer t, Advancement root) { String id = Create.ID; - Advancement its_alive = advancement("its_alive", AllBlocksNew.COGWHEEL.get(), TaskType.NORMAL) - .withParent(root) - .withCriterion("0", AllTriggers.ROTATION.instance()) - .register(t, id + ":its_alive"); + Advancement its_alive = advancement("its_alive", AllBlocksNew.COGWHEEL.get(), TaskType.NORMAL).withParent(root) + .withCriterion("0", AllTriggers.ROTATION.instance()) + .register(t, id + ":its_alive"); - Advancement belt = advancement("belt", AllItems.BELT_CONNECTOR.get(), TaskType.NORMAL) - .withParent(its_alive) - .withCriterion("0", AllTriggers.CONNECT_BELT.instance()) - .register(t, id + ":belt"); + Advancement belt = advancement("belt", AllItems.BELT_CONNECTOR.get(), TaskType.NORMAL).withParent(its_alive) + .withCriterion("0", AllTriggers.CONNECT_BELT.instance()) + .register(t, id + ":belt"); - Advancement wrench = itemAdvancement("wrench", AllItems.WRENCH, TaskType.NORMAL) - .withParent(its_alive) - .register(t, id + ":wrench"); + Advancement wrench = itemAdvancement("wrench", AllItems.WRENCH, TaskType.NORMAL).withParent(its_alive) + .register(t, id + ":wrench"); - Advancement goggles = itemAdvancement("goggles", AllItems.GOGGLES, TaskType.NORMAL) - .withParent(its_alive) - .register(t, id + ":goggles"); + Advancement goggles = itemAdvancement("goggles", AllItems.GOGGLES, TaskType.NORMAL).withParent(its_alive) + .register(t, id + ":goggles"); - Advancement speed_gauge = kinecticAdvancement("speed_gauge", AllBlocks.SPEED_GAUGE, TaskType.NORMAL) - .withParent(goggles) + Advancement speed_gauge = + kinecticAdvancement("speed_gauge", AllBlocksNew.SPEEDOMETER.get(), TaskType.NORMAL).withParent(goggles) .register(t, id + ":speed_gauge"); - Advancement stress_gauge = kinecticAdvancement("stress_gauge", AllBlocks.STRESS_GAUGE, TaskType.NORMAL) - .withParent(goggles) + Advancement stress_gauge = + kinecticAdvancement("stress_gauge", AllBlocksNew.STRESSOMETER.get(), TaskType.NORMAL).withParent(goggles) .register(t, id + ":stress_gauge"); - Advancement shifting_gears = advancement("shifting_gears", AllBlocksNew.LARGE_COGWHEEL.get(), TaskType.NORMAL) - .withParent(its_alive) + Advancement shifting_gears = + advancement("shifting_gears", AllBlocksNew.LARGE_COGWHEEL.get(), TaskType.NORMAL).withParent(its_alive) .withCriterion("0", AllTriggers.SHIFTING_GEARS.instance()) .register(t, id + ":shifting_gears"); - Advancement overstressed = advancement("overstressed", Items.BARRIER, TaskType.SECRET) - .withParent(its_alive) - .withCriterion("0", AllTriggers.OVERSTRESSED.instance()) - .register(t, id + ":overstressed"); + Advancement overstressed = advancement("overstressed", Items.BARRIER, TaskType.SECRET).withParent(its_alive) + .withCriterion("0", AllTriggers.OVERSTRESSED.instance()) + .register(t, id + ":overstressed"); } void copperAge(Consumer t, Advancement root) { String id = Create.ID; - Advancement copper_casing = advancement("copper_casing", AllBlocks.COPPER_CASING.get(), TaskType.GOAL) - .withParent(root) - .withCriterion("0", itemGathered(AllBlocks.COPPER_CASING.get())) + Advancement copper_casing = + advancement("copper_casing", AllBlocksNew.COPPER_CASING.get(), TaskType.GOAL).withParent(root) + .withCriterion("0", itemGathered(AllBlocksNew.COPPER_CASING.get())) .register(t, id + ":copper_casing"); - Advancement copper_end = deadEnd() - .withParent(copper_casing) - .withCriterion("0", itemGathered(AllBlocks.COPPER_CASING.get())) - .register(t, id + ":copper_end"); + Advancement copper_end = deadEnd().withParent(copper_casing) + .withCriterion("0", itemGathered(AllBlocksNew.COPPER_CASING.get())) + .register(t, id + ":copper_end"); } void brassAge(Consumer t, Advancement root) { String id = Create.ID; - Advancement brass_casing = advancement("brass_casing", AllBlocks.BRASS_CASING.get(), TaskType.GOAL) - .withParent(root) - .withCriterion("0", itemGathered(AllBlocks.BRASS_CASING.get())) + Advancement brass_casing = + advancement("brass_casing", AllBlocksNew.BRASS_CASING.get(), TaskType.GOAL).withParent(root) + .withCriterion("0", itemGathered(AllBlocksNew.BRASS_CASING.get())) .register(t, id + ":brass_casing"); - Advancement crafter = kinecticAdvancement("crafter", AllBlocks.MECHANICAL_CRAFTER, TaskType.MILESTONE) - .withParent(brass_casing) - .register(t, id + ":crafter"); + Advancement crafter = kinecticAdvancement("crafter", AllBlocksNew.MECHANICAL_CRAFTER.get(), TaskType.MILESTONE) + .withParent(brass_casing) + .register(t, id + ":crafter"); - Advancement deployer = kinecticAdvancement("deployer", AllBlocks.DEPLOYER, TaskType.GOAL) - .withParent(brass_casing) + Advancement deployer = + kinecticAdvancement("deployer", AllBlocksNew.DEPLOYER.get(), TaskType.GOAL).withParent(brass_casing) .register(t, id + ":deployer"); - Advancement fist_bump = advancement("fist_bump", AllBlocks.DEPLOYER.get(), TaskType.SECRET) - .withParent(deployer) - .withCriterion("0", AllTriggers.DEPLOYER_BOOP.instance()) - .register(t, id + ":fist_bump"); + Advancement fist_bump = advancement("fist_bump", AllBlocksNew.DEPLOYER.get(), TaskType.SECRET).withParent(deployer) + .withCriterion("0", AllTriggers.DEPLOYER_BOOP.instance()) + .register(t, id + ":fist_bump"); - Advancement crushing_wheel = advancement("crushing_wheel", AllBlocks.CRUSHING_WHEEL.get(), TaskType.MILESTONE) - .withParent(crafter) - .withCriterion("0", itemGathered(AllBlocks.CRUSHING_WHEEL.get())) + Advancement crushing_wheel = + advancement("crushing_wheel", AllBlocksNew.CRUSHING_WHEEL.get(), TaskType.MILESTONE).withParent(crafter) + .withCriterion("0", itemGathered(AllBlocksNew.CRUSHING_WHEEL.get())) .register(t, id + ":crushing_wheel"); Advancement chromatic_compound = itemAdvancement("chromatic_compound", AllItems.CHROMATIC_COMPOUND, TaskType.NORMAL) - .withParent(crushing_wheel) - .register(t, id + ":chromatic_compound"); + .withParent(crushing_wheel) + .register(t, id + ":chromatic_compound"); - Advancement shadow_steel = itemAdvancement("shadow_steel", AllItems.SHADOW_STEEL, TaskType.GOAL) - .withParent(chromatic_compound) + Advancement shadow_steel = + itemAdvancement("shadow_steel", AllItems.SHADOW_STEEL, TaskType.GOAL).withParent(chromatic_compound) .register(t, id + ":shadow_steel"); - Advancement refined_radiance = itemAdvancement("refined_radiance", AllItems.REFINED_RADIANCE, TaskType.GOAL) - .withParent(chromatic_compound) + Advancement refined_radiance = + itemAdvancement("refined_radiance", AllItems.REFINED_RADIANCE, TaskType.GOAL).withParent(chromatic_compound) .register(t, id + ":refined_radiance"); - Advancement deforester = itemAdvancement("deforester", AllItems.DEFORESTER, TaskType.NORMAL) - .withParent(refined_radiance) + Advancement deforester = + itemAdvancement("deforester", AllItems.DEFORESTER, TaskType.NORMAL).withParent(refined_radiance) .register(t, id + ":deforester"); - Advancement zapper = itemAdvancement("zapper", AllItems.PLACEMENT_HANDGUN, TaskType.NORMAL) - .withParent(refined_radiance) + Advancement zapper = + itemAdvancement("zapper", AllItems.PLACEMENT_HANDGUN, TaskType.NORMAL).withParent(refined_radiance) .register(t, id + ":zapper"); ItemStack gunWithPurpurStuff = AllItems.PLACEMENT_HANDGUN.asStack(); for (Components c : Components.values()) BlockzapperItem.setTier(c, ComponentTier.Chromatic, gunWithPurpurStuff); Advancement upgraded_zapper = advancement("upgraded_zapper", gunWithPurpurStuff, TaskType.CHALLENGE) - .withCriterion("0", AllTriggers.UPGRADED_ZAPPER.instance()) - .withParent(zapper) - .register(t, id + ":upgraded_zapper"); + .withCriterion("0", AllTriggers.UPGRADED_ZAPPER.instance()) + .withParent(zapper) + .register(t, id + ":upgraded_zapper"); - Advancement symmetry_wand = itemAdvancement("symmetry_wand", AllItems.SYMMETRY_WAND, TaskType.NORMAL) - .withParent(refined_radiance) + Advancement symmetry_wand = + itemAdvancement("symmetry_wand", AllItems.SYMMETRY_WAND, TaskType.NORMAL).withParent(refined_radiance) .register(t, id + ":symmetry_wand"); - - Advancement shadow_end = deadEnd() - .withParent(shadow_steel) - .withCriterion("0", itemGathered(AllItems.SHADOW_STEEL.get())) - .register(t, id + ":shadow_end"); + + Advancement shadow_end = deadEnd().withParent(shadow_steel) + .withCriterion("0", itemGathered(AllItems.SHADOW_STEEL.get())) + .register(t, id + ":shadow_end"); } private void andesiteExpertLane(Consumer t, Advancement root) { @@ -257,7 +244,8 @@ public class CreateAdvancements implements IDataProvider { // Datagen private static final Logger LOGGER = LogManager.getLogger(); - private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create(); + private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting() + .create(); private final DataGenerator generator; public CreateAdvancements(DataGenerator generatorIn) { @@ -275,7 +263,8 @@ public class CreateAdvancements implements IDataProvider { Path path1 = getPath(path, p_204017_3_); try { - IDataProvider.save(GSON, cache, p_204017_3_.copy().serialize(), path1); + IDataProvider.save(GSON, cache, p_204017_3_.copy() + .serialize(), path1); } catch (IOException ioexception) { LOGGER.error("Couldn't save advancement {}", path1, ioexception); } @@ -285,9 +274,11 @@ public class CreateAdvancements implements IDataProvider { } private static Path getPath(Path pathIn, Advancement advancementIn) { - return pathIn - .resolve("data/" + advancementIn.getId().getNamespace() + "/advancements/" - + advancementIn.getId().getPath() + ".json"); + return pathIn.resolve("data/" + advancementIn.getId() + .getNamespace() + "/advancements/" + + advancementIn.getId() + .getPath() + + ".json"); } @Override @@ -331,10 +322,9 @@ public class CreateAdvancements implements IDataProvider { } } - public Builder kinecticAdvancement(String name, AllBlocks block, TaskType type) { - return advancement(name, block.get(), type) - .withCriterion("0", placeBlock(block.get())) - .withCriterion("1", isPowered(block.get())); + public Builder kinecticAdvancement(String name, Block block, TaskType type) { + return advancement(name, block, type).withCriterion("0", placeBlock(block)) + .withCriterion("1", isPowered(block)); } public Builder advancement(String name, IItemProvider icon, TaskType type) { @@ -346,11 +336,10 @@ public class CreateAdvancements implements IDataProvider { } public Builder advancement(String name, ItemStack icon, TaskType type) { - return Advancement.Builder - .builder() - .withDisplay(icon, new TranslationTextComponent(LANG + name), - new TranslationTextComponent(LANG + name + ".desc"), null, type.frame, type.toast, - type.announce, type.hide); + return Advancement.Builder.builder() + .withDisplay(icon, new TranslationTextComponent(LANG + name), + new TranslationTextComponent(LANG + name + ".desc"), null, type.frame, type.toast, type.announce, + type.hide); } public Builder itemAdvancement(String name, AllItems item, TaskType type) { diff --git a/src/main/java/com/simibubi/create/foundation/block/RenderUtilityBlock.java b/src/main/java/com/simibubi/create/foundation/block/RenderUtilityBlock.java deleted file mode 100644 index 2c20166a8..000000000 --- a/src/main/java/com/simibubi/create/foundation/block/RenderUtilityBlock.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.simibubi.create.foundation.block; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; - -public class RenderUtilityBlock extends Block implements IRenderUtilityBlock { - - public RenderUtilityBlock() { - super(Properties.create(Material.AIR).noDrops()); - } - -} diff --git a/src/main/java/com/simibubi/create/foundation/registrate/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/registrate/CreateRegistrate.java index 92842cff6..887cfec33 100644 --- a/src/main/java/com/simibubi/create/foundation/registrate/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/foundation/registrate/CreateRegistrate.java @@ -99,13 +99,13 @@ public class CreateRegistrate extends AbstractRegistrate { .simpleItem(); } - public NonNullUnaryOperator> connectedTextures( + public static NonNullUnaryOperator> connectedTextures( ConnectedTextureBehaviour behavior) { return b -> b.onRegister(entry -> DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> registerModel(entry, behavior))); } @OnlyIn(Dist.CLIENT) - private void registerModel(Block entry, ConnectedTextureBehaviour behavior) { + private static void registerModel(Block entry, ConnectedTextureBehaviour behavior) { CreateClient.getCustomBlockModels() .register(entry.delegate, model -> new CTModel(model, behavior)); } 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 a465ce060..2e6c70ca8 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java +++ b/src/main/java/com/simibubi/create/foundation/utility/AllShapes.java @@ -57,6 +57,7 @@ public class AllShapes { 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() ; 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 a0657dcd5..c1d98acaa 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 @@ -5,6 +5,7 @@ import java.util.function.Function; 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.BlockState; import net.minecraft.item.BlockItem; @@ -22,13 +23,13 @@ public class AssetLookup { * Adding "powered", "vertical" will look for /block_powered_vertical.json */ public static ModelFile partialBaseModel(DataGenContext ctx, RegistrateBlockstateProvider prov, - String... suffix) { + String... suffix) { String string = "/block"; for (String suf : suffix) string += "_" + suf; final String location = "block/" + ctx.getName() + string; return prov.models() - .getExistingFile(prov.modLoc(location)); + .getExistingFile(prov.modLoc(location)); } /** @@ -36,7 +37,7 @@ public class AssetLookup { */ public static ModelFile standardModel(DataGenContext ctx, RegistrateBlockstateProvider prov) { return prov.models() - .getExistingFile(prov.modLoc("block/" + ctx.getName())); + .getExistingFile(prov.modLoc("block/" + ctx.getName())); } /** @@ -44,15 +45,34 @@ public class AssetLookup { * models/block/x/item.json */ public static ItemModelBuilder customItemModel(DataGenContext ctx, - RegistrateItemModelProvider prov) { + RegistrateItemModelProvider prov) { return prov.blockItem(() -> ctx.getEntry() - .getBlock(), "/item"); + .getBlock(), "/item"); + } + + /** + * Generate item model inheriting from a seperate model in + * 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")); + }; } public static Function forPowered(DataGenContext ctx, - RegistrateBlockstateProvider prov) { + RegistrateBlockstateProvider prov) { return state -> state.get(BlockStateProperties.POWERED) ? partialBaseModel(ctx, prov, "powered") - : partialBaseModel(ctx, prov); + : partialBaseModel(ctx, prov); + } + + 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 6ec70eba4..ee2d1dea1 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,9 +1,16 @@ package com.simibubi.create.foundation.utility.data; +import java.util.Vector; +import java.util.function.BiFunction; import java.util.function.Function; +import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.world.OxidizingBlock; +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.palettes.PavedBlock; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.providers.DataGenContext; @@ -14,9 +21,13 @@ import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.state.properties.RailShape; +import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; public class BlockStateGen { @@ -24,7 +35,7 @@ public class BlockStateGen { public static NonNullBiConsumer, RegistrateBlockstateProvider> axisBlockProvider( boolean customItem) { - return (c, p) -> BlockStateGen.axisBlock(c, p, getBlockModel(customItem, c, p)); + return (c, p) -> axisBlock(c, p, getBlockModel(customItem, c, p)); } public static NonNullBiConsumer, RegistrateBlockstateProvider> directionalBlockProvider( @@ -32,15 +43,30 @@ public class BlockStateGen { return (c, p) -> p.directionalBlock(c.get(), getBlockModel(customItem, c, p)); } + public static NonNullBiConsumer, RegistrateBlockstateProvider> horizontalBlockProvider( + boolean customItem) { + return (c, p) -> p.horizontalBlock(c.get(), getBlockModel(customItem, c, p)); + } + + public static NonNullBiConsumer, RegistrateBlockstateProvider> horizontalAxisBlockProvider( + boolean customItem) { + return (c, p) -> horizontalAxisBlock(c, p, getBlockModel(customItem, c, p)); + } + + public static NonNullBiConsumer, RegistrateBlockstateProvider> directionalAxisBlockProvider() { + return (c, p) -> directionalAxisBlock(c, p, ($, vertical) -> p.models() + .getExistingFile(p.modLoc("block/" + c.getName() + "/" + (vertical ? "vertical" : "horizontal")))); + } + public static NonNullBiConsumer, RegistrateBlockstateProvider> horizontalWheelProvider( boolean customItem) { - return (c, p) -> BlockStateGen.horizontalWheel(c, p, getBlockModel(customItem, c, p)); + return (c, p) -> horizontalWheel(c, p, getBlockModel(customItem, c, p)); } public static

NonNullUnaryOperator> oxidizedBlockstate() { return b -> b.blockstate((ctx, prov) -> prov.getVariantBuilder(ctx.getEntry()) .forAllStates(state -> { - String name = ModelGen.getOxidizedModel(ctx.getName(), state.get(OxidizingBlock.OXIDIZATION)); + String name = AssetLookup.getOxidizedModel(ctx.getName(), state.get(OxidizingBlock.OXIDIZATION)); return ConfiguredModel.builder() .modelFile(prov.models() .cubeAll(name, prov.modLoc(name))) @@ -70,6 +96,39 @@ public class BlockStateGen { }); } + public static void horizontalAxisBlock(DataGenContext ctx, + RegistrateBlockstateProvider prov, Function modelFunc) { + prov.getVariantBuilder(ctx.getEntry()) + .forAllStates(state -> { + Axis axis = state.get(BlockStateProperties.HORIZONTAL_AXIS); + return ConfiguredModel.builder() + .modelFile(modelFunc.apply(state)) + .rotationY(axis == Axis.X ? 90 : 0) + .build(); + }); + } + + public static void directionalAxisBlock(DataGenContext ctx, + RegistrateBlockstateProvider prov, BiFunction modelFunc) { + prov.getVariantBuilder(ctx.getEntry()) + .forAllStates(state -> { + + boolean alongFirst = state.get(DirectionalAxisKineticBlock.AXIS_ALONG_FIRST_COORDINATE); + Direction direction = state.get(DirectionalAxisKineticBlock.FACING); + boolean vertical = direction.getAxis() + .isHorizontal() && (direction.getAxis() == Axis.X) == alongFirst; + int xRot = direction == Direction.DOWN ? 270 : direction == Direction.UP ? 90 : 0; + int yRot = direction.getAxis() + .isVertical() ? alongFirst ? 0 : 90 : (int) direction.getHorizontalAngle(); + + return ConfiguredModel.builder() + .modelFile(modelFunc.apply(state, vertical)) + .rotationX(xRot) + .rotationY(yRot) + .build(); + }); + } + public static void horizontalWheel(DataGenContext ctx, RegistrateBlockstateProvider prov, Function modelFunc) { prov.getVariantBuilder(ctx.get()) @@ -101,4 +160,118 @@ public class BlockStateGen { .build()); } + public static NonNullBiConsumer, RegistrateBlockstateProvider> cartAssembler() { + return (c, p) -> p.getVariantBuilder(c.get()) + .forAllStates(state -> { + return ConfiguredModel.builder() + .modelFile(p.models() + .getExistingFile(p.modLoc("block/" + c.getName() + "/block" + + (state.get(CartAssemblerBlock.POWERED) ? "_powered" : "")))) + .rotationY(state.get(CartAssemblerBlock.RAIL_SHAPE) == RailShape.EAST_WEST ? 90 : 0) + .build(); + }); + } + + public static NonNullBiConsumer, RegistrateBlockstateProvider> linearChassis() { + return (c, p) -> { + ResourceLocation side = p.modLoc("block/" + c.getName() + "_side"); + ResourceLocation top = p.modLoc("block/translation_chassis_end"); + ResourceLocation top_sticky = p.modLoc("block/translation_chassis_end_sticky"); + + Vector models = new Vector<>(4); + for (boolean isTopSticky : Iterate.trueAndFalse) + for (boolean isBottomSticky : Iterate.trueAndFalse) + models.add(p.models() + .withExistingParent( + c.getName() + (isTopSticky ? "_top" : "") + (isBottomSticky ? "_bottom" : ""), + "block/cube_bottom_top") + .texture("side", side) + .texture("bottom", isBottomSticky ? top_sticky : top) + .texture("top", isTopSticky ? top_sticky : top)); + BiFunction modelFunc = (t, b) -> models.get((t ? 0 : 2) + (b ? 0 : 1)); + + axisBlock(c, p, state -> modelFunc.apply(state.get(LinearChassisBlock.STICKY_TOP), + state.get(LinearChassisBlock.STICKY_BOTTOM))); + }; + } + + public static NonNullBiConsumer, RegistrateBlockstateProvider> radialChassis() { + return (c, p) -> { + String path = "block/" + c.getName(); + ResourceLocation side = p.modLoc(path + "_side"); + ResourceLocation side_sticky = p.modLoc(path + "_side_sticky"); + + String templateModelPath = "block/rotation_chassis"; + ModelFile base = p.models() + .getExistingFile(p.modLoc(templateModelPath + "/base")); + Vector faces = new Vector<>(3); + Vector stickyFaces = new Vector<>(3); + + for (Axis axis : Iterate.axes) { + String suffix = "side_" + axis.getName(); + faces.add(p.models() + .withExistingParent("block/" + c.getName() + "_" + suffix, + p.modLoc(templateModelPath + "/" + suffix)) + .texture("side", side)); + } + for (Axis axis : Iterate.axes) { + String suffix = "side_" + axis.getName(); + stickyFaces.add(p.models() + .withExistingParent("block/" + c.getName() + "_" + suffix + "_sticky", + p.modLoc(templateModelPath + "/" + suffix)) + .texture("side", side_sticky)); + } + + MultiPartBlockStateBuilder builder = p.getMultipartBuilder(c.get()); + BlockState propertyGetter = c.get() + .getDefaultState() + .with(RadialChassisBlock.AXIS, Axis.Y); + + for (Axis axis : Iterate.axes) + builder.part() + .modelFile(base) + .rotationX(axis != Axis.Y ? 90 : 0) + .rotationY(axis != Axis.X ? 0 : 90) + .addModel() + .condition(RadialChassisBlock.AXIS, axis) + .end(); + + for (Direction face : Iterate.horizontalDirections) { + for (boolean sticky : Iterate.trueAndFalse) { + for (Axis axis : Iterate.axes) { + int horizontalAngle = (int) (face.getHorizontalAngle()); + int index = axis.ordinal(); + int xRot = 0; + int yRot = 0; + + if (axis == Axis.X) + xRot = -horizontalAngle + 180; + if (axis == Axis.Y) + yRot = horizontalAngle; + if (axis == Axis.Z) { + yRot = -horizontalAngle + 270; + + // blockstates can't have zRot, so here we are + if (face.getAxis() == Axis.Z) { + index = 0; + xRot = horizontalAngle + 180; + yRot = 90; + } + } + + builder.part() + .modelFile((sticky ? stickyFaces : faces).get(index)) + .rotationX((xRot + 360) % 360) + .rotationY((yRot + 360) % 360) + .addModel() + .condition(RadialChassisBlock.AXIS, axis) + .condition(c.get() + .getGlueableSide(propertyGetter, face), sticky) + .end(); + } + } + } + }; + } + } 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 new file mode 100644 index 000000000..13458d645 --- /dev/null +++ b/src/main/java/com/simibubi/create/foundation/utility/data/BuilderTransformers.java @@ -0,0 +1,68 @@ +package com.simibubi.create.foundation.utility.data; + +import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; + +import com.simibubi.create.Create; +import com.simibubi.create.SharedProperties; +import com.simibubi.create.config.StressConfigDefaults; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +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.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.ResourceLocation; + +public class BuilderTransformers { + + public static NonNullUnaryOperator> cuckooClock() { + return b -> b.initialProperties(SharedProperties::woodenKinetic) + .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")); + } + + public static NonNullUnaryOperator> casing( + CTSpriteShiftEntry ct) { + return b -> b.transform(connectedTextures(new StandardCTBehaviour(ct))) + .initialProperties(SharedProperties::kinetic) + .blockstate((c, p) -> p.simpleBlock(c.get())) + .simpleItem(); + } + + public static NonNullUnaryOperator> mechanicalPiston(PistonType type) { + return b -> b.initialProperties(SharedProperties::kinetic) + .blockstate(new MechanicalPistonGenerator(type)::generate) + .addLayer(() -> RenderType::getCutoutMipped) + .transform(StressConfigDefaults.setImpact(4.0)) + .item() + .transform(ModelGen.customItemModel("mechanical_piston", type.getName())); + } + + public static NonNullUnaryOperator> bearing(String prefix, + String backTexture) { + ResourceLocation baseBlockModelLocation = Create.asResource("block/bearing/block"); + 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) + .blockstate((c, p) -> p.directionalBlock(c.get(), p.models() + .withExistingParent(c.getName(), baseBlockModelLocation) + .texture("side", sideTextureLocation) + .texture("back", backTextureLocation))) + .item() + .model((c, p) -> p.withExistingParent(c.getName(), baseItemModelLocation) + .texture("side", sideTextureLocation) + .texture("back", backTextureLocation)) + .build(); + } + +} 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 0e5ce0e89..d3ed8e7c7 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 @@ -1,11 +1,9 @@ package com.simibubi.create.foundation.utility.data; import com.simibubi.create.Create; -import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.util.nullness.NonNullFunction; -import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; @@ -31,21 +29,21 @@ public class ModelGen { .texture("overlay", overlay); } - public static

NonNullFunction, P> oxidizedItemModel() { + public static NonNullFunction, P> oxidizedItemModel() { return b -> b .model((ctx, prov) -> prov.withExistingParent(ctx.getName(), - prov.modLoc(ModelGen.getOxidizedModel(ctx.getName(), 0)))) + prov.modLoc(AssetLookup.getOxidizedModel(ctx.getName(), 0)))) .build(); } - public static NonNullUnaryOperator> customItemModel() { - return b -> b.item() - .model(AssetLookup::customItemModel) + public static NonNullFunction, P> customItemModel() { + return b -> b.model(AssetLookup::customItemModel) .build(); } - public static String getOxidizedModel(String name, int level) { - return "block/oxidized/" + name + "_" + level; + public static NonNullFunction, P> customItemModel(String... folders) { + return b -> b.model(AssetLookup.customItemModel(folders)) + .build(); } } diff --git a/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java b/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java index 0a11e9e38..5bf6d9e29 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java +++ b/src/main/java/com/simibubi/create/foundation/utility/data/WindowGen.java @@ -1,5 +1,7 @@ package com.simibubi.create.foundation.utility.data; +import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; + import java.util.function.Function; import java.util.function.Supplier; @@ -59,7 +61,7 @@ public class WindowGen { Supplier> renderType, NonNullFunction endTexture, NonNullFunction sideTexture) { return REGISTRATE.block(name, WindowBlock::new) - .transform(REGISTRATE.connectedTextures(new HorizontalCTBehaviour(ct))) + .transform(connectedTextures(new HorizontalCTBehaviour(ct))) .addLayer(renderType) .initialProperties(() -> Blocks.GLASS) .blockstate((c, p) -> p.simpleBlock(c.get(), p.models() @@ -70,7 +72,7 @@ public class WindowGen { public static BlockEntry framedGlass(String name, ConnectedTextureBehaviour behaviour) { return REGISTRATE.block(name, ConnectedGlassBlock::new) - .transform(REGISTRATE.connectedTextures(behaviour)) + .transform(connectedTextures(behaviour)) .addLayer(() -> RenderType::getTranslucent) .initialProperties(() -> Blocks.GLASS) .blockstate((c, p) -> BlockStateGen.cubeAll(c, p, "palettes/", "framed_glass")) @@ -123,10 +125,10 @@ public class WindowGen { ResourceLocation sideTexture, ResourceLocation itemSideTexture, ResourceLocation topTexture, Supplier> renderType) { NonNullUnaryOperator> connectedTextures = - REGISTRATE.connectedTextures(new GlassPaneCTBehaviour(ctshift)); + connectedTextures(new GlassPaneCTBehaviour(ctshift)); String CGPparents = "block/connected_glass_pane/"; String prefix = name + "_pane_"; - + Function post = getPaneModelProvider(CGPparents, prefix, "post", sideTexture, topTexture), side = getPaneModelProvider(CGPparents, prefix, "side", sideTexture, topTexture), diff --git a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java index a6b08a8f1..19315fb0c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java @@ -6,7 +6,6 @@ import static net.minecraft.state.properties.BlockStateProperties.AXIS; import java.util.LinkedList; import java.util.List; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.modules.contraptions.base.IRotate; @@ -43,7 +42,8 @@ public class RotationPropagator { final BlockState stateTo = to.getBlockState(); final IRotate definitionFrom = (IRotate) stateFrom.getBlock(); final IRotate definitionTo = (IRotate) stateTo.getBlock(); - final BlockPos diff = to.getPos().subtract(from.getPos()); + final BlockPos diff = to.getPos() + .subtract(from.getPos()); final Direction direction = Direction.getFacingFromVector(diff.getX(), diff.getY(), diff.getZ()); final World world = from.getWorld(); @@ -55,14 +55,15 @@ public class RotationPropagator { boolean connectedByAxis = alignedAxes && definitionFrom.hasShaftTowards(world, from.getPos(), stateFrom, direction) - && definitionTo.hasShaftTowards(world, to.getPos(), stateTo, direction.getOpposite()); + && definitionTo.hasShaftTowards(world, to.getPos(), stateTo, direction.getOpposite()); boolean connectedByGears = definitionFrom.hasIntegratedCogwheel(world, from.getPos(), stateFrom) - && definitionTo.hasIntegratedCogwheel(world, to.getPos(), stateTo); + && definitionTo.hasIntegratedCogwheel(world, to.getPos(), stateTo); // Belt <-> Belt if (from instanceof BeltTileEntity && to instanceof BeltTileEntity && !connectedByAxis) { - return ((BeltTileEntity) from).getController().equals(((BeltTileEntity) to).getController()) ? 1 : 0; + return ((BeltTileEntity) from).getController() + .equals(((BeltTileEntity) to).getController()) ? 1 : 0; } // Axis <-> Axis @@ -115,7 +116,8 @@ public class RotationPropagator { private static float getConveyedSpeed(KineticTileEntity from, KineticTileEntity to) { final BlockState stateFrom = from.getBlockState(); final BlockState stateTo = to.getBlockState(); - final BlockPos diff = to.getPos().subtract(from.getPos()); + final BlockPos diff = to.getPos() + .subtract(from.getPos()); // Rotation Speed Controller <-> Large Gear if (isLargeCogToSpeedController(stateFrom, stateTo, diff)) @@ -153,7 +155,7 @@ public class RotationPropagator { if (te instanceof GearboxTileEntity) return direction.getAxis() == source.getAxis() ? direction == source ? 1 : -1 - : direction.getAxisDirection() == source.getAxisDirection() ? -1 : 1; + : direction.getAxisDirection() == source.getAxisDirection() ? -1 : 1; if (te instanceof SplitShaftTileEntity) return ((SplitShaftTileEntity) te).getRotationSpeedModifier(direction); @@ -177,7 +179,7 @@ public class RotationPropagator { } private static boolean isLargeCogToSpeedController(BlockState from, BlockState to, BlockPos diff) { - if (!isLargeCog(from) || !AllBlocks.ROTATION_SPEED_CONTROLLER.typeOf(to)) + if (!isLargeCog(from) || !AllBlocksNew.ROTATION_SPEED_CONTROLLER.has(to)) return false; if (!diff.equals(BlockPos.ZERO.up()) && !diff.equals(BlockPos.ZERO.down())) return false; @@ -337,7 +339,8 @@ public class RotationPropagator { currentTE.sendData(); for (KineticTileEntity neighbourTE : getConnectedNeighbours(currentTE)) { - if (neighbourTE.getPos().equals(missingSource)) + if (neighbourTE.getPos() + .equals(missingSource)) continue; if (!neighbourTE.hasSource()) continue; @@ -363,16 +366,19 @@ public class RotationPropagator { } private static KineticTileEntity findConnectedNeighbour(KineticTileEntity currentTE, BlockPos neighbourPos) { - BlockState neighbourState = currentTE.getWorld().getBlockState(neighbourPos); + BlockState neighbourState = currentTE.getWorld() + .getBlockState(neighbourPos); if (!(neighbourState.getBlock() instanceof IRotate)) return null; if (!neighbourState.hasTileEntity()) return null; - TileEntity neighbourTE = currentTE.getWorld().getTileEntity(neighbourPos); + TileEntity neighbourTE = currentTE.getWorld() + .getTileEntity(neighbourPos); if (!(neighbourTE instanceof KineticTileEntity)) return null; KineticTileEntity neighbourKTE = (KineticTileEntity) neighbourTE; - if (!(neighbourKTE.getBlockState().getBlock() instanceof IRotate)) + if (!(neighbourKTE.getBlockState() + .getBlock() instanceof IRotate)) return null; if (!isConnected(currentTE, neighbourKTE)) return null; @@ -382,7 +388,8 @@ public class RotationPropagator { public static boolean isConnected(KineticTileEntity from, KineticTileEntity to) { final BlockState stateFrom = from.getBlockState(); final BlockState stateTo = to.getBlockState(); - final BlockPos diff = to.getPos().subtract(from.getPos()); + final BlockPos diff = to.getPos() + .subtract(from.getPos()); if (isLargeCogToSpeedController(stateFrom, stateTo, diff)) return true; @@ -406,11 +413,13 @@ public class RotationPropagator { private static List getPotentialNeighbourLocations(KineticTileEntity te) { List neighbours = new LinkedList<>(); - if (!te.getWorld().isAreaLoaded(te.getPos(), 1)) + if (!te.getWorld() + .isAreaLoaded(te.getPos(), 1)) return neighbours; for (Direction facing : Direction.values()) - neighbours.add(te.getPos().offset(facing)); + neighbours.add(te.getPos() + .offset(facing)); // Some Blocks can interface diagonally BlockState blockState = te.getBlockState(); @@ -421,16 +430,18 @@ public class RotationPropagator { IRotate block = (IRotate) blockState.getBlock(); if (block.hasIntegratedCogwheel(te.getWorld(), te.getPos(), blockState) || isLargeWheel - || AllBlocksNew.BELT.has(blockState)) { + || AllBlocksNew.BELT.has(blockState)) { Axis axis = block.getRotationAxis(blockState); - BlockPos.getAllInBox(new BlockPos(-1, -1, -1), new BlockPos(1, 1, 1)).forEach(offset -> { - if (!isLargeWheel && axis.getCoordinate(offset.getX(), offset.getY(), offset.getZ()) != 0) - return; - if (offset.distanceSq(0, 0, 0, false) != BlockPos.ZERO.distanceSq(1, 1, 0, false)) - return; - neighbours.add(te.getPos().add(offset)); - }); + BlockPos.getAllInBox(new BlockPos(-1, -1, -1), new BlockPos(1, 1, 1)) + .forEach(offset -> { + if (!isLargeWheel && axis.getCoordinate(offset.getX(), offset.getY(), offset.getZ()) != 0) + return; + if (offset.distanceSq(0, 0, 0, false) != BlockPos.ZERO.distanceSq(1, 1, 0, false)) + return; + neighbours.add(te.getPos() + .add(offset)); + }); } return neighbours; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/AttachedActorBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/AttachedActorBlock.java index d1b882be7..8c245de5b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/AttachedActorBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/AttachedActorBlock.java @@ -6,7 +6,6 @@ import com.simibubi.create.modules.contraptions.components.contraptions.IPortabl import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.HorizontalBlock; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemUseContext; @@ -21,10 +20,10 @@ import net.minecraft.world.IWorldReader; public abstract class AttachedActorBlock extends HorizontalBlock implements IPortableBlock, IWrenchable { - public AttachedActorBlock() { - super(Properties.from(Blocks.IRON_BLOCK)); + protected AttachedActorBlock(Properties p_i48377_1_) { + super(p_i48377_1_); } - + @Override public ActionResultType onWrenched(BlockState state, ItemUseContext context) { return ActionResultType.FAIL; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java index 8f9c7b421..25f09b5ba 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillBlock.java @@ -8,7 +8,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.block.material.PushReaction; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; @@ -30,10 +29,10 @@ public class DrillBlock extends DirectionalKineticBlock implements IPortableBloc public static MovementBehaviour MOVEMENT = new DrillMovementBehaviour(); public static DamageSource damageSourceDrill = new DamageSource("create.drill").setDamageBypassesArmor(); - public DrillBlock() { - super(Properties.from(Blocks.IRON_BLOCK)); + public DrillBlock(Properties properties) { + super(properties); } - + @Override public boolean hasTileEntity(BlockState state) { return true; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java index 1fc163a8e..9bf0e14a9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/DrillTileEntityRenderer.java @@ -27,7 +27,7 @@ public class DrillTileEntityRenderer extends KineticTileEntityRenderer { } protected static SuperByteBuffer getRotatingModel(BlockState state) { - return AllBlockPartials.DRILL.renderOnDirectional(state); + return AllBlockPartials.DRILL_HEAD.renderOnDirectional(state); } public static SuperByteBuffer renderInContraption(MovementContext context) { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java index 9680be1f3..dca366a5d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterBlock.java @@ -11,6 +11,10 @@ public class HarvesterBlock extends AttachedActorBlock implements IPortableBlock public static MovementBehaviour MOVEMENT = new HarvesterMovementBehaviour(); + public HarvesterBlock(Properties p_i48377_1_) { + super(p_i48377_1_); + } + @Override public boolean hasTileEntity(BlockState state) { return true; @@ -21,11 +25,6 @@ public class HarvesterBlock extends AttachedActorBlock implements IPortableBlock return new HarvesterTileEntity(); } -// @Override // TOOD 1.15 register layer -// public BlockRenderLayer getRenderLayer() { -// return BlockRenderLayer.CUTOUT; -// } - @Override public MovementBehaviour getMovementBehaviour() { return MOVEMENT; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterMovementBehaviour.java index c18a8e0a5..596c14880 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterMovementBehaviour.java @@ -38,7 +38,7 @@ public class HarvesterMovementBehaviour extends MovementBehaviour { @Override @OnlyIn(value = Dist.CLIENT) public SuperByteBuffer renderInContraption(MovementContext context) { - return HarvesterTileEntityRenderer.renderInContraption(context); + return HarvesterRenderer.renderInContraption(context); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterRenderer.java similarity index 91% rename from src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterRenderer.java index 9d160e132..438155b26 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/actors/HarvesterRenderer.java @@ -20,9 +20,9 @@ import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class HarvesterTileEntityRenderer extends SafeTileEntityRenderer { +public class HarvesterRenderer extends SafeTileEntityRenderer { - public HarvesterTileEntityRenderer(TileEntityRendererDispatcher dispatcher) { + public HarvesterRenderer(TileEntityRendererDispatcher dispatcher) { super(dispatcher); } @@ -30,7 +30,7 @@ public class HarvesterTileEntityRenderer extends SafeTileEntityRenderer items) { @@ -42,13 +52,6 @@ public class CuckooClockBlock extends HorizontalKineticBlock { super.fillItemGroup(group, items); } - @Override - public String getTranslationKey() { - if (this == AllBlocks.MYSTERIOUS_CUCKOO_CLOCK.get()) - return AllBlocks.CUCKOO_CLOCK.get().getTranslationKey(); - return super.getTranslationKey(); - } - @Override public BlockState getStateForPlacement(BlockItemUseContext context) { Direction preferred = getPreferredHorizontalFacing(context); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/BlockMovementTraits.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/BlockMovementTraits.java index 5dd6ec9ff..653f4a364 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/BlockMovementTraits.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/BlockMovementTraits.java @@ -1,6 +1,5 @@ package com.simibubi.create.modules.contraptions.components.contraptions; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.modules.contraptions.components.actors.AttachedActorBlock; import com.simibubi.create.modules.contraptions.components.actors.HarvesterBlock; @@ -222,15 +221,15 @@ public class BlockMovementTraits { * piston */ public static boolean notSupportive(BlockState state, Direction facing) { - if (AllBlocks.DRILL.typeOf(state)) + if (AllBlocksNew.DRILL.has(state)) return state.get(BlockStateProperties.FACING) == facing; - if (AllBlocks.SAW.typeOf(state)) + if (AllBlocksNew.SAW.has(state)) return state.get(BlockStateProperties.FACING) == facing; - if (AllBlocks.PORTABLE_STORAGE_INTERFACE.typeOf(state)) + if (AllBlocksNew.PORTABLE_STORAGE_INTERFACE.has(state)) return state.get(PortableStorageInterfaceBlock.FACING) == facing; if (state.getBlock() instanceof AttachedActorBlock) return state.get(BlockStateProperties.HORIZONTAL_FACING) == facing; - if (AllBlocks.ROPE_PULLEY.typeOf(state)) + if (AllBlocksNew.ROPE_PULLEY.has(state)) return facing == Direction.DOWN; if (state.getBlock() instanceof CarpetBlock) return facing == Direction.UP; 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 d0206ee3e..354e305ec 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 @@ -1,5 +1,8 @@ package com.simibubi.create.modules.contraptions.components.contraptions; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPistonHead; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -31,8 +34,7 @@ import com.simibubi.create.modules.contraptions.components.contraptions.glue.Sup import com.simibubi.create.modules.contraptions.components.contraptions.glue.SuperGlueHandler; import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock; import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonHeadBlock; -import com.simibubi.create.modules.contraptions.components.contraptions.piston.PistonPoleBlock; +import com.simibubi.create.modules.contraptions.components.contraptions.piston.PistonExtensionPoleBlock; import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock; import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock.MagnetBlock; import com.simibubi.create.modules.contraptions.components.contraptions.pulley.PulleyBlock.RopeBlock; @@ -110,10 +112,11 @@ public abstract class Contraption { for (BlockInfo info : blocks.values()) { BlockPos offsetPos = info.pos.offset(movementDirection); - if (info.state.getCollisionShape(world, offsetPos).isEmpty()) + if (info.state.getCollisionShape(world, offsetPos) + .isEmpty()) continue; - if (blocks.containsKey(offsetPos) - && !blocks.get(offsetPos).state.getCollisionShape(world, offsetPos).isEmpty()) + if (blocks.containsKey(offsetPos) && !blocks.get(offsetPos).state.getCollisionShape(world, offsetPos) + .isEmpty()) continue; cachedColliders.add(info.pos); } @@ -144,18 +147,20 @@ public abstract class Contraption { } public void gatherStoredItems() { - List list = - storage.values().stream().map(MountedStorage::getItemHandler).collect(Collectors.toList()); + List list = storage.values() + .stream() + .map(MountedStorage::getItemHandler) + .collect(Collectors.toList()); inventory = new CombinedInvWrapper(Arrays.copyOf(list.toArray(), list.size(), IItemHandlerModifiable[].class)); } protected boolean addToInitialFrontier(World world, BlockPos pos, Direction forcedDirection, - List frontier) { + List frontier) { return true; } protected boolean moveBlock(World world, BlockPos pos, Direction forcedDirection, List frontier, - Set visited) { + Set visited) { visited.add(pos); frontier.remove(pos); @@ -210,14 +215,15 @@ public abstract class Contraption { while (limit-- >= 0) { searchPos = searchPos.offset(direction); BlockState blockState = world.getBlockState(searchPos); - if (AllBlocks.PISTON_POLE.typeOf(blockState)) { - if (blockState.get(PistonPoleBlock.FACING).getAxis() != direction.getAxis()) + if (isExtensionPole(blockState)) { + if (blockState.get(PistonExtensionPoleBlock.FACING) + .getAxis() != direction.getAxis()) break; if (!visited.contains(searchPos)) frontier.add(searchPos); continue; } - if (blockState.getBlock() instanceof MechanicalPistonHeadBlock) + if (isPistonHead(blockState)) if (!visited.contains(searchPos)) frontier.add(searchPos); break; @@ -230,8 +236,9 @@ public abstract class Contraption { while (limit-- >= 0) { searchPos = searchPos.offset(direction.getOpposite()); BlockState blockState = world.getBlockState(searchPos); - if (AllBlocks.PISTON_POLE.typeOf(blockState)) { - if (blockState.get(PistonPoleBlock.FACING).getAxis() != direction.getAxis()) + if (isExtensionPole(blockState)) { + if (blockState.get(PistonExtensionPoleBlock.FACING) + .getAxis() != direction.getAxis()) break; if (!visited.contains(searchPos)) frontier.add(searchPos); @@ -295,7 +302,7 @@ public abstract class Contraption { } private boolean moveChassis(World world, BlockPos pos, Direction movementDirection, List frontier, - Set visited) { + Set visited) { TileEntity te = world.getTileEntity(pos); if (!(te instanceof ChassisTileEntity)) return false; @@ -312,7 +319,7 @@ public abstract class Contraption { protected Pair capture(World world, BlockPos pos) { BlockState blockstate = world.getBlockState(pos); - if (AllBlocks.SAW.typeOf(blockstate)) + if (AllBlocksNew.SAW.has(blockstate)) blockstate = blockstate.with(SawBlock.RUNNING, true); if (blockstate.getBlock() instanceof ChestBlock) blockstate = blockstate.with(ChestBlock.TYPE, ChestType.SINGLE); @@ -322,11 +329,13 @@ public abstract class Contraption { blockstate = blockstate.with(ContactBlock.POWERED, true); if (blockstate.getBlock() instanceof AbstractButtonBlock) { blockstate = blockstate.with(AbstractButtonBlock.POWERED, false); - world.getPendingBlockTicks().scheduleTick(pos, blockstate.getBlock(), -1); + world.getPendingBlockTicks() + .scheduleTick(pos, blockstate.getBlock(), -1); } if (blockstate.getBlock() instanceof PressurePlateBlock) { blockstate = blockstate.with(PressurePlateBlock.POWERED, false); - world.getPendingBlockTicks().scheduleTick(pos, blockstate.getBlock(), -1); + world.getPendingBlockTicks() + .scheduleTick(pos, blockstate.getBlock(), -1); } CompoundNBT compoundnbt = getTileEntityNBT(world, pos); TileEntity tileentity = world.getTileEntity(pos); @@ -381,68 +390,75 @@ public abstract class Contraption { renderOrder.clear(); customRenderTEs.clear(); - nbt.getList("Blocks", 10).forEach(c -> { - CompoundNBT comp = (CompoundNBT) c; - BlockInfo info = new BlockInfo(NBTUtil.readBlockPos(comp.getCompound("Pos")), + nbt.getList("Blocks", 10) + .forEach(c -> { + CompoundNBT comp = (CompoundNBT) c; + BlockInfo info = new BlockInfo(NBTUtil.readBlockPos(comp.getCompound("Pos")), NBTUtil.readBlockState(comp.getCompound("Block")), comp.contains("Data") ? comp.getCompound("Data") : null); - blocks.put(info.pos, info); + blocks.put(info.pos, info); - if (world.isRemote) { - Block block = info.state.getBlock(); - if (RenderTypeLookup.canRenderInLayer(info.state, RenderType.getTranslucent())) - renderOrder.add(info.pos); - else - renderOrder.add(0, info.pos); - CompoundNBT tag = info.nbt; - if (tag == null || block instanceof IPortableBlock) - return; + if (world.isRemote) { + Block block = info.state.getBlock(); + if (RenderTypeLookup.canRenderInLayer(info.state, RenderType.getTranslucent())) + renderOrder.add(info.pos); + else + renderOrder.add(0, info.pos); + CompoundNBT tag = info.nbt; + if (tag == null || block instanceof IPortableBlock) + return; - tag.putInt("x", info.pos.getX()); - tag.putInt("y", info.pos.getY()); - tag.putInt("z", info.pos.getZ()); + tag.putInt("x", info.pos.getX()); + tag.putInt("y", info.pos.getY()); + tag.putInt("z", info.pos.getZ()); - TileEntity te = TileEntity.create(tag); - te.setLocation(new WrappedWorld(world) { + TileEntity te = TileEntity.create(tag); + te.setLocation(new WrappedWorld(world) { - @Override - public BlockState getBlockState(BlockPos pos) { - if (!pos.equals(te.getPos())) - return Blocks.AIR.getDefaultState(); - return info.state; - } + @Override + public BlockState getBlockState(BlockPos pos) { + if (!pos.equals(te.getPos())) + return Blocks.AIR.getDefaultState(); + return info.state; + } - }, te.getPos()); - if (te instanceof KineticTileEntity) - ((KineticTileEntity) te).setSpeed(0); - te.getBlockState(); - customRenderTEs.add(te); - } - }); + }, te.getPos()); + if (te instanceof KineticTileEntity) + ((KineticTileEntity) te).setSpeed(0); + te.getBlockState(); + customRenderTEs.add(te); + } + }); actors.clear(); - nbt.getList("Actors", 10).forEach(c -> { - CompoundNBT comp = (CompoundNBT) c; - BlockInfo info = blocks.get(NBTUtil.readBlockPos(comp.getCompound("Pos"))); - MovementContext context = MovementContext.readNBT(world, info, comp); - context.contraption = this; - getActors().add(MutablePair.of(info, context)); - }); + nbt.getList("Actors", 10) + .forEach(c -> { + CompoundNBT comp = (CompoundNBT) c; + BlockInfo info = blocks.get(NBTUtil.readBlockPos(comp.getCompound("Pos"))); + MovementContext context = MovementContext.readNBT(world, info, comp); + context.contraption = this; + getActors().add(MutablePair.of(info, context)); + }); superglue.clear(); - nbt.getList("Superglue", 10).forEach(c -> { - CompoundNBT comp = (CompoundNBT) c; - superglue.add(Pair.of(NBTUtil.readBlockPos(comp.getCompound("Pos")), + nbt.getList("Superglue", 10) + .forEach(c -> { + CompoundNBT comp = (CompoundNBT) c; + superglue.add(Pair.of(NBTUtil.readBlockPos(comp.getCompound("Pos")), Direction.byIndex(comp.getByte("Direction")))); - }); + }); storage.clear(); - nbt.getList("Storage", 10).forEach(c -> { - CompoundNBT comp = (CompoundNBT) c; - storage.put(NBTUtil.readBlockPos(comp.getCompound("Pos")), new MountedStorage(comp.getCompound("Data"))); - }); - List list = - storage.values().stream().map(MountedStorage::getItemHandler).collect(Collectors.toList()); + nbt.getList("Storage", 10) + .forEach(c -> { + CompoundNBT comp = (CompoundNBT) c; + storage.put(NBTUtil.readBlockPos(comp.getCompound("Pos")), + new MountedStorage(comp.getCompound("Data"))); + }); + List list = storage.values() + .stream() + .map(MountedStorage::getItemHandler) + .collect(Collectors.toList()); inventory = new CombinedInvWrapper(Arrays.copyOf(list.toArray(), list.size(), IItemHandlerModifiable[].class)); if (nbt.contains("BoundsFront")) @@ -478,7 +494,8 @@ public abstract class Contraption { for (Pair glueEntry : superglue) { CompoundNBT c = new CompoundNBT(); c.put("Pos", NBTUtil.writeBlockPos(glueEntry.getKey())); - c.putByte("Direction", (byte) glueEntry.getValue().getIndex()); + c.putByte("Direction", (byte) glueEntry.getValue() + .getIndex()); superglueNBT.add(c); } @@ -517,22 +534,27 @@ public abstract class Contraption { } public void removeBlocksFromWorld(IWorld world, BlockPos offset, BiPredicate customRemoval) { - storage.values().forEach(MountedStorage::empty); + storage.values() + .forEach(MountedStorage::empty); glueToRemove.forEach(SuperGlueEntity::remove); for (boolean brittles : Iterate.trueAndFalse) { - for (Iterator iterator = blocks.values().iterator(); iterator.hasNext();) { + for (Iterator iterator = blocks.values() + .iterator(); iterator.hasNext();) { BlockInfo block = iterator.next(); if (brittles != BlockMovementTraits.isBrittle(block.state)) continue; - BlockPos add = block.pos.add(anchor).add(offset); + BlockPos add = block.pos.add(anchor) + .add(offset); if (customRemoval.test(add, block.state)) continue; - Block blockIn = world.getBlockState(add).getBlock(); + Block blockIn = world.getBlockState(add) + .getBlock(); if (block.state.getBlock() != blockIn) iterator.remove(); - world.getWorld().removeTileEntity(add); + world.getWorld() + .removeTileEntity(add); int flags = 67; if (blockIn instanceof DoorBlock) flags = flags | 32 | 16; @@ -546,7 +568,7 @@ public abstract class Contraption { } public void addBlocksToWorld(World world, BlockPos offset, Vec3d rotation, - BiPredicate customPlacement) { + BiPredicate customPlacement) { stop(world); StructureTransform transform = new StructureTransform(offset, rotation); @@ -565,15 +587,16 @@ public abstract class Contraption { if (nonBrittles) for (Direction face : Direction.values()) state = state.updatePostPlacement(face, world.getBlockState(targetPos.offset(face)), world, - targetPos, targetPos.offset(face)); + targetPos, targetPos.offset(face)); - if (AllBlocks.SAW.typeOf(state)) + if (AllBlocksNew.SAW.has(state)) state = state.with(SawBlock.RUNNING, false); BlockState blockState = world.getBlockState(targetPos); - if (blockState.getBlockHardness(world, targetPos) == -1 - || (state.getCollisionShape(world, targetPos).isEmpty() - && !blockState.getCollisionShape(world, targetPos).isEmpty())) { + if (blockState.getBlockHardness(world, targetPos) == -1 || (state.getCollisionShape(world, targetPos) + .isEmpty() + && !blockState.getCollisionShape(world, targetPos) + .isEmpty())) { if (targetPos.getY() == 0) targetPos = targetPos.up(); world.playEvent(2001, targetPos, Block.getStateId(state)); @@ -685,10 +708,13 @@ public abstract class Contraption { if (axis == Axis.Z) maxDiff = Math.max(maxXDiff, maxYDiff); - Vec3d vec = new Vec3d(Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis).getDirectionVec()); + Vec3d vec = new Vec3d(Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis) + .getDirectionVec()); Vec3d planeByNormal = VecHelper.planeByNormal(vec); - Vec3d min = vec.mul(bb.minX, bb.minY, bb.minZ).add(planeByNormal.scale(-maxDiff)); - Vec3d max = vec.mul(bb.maxX, bb.maxY, bb.maxZ).add(planeByNormal.scale(maxDiff + 1)); + Vec3d min = vec.mul(bb.minX, bb.minY, bb.minZ) + .add(planeByNormal.scale(-maxDiff)); + Vec3d max = vec.mul(bb.maxX, bb.maxY, bb.maxZ) + .add(planeByNormal.scale(maxDiff + 1)); bounds = new AxisAlignedBB(min, max); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java index f92f4db64..deded5b25 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java @@ -3,7 +3,7 @@ package com.simibubi.create.modules.contraptions.components.contraptions; import java.util.HashMap; import java.util.Map; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.modules.contraptions.components.actors.BlockBreakingMovementBehaviour; import net.minecraft.block.BlockState; @@ -270,7 +270,7 @@ public class ContraptionCollider { } } - if (AllBlocks.PULLEY_MAGNET.typeOf(collidedState) && pos.equals(BlockPos.ZERO) + if (AllBlocksNew.PULLEY_MAGNET.has(collidedState) && pos.equals(BlockPos.ZERO) && movementDirection == Direction.UP) continue; if (collidedState.getBlock() instanceof CocoaBlock) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionRenderer.java index 918c8e2bb..8fab0d322 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionRenderer.java @@ -56,7 +56,7 @@ public class ContraptionRenderer { BlockRendererDispatcher dispatcher = Minecraft.getInstance().getBlockRendererDispatcher(); BlockModelRenderer blockRenderer = dispatcher.getBlockModelRenderer(); Random random = new Random(); - BufferBuilder builder = new BufferBuilder(0); + BufferBuilder builder = new BufferBuilder(DefaultVertexFormats.BLOCK.getIntegerSize()); builder.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); for (BlockInfo info : c.blocks.values()) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingBlock.java index 3d2490654..e47b51152 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingBlock.java @@ -3,7 +3,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.bearing import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; @@ -11,8 +10,8 @@ import net.minecraft.world.IWorldReader; public abstract class BearingBlock extends DirectionalKineticBlock { - public BearingBlock() { - super(Properties.from(Blocks.PISTON)); + public BearingBlock(Properties properties) { + super(properties); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingTileEntityRenderer.java index c8252b30b..f111b64b7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/BearingTileEntityRenderer.java @@ -27,7 +27,7 @@ public class BearingTileEntityRenderer extends KineticTileEntityRenderer { IBearingTileEntity bearingTe = (IBearingTileEntity) te; final Direction facing = te.getBlockState().get(BlockStateProperties.FACING); - SuperByteBuffer superBuffer = AllBlockPartials.MECHANICAL_BEARING_TOP.renderOn(te.getBlockState()); + SuperByteBuffer superBuffer = AllBlockPartials.BEARING_TOP.renderOn(te.getBlockState()); superBuffer.rotateCentered(Axis.X, AngleHelper.rad(-90 - AngleHelper.verticalAngle(facing))); if (facing.getAxis().isHorizontal()) superBuffer.rotateCentered(Axis.Y, AngleHelper.rad(AngleHelper.horizontalAngle(facing.getOpposite()))); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingBlock.java index 638d5e10d..170710fc8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/ClockworkBearingBlock.java @@ -14,6 +14,10 @@ import net.minecraft.world.World; public class ClockworkBearingBlock extends BearingBlock implements ITE { + public ClockworkBearingBlock(Properties properties) { + super(properties); + } + @Override public TileEntity createTileEntity(BlockState state, IBlockReader world) { return new ClockworkBearingTileEntity(); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java index 3e67454f6..a7034436d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/bearing/MechanicalBearingBlock.java @@ -16,6 +16,10 @@ import net.minecraft.world.World; public class MechanicalBearingBlock extends BearingBlock implements ITE { + public MechanicalBearingBlock(Properties properties) { + super(properties); + } + @Override public TileEntity createTileEntity(BlockState state, IBlockReader world) { return new MechanicalBearingTileEntity(); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java index 3a2e58f89..a1cd9f36f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java @@ -9,7 +9,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllTileEntities; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.foundation.behaviour.CenteredSideValueBoxTransform; @@ -111,7 +111,7 @@ public class ChassisTileEntity extends SmartTileEntity { return false; BlockState neighbourState = world.getBlockState(currentPos); - if (!AllBlocks.ROTATION_CHASSIS.typeOf(neighbourState)) + if (!AllBlocksNew.RADIAL_CHASSIS.has(neighbourState)) continue; if (axis != neighbourState.get(BlockStateProperties.AXIS)) continue; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java index 344647b8c..4433b50a0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java @@ -1,17 +1,17 @@ package com.simibubi.create.modules.contraptions.components.contraptions.chassis; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; 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; import net.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ILightReader; @@ -21,9 +21,10 @@ public class LinearChassisBlock extends AbstractChassisBlock { public static final BooleanProperty STICKY_TOP = BooleanProperty.create("sticky_top"); public static final BooleanProperty STICKY_BOTTOM = BooleanProperty.create("sticky_bottom"); - public LinearChassisBlock() { - super(Properties.from(Blocks.PISTON)); - setDefaultState(getDefaultState().with(STICKY_TOP, false).with(STICKY_BOTTOM, false)); + public LinearChassisBlock(Properties properties) { + super(properties); + setDefaultState(getDefaultState().with(STICKY_TOP, false) + .with(STICKY_BOTTOM, false)); } @Override @@ -34,12 +35,18 @@ public class LinearChassisBlock extends AbstractChassisBlock { @Override public BlockState getStateForPlacement(BlockItemUseContext context) { - BlockPos placedOnPos = context.getPos().offset(context.getFace().getOpposite()); - BlockState blockState = context.getWorld().getBlockState(placedOnPos); - if (isChassis(blockState) && !context.getPlayer().isSneaking()) + BlockPos placedOnPos = context.getPos() + .offset(context.getFace() + .getOpposite()); + BlockState blockState = context.getWorld() + .getBlockState(placedOnPos); + if (isChassis(blockState) && !context.getPlayer() + .isSneaking()) return getDefaultState().with(AXIS, blockState.get(AXIS)); - if (!context.getPlayer().isSneaking()) - return getDefaultState().with(AXIS, context.getNearestLookingDirection().getAxis()); + if (!context.getPlayer() + .isSneaking()) + return getDefaultState().with(AXIS, context.getNearestLookingDirection() + .getAxis()); return super.getStateForPlacement(context); } @@ -50,16 +57,8 @@ public class LinearChassisBlock extends AbstractChassisBlock { return face.getAxisDirection() == AxisDirection.POSITIVE ? STICKY_TOP : STICKY_BOTTOM; } - @Override - public String getTranslationKey() { - Block block = AllBlocks.TRANSLATION_CHASSIS.get(); - if (this == block) - return super.getTranslationKey(); - return block.getTranslationKey(); - } - public static boolean isChassis(BlockState state) { - return AllBlocks.TRANSLATION_CHASSIS.typeOf(state) || AllBlocks.TRANSLATION_CHASSIS_SECONDARY.typeOf(state); + return AllBlocksNew.LINEAR_CHASSIS.has(state) || AllBlocksNew.LINEAR_CHASSIS_SECONDARY.has(state); } public static boolean sameKind(BlockState state1, BlockState state2) { @@ -79,14 +78,15 @@ public class LinearChassisBlock extends AbstractChassisBlock { @Override public boolean reverseUVs(BlockState state, Direction face) { - if (state.get(AXIS).isHorizontal() && face.getAxisDirection() == AxisDirection.POSITIVE) + Axis axis = state.get(AXIS); + if (axis.isHorizontal() && (axis == Axis.Z ^ face.getAxisDirection() == AxisDirection.POSITIVE)) return true; return super.reverseUVs(state, face); } @Override public boolean connectsTo(BlockState state, BlockState other, ILightReader reader, BlockPos pos, - BlockPos otherPos, Direction face) { + BlockPos otherPos, Direction face) { return sameKind(state, other) && state.get(AXIS) == other.get(AXIS); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/RadialChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/RadialChassisBlock.java index 1477cc566..7529b113f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/RadialChassisBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/RadialChassisBlock.java @@ -2,7 +2,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.chassis 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; @@ -15,8 +14,8 @@ public class RadialChassisBlock extends AbstractChassisBlock { public static final BooleanProperty STICKY_EAST = BooleanProperty.create("sticky_east"); public static final BooleanProperty STICKY_WEST = BooleanProperty.create("sticky_west"); - public RadialChassisBlock() { - super(Properties.from(Blocks.PISTON)); + public RadialChassisBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(STICKY_EAST, false).with(STICKY_SOUTH, false).with(STICKY_NORTH, false) .with(STICKY_WEST, false)); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java index f7ff24e85..5eb76ce99 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java @@ -1,8 +1,7 @@ package com.simibubi.create.modules.contraptions.components.contraptions.mounted; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.block.RenderUtilityBlock; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.IWrenchable; import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; @@ -11,7 +10,6 @@ import com.simibubi.create.modules.contraptions.components.contraptions.mounted. import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.item.minecart.AbstractMinecartEntity; import net.minecraft.entity.item.minecart.FurnaceMinecartEntity; @@ -39,8 +37,8 @@ public class CartAssemblerBlock extends AbstractRailBlock implements ITE builder) { @@ -187,7 +189,7 @@ public class CartAssemblerBlock extends AbstractRailBlock implements ITE capture(World world, BlockPos pos) { Pair pair = super.capture(world, pos); BlockInfo capture = pair.getKey(); - if (AllBlocks.CART_ASSEMBLER.typeOf(capture.state)) + if (AllBlocksNew.CART_ASSEMBLER.has(capture.state)) return Pair.of(new BlockInfo(capture.pos, CartAssemblerBlock.createAnchor(capture.state), null), pair.getValue()); return pair; @@ -108,7 +108,7 @@ public class MountedContraption extends Contraption { @Override public void addBlocksToWorld(World world, BlockPos offset, Vec3d rotation) { - super.addBlocksToWorld(world, offset, rotation, (pos, state) -> AllBlocks.MINECART_ANCHOR.typeOf(state)); + super.addBlocksToWorld(world, offset, rotation, (pos, state) -> AllBlocksNew.MINECART_ANCHOR.has(state)); } } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java index ced89a706..073e59180 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.foundation.block.ITE; @@ -10,7 +10,6 @@ import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock 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.ItemUseContext; import net.minecraft.particles.ParticleTypes; @@ -33,15 +32,23 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.common.Tags; -public class MechanicalPistonBlock extends DirectionalAxisKineticBlock - implements ITE { +public class MechanicalPistonBlock extends DirectionalAxisKineticBlock implements ITE { public static final EnumProperty STATE = EnumProperty.create("state", PistonState.class); protected boolean isSticky; - public MechanicalPistonBlock(boolean sticky) { - super(Properties.from(Blocks.PISTON)); - setDefaultState(getDefaultState().with(FACING, Direction.NORTH).with(STATE, PistonState.RETRACTED)); + public static MechanicalPistonBlock normal(Properties properties) { + return new MechanicalPistonBlock(properties, false); + } + + public static MechanicalPistonBlock sticky(Properties properties) { + return new MechanicalPistonBlock(properties, true); + } + + protected MechanicalPistonBlock(Properties properties, boolean sticky) { + super(properties); + setDefaultState(getDefaultState().with(FACING, Direction.NORTH) + .with(STATE, PistonState.RETRACTED)); isSticky = sticky; } @@ -53,13 +60,16 @@ public class MechanicalPistonBlock extends DirectionalAxisKineticBlock @Override public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, - BlockRayTraceResult hit) { + BlockRayTraceResult hit) { if (!player.isAllowEdit()) return ActionResultType.PASS; if (player.isSneaking()) return ActionResultType.PASS; - if (!player.getHeldItem(handIn).getItem().isIn(Tags.Items.SLIMEBALLS)) { - if (player.getHeldItem(handIn).isEmpty()) { + if (!player.getHeldItem(handIn) + .getItem() + .isIn(Tags.Items.SLIMEBALLS)) { + if (player.getHeldItem(handIn) + .isEmpty()) { withTileEntityDo(worldIn, pos, te -> te.assembleNextTick = true); return ActionResultType.SUCCESS; } @@ -79,9 +89,11 @@ public class MechanicalPistonBlock extends DirectionalAxisKineticBlock } worldIn.playSound(null, pos, AllSoundEvents.SLIME_ADDED.get(), SoundCategory.BLOCKS, .5f, 1); if (!player.isCreative()) - player.getHeldItem(handIn).shrink(1); - worldIn.setBlockState(pos, AllBlocks.STICKY_MECHANICAL_PISTON.get().getDefaultState().with(FACING, direction) - .with(AXIS_ALONG_FIRST_COORDINATE, state.get(AXIS_ALONG_FIRST_COORDINATE))); + player.getHeldItem(handIn) + .shrink(1); + worldIn.setBlockState(pos, AllBlocksNew.STICKY_MECHANICAL_PISTON.getDefaultState() + .with(FACING, direction) + .with(AXIS_ALONG_FIRST_COORDINATE, state.get(AXIS_ALONG_FIRST_COORDINATE))); return ActionResultType.SUCCESS; } @@ -123,11 +135,11 @@ public class MechanicalPistonBlock extends DirectionalAxisKineticBlock BlockPos currentPos = pos.offset(direction, offset); BlockState block = worldIn.getBlockState(currentPos); - if (AllBlocks.PISTON_POLE.typeOf(block) - && direction.getAxis() == block.get(BlockStateProperties.FACING).getAxis()) + if (isExtensionPole(block) && direction.getAxis() == block.get(BlockStateProperties.FACING) + .getAxis()) continue; - if (AllBlocks.MECHANICAL_PISTON_HEAD.typeOf(block) && block.get(BlockStateProperties.FACING) == direction) { + if (isPistonHead(block) && block.get(BlockStateProperties.FACING) == direction) { pistonHead = currentPos; } @@ -135,16 +147,17 @@ public class MechanicalPistonBlock extends DirectionalAxisKineticBlock } if (pistonHead != null && pistonBase != null) { - BlockPos.getAllInBox(pistonBase, pistonHead).filter(p -> !p.equals(pos)) - .forEach(p -> worldIn.destroyBlock(p, dropBlocks)); + BlockPos.getAllInBox(pistonBase, pistonHead) + .filter(p -> !p.equals(pos)) + .forEach(p -> worldIn.destroyBlock(p, dropBlocks)); } for (int offset = 1; offset < maxPoles; offset++) { BlockPos currentPos = pos.offset(direction.getOpposite(), offset); BlockState block = worldIn.getBlockState(currentPos); - if (AllBlocks.PISTON_POLE.typeOf(block) - && direction.getAxis() == block.get(BlockStateProperties.FACING).getAxis()) { + if (isExtensionPole(block) && direction.getAxis() == block.get(BlockStateProperties.FACING) + .getAxis()) { worldIn.destroyBlock(currentPos, dropBlocks); continue; } @@ -176,4 +189,19 @@ public class MechanicalPistonBlock extends DirectionalAxisKineticBlock return MechanicalPistonTileEntity.class; } + public static boolean isPiston(BlockState state) { + return AllBlocksNew.MECHANICAL_PISTON.has(state) || isStickyPiston(state); + } + + public static boolean isStickyPiston(BlockState state) { + return AllBlocksNew.STICKY_MECHANICAL_PISTON.has(state); + } + + public static boolean isExtensionPole(BlockState state) { + return AllBlocksNew.PISTON_EXTENSION_POLE.has(state); + } + + public static boolean isPistonHead(BlockState state) { + return AllBlocksNew.MECHANICAL_PISTON_HEAD.has(state); + } } 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 new file mode 100644 index 000000000..c826a4bc7 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonGenerator.java @@ -0,0 +1,53 @@ +package com.simibubi.create.modules.contraptions.components.contraptions.piston; + +import com.simibubi.create.foundation.utility.data.SpecialBlockStateGen; +import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.PistonBlock; +import net.minecraft.state.properties.PistonType; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; +import net.minecraftforge.client.model.generators.ModelFile; + +public class MechanicalPistonGenerator extends SpecialBlockStateGen { + + private PistonType type; + + public MechanicalPistonGenerator(PistonType type) { + this.type = type; + } + + @Override + protected int getXRotation(BlockState state) { + Direction facing = state.get(MechanicalPistonBlock.FACING); + return facing.getAxis() + .isVertical() ? facing == Direction.DOWN ? 180 : 0 : 90; + } + + @Override + protected int getYRotation(BlockState state) { + Direction facing = state.get(MechanicalPistonBlock.FACING); + return facing.getAxis() + .isVertical() ? 0 : ((int) facing.getHorizontalAngle() + 180 + 360) % 360; + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + Direction facing = state.get(PistonBlock.FACING); + boolean axisAlongFirst = state.get(MechanicalPistonBlock.AXIS_ALONG_FIRST_COORDINATE); + PistonState pistonState = state.get(MechanicalPistonBlock.STATE); + + String path = "block/mechanical_piston"; + String folder = pistonState == PistonState.RETRACTED ? type.getName() : pistonState.getName(); + String partial = facing.getAxis() == Axis.X ^ axisAlongFirst ? "block_rotated" : "block"; + + return prov.models() + .getExistingFile(prov.modLoc(path + "/" + folder + "/" + partial)); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java index 64cbee76b..51d0c3e76 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java @@ -1,13 +1,14 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; -import com.simibubi.create.AllBlocks; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; + +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -27,8 +28,8 @@ public class MechanicalPistonHeadBlock extends ProperDirectionalBlock { public static final EnumProperty TYPE = BlockStateProperties.PISTON_TYPE; - public MechanicalPistonHeadBlock() { - super(Properties.from(Blocks.PISTON_HEAD).noDrops()); + public MechanicalPistonHeadBlock(Properties p_i48415_1_) { + super(p_i48415_1_); } @Override @@ -44,8 +45,8 @@ public class MechanicalPistonHeadBlock extends ProperDirectionalBlock { @Override public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, - PlayerEntity player) { - return new ItemStack(AllBlocks.PISTON_POLE.get()); + PlayerEntity player) { + return AllBlocksNew.PISTON_EXTENSION_POLE.asStack(); } @Override @@ -58,24 +59,23 @@ public class MechanicalPistonHeadBlock extends ProperDirectionalBlock { BlockPos currentPos = pos.offset(direction.getOpposite(), offset); BlockState block = worldIn.getBlockState(currentPos); - if (AllBlocks.PISTON_POLE.typeOf(block) - && direction.getAxis() == block.get(BlockStateProperties.FACING).getAxis()) + if (isExtensionPole(block) && direction.getAxis() == block.get(BlockStateProperties.FACING) + .getAxis()) continue; - if ((AllBlocks.MECHANICAL_PISTON.typeOf(block) || AllBlocks.STICKY_MECHANICAL_PISTON.typeOf(block)) - && block.get(BlockStateProperties.FACING) == direction) { + if (MechanicalPistonBlock.isPiston(block) && block.get(BlockStateProperties.FACING) == direction) pistonBase = currentPos; - } break; } if (pistonHead != null && pistonBase != null) { final BlockPos basePos = pistonBase; - BlockPos.getAllInBox(pistonBase, pistonHead).filter(p -> !p.equals(pos) && !p.equals(basePos)) - .forEach(p -> worldIn.destroyBlock(p, !player.isCreative())); - worldIn.setBlockState(basePos, - worldIn.getBlockState(basePos).with(MechanicalPistonBlock.STATE, PistonState.RETRACTED)); + BlockPos.getAllInBox(pistonBase, pistonHead) + .filter(p -> !p.equals(pos) && !p.equals(basePos)) + .forEach(p -> worldIn.destroyBlock(p, !player.isCreative())); + worldIn.setBlockState(basePos, worldIn.getBlockState(basePos) + .with(MechanicalPistonBlock.STATE, PistonState.RETRACTED)); } super.onBlockHarvested(worldIn, pos, state, player); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java index b71d5cdc2..f193ade6a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; -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.utility.ServerSpeedProvider; @@ -100,7 +100,7 @@ public class MechanicalPistonTileEntity extends LinearActuatorTileEntity { sendData(); if (removed) - AllBlocks.MECHANICAL_PISTON.get().onBlockHarvested(world, pos, getBlockState(), null); + AllBlocksNew.MECHANICAL_PISTON.get().onBlockHarvested(world, pos, getBlockState(), null); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java index a8bc914df..8776d070a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java @@ -1,8 +1,11 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; -import static com.simibubi.create.AllBlocks.MECHANICAL_PISTON_HEAD; -import static com.simibubi.create.AllBlocks.PISTON_POLE; -import static com.simibubi.create.AllBlocks.STICKY_MECHANICAL_PISTON; +import static com.simibubi.create.AllBlocksNew.MECHANICAL_PISTON_HEAD; +import static com.simibubi.create.AllBlocksNew.PISTON_EXTENSION_POLE; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPiston; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPistonHead; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isStickyPiston; import static net.minecraft.state.properties.BlockStateProperties.FACING; import java.util.ArrayList; @@ -10,7 +13,6 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.AllBlocks; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; @@ -67,20 +69,20 @@ public class PistonContraption extends Contraption { BlockState nextBlock = world.getBlockState(actualStart.offset(direction)); int extensionsInFront = 0; BlockState blockState = world.getBlockState(pos); - boolean sticky = STICKY_MECHANICAL_PISTON.typeOf(blockState); + boolean sticky = isStickyPiston(blockState); - if (!(blockState.getBlock() instanceof MechanicalPistonBlock)) + if (!isPiston(blockState)) return false; if (blockState.get(MechanicalPistonBlock.STATE) == PistonState.EXTENDED) { - while (PISTON_POLE.typeOf(nextBlock) && nextBlock.get(FACING).getAxis() == direction.getAxis() - || MECHANICAL_PISTON_HEAD.typeOf(nextBlock) && nextBlock.get(FACING) == direction) { + while (isExtensionPole(nextBlock) && nextBlock.get(FACING) + .getAxis() == direction.getAxis() || isPistonHead(nextBlock) && nextBlock.get(FACING) == direction) { actualStart = actualStart.offset(direction); poles.add(new BlockInfo(actualStart, nextBlock.with(FACING, direction), null)); extensionsInFront++; - if (MECHANICAL_PISTON_HEAD.typeOf(nextBlock)) + if (isPistonHead(nextBlock)) break; nextBlock = world.getBlockState(actualStart.offset(direction)); @@ -90,19 +92,18 @@ public class PistonContraption extends Contraption { } if (extensionsInFront == 0) - poles.add( - new BlockInfo(pos, - MECHANICAL_PISTON_HEAD.get().getDefaultState().with(FACING, direction).with( - BlockStateProperties.PISTON_TYPE, sticky ? PistonType.STICKY : PistonType.DEFAULT), - null)); + poles.add(new BlockInfo(pos, MECHANICAL_PISTON_HEAD.getDefaultState() + .with(FACING, direction) + .with(BlockStateProperties.PISTON_TYPE, sticky ? PistonType.STICKY : PistonType.DEFAULT), null)); else - poles.add(new BlockInfo(pos, PISTON_POLE.get().getDefaultState().with(FACING, direction), null)); + poles.add(new BlockInfo(pos, PISTON_EXTENSION_POLE.getDefaultState() + .with(FACING, direction), null)); BlockPos end = pos; nextBlock = world.getBlockState(end.offset(direction.getOpposite())); int extensionsInBack = 0; - while (PISTON_POLE.typeOf(nextBlock)) { + while (isExtensionPole(nextBlock)) { end = end.offset(direction.getOpposite()); poles.add(new BlockInfo(end, nextBlock.with(FACING, direction), null)); extensionsInBack++; @@ -115,7 +116,8 @@ public class PistonContraption extends Contraption { anchor = pos.offset(direction, initialExtensionProgress + 1); extensionLength = extensionsInBack + extensionsInFront; initialExtensionProgress = extensionsInFront; - pistonExtensionCollisionBox = new AxisAlignedBB(end.offset(direction, -extensionsInFront).subtract(anchor)); + pistonExtensionCollisionBox = new AxisAlignedBB(end.offset(direction, -extensionsInFront) + .subtract(anchor)); if (extensionLength == 0) return false; @@ -140,7 +142,7 @@ public class PistonContraption extends Contraption { @Override protected boolean addToInitialFrontier(World world, BlockPos pos, Direction direction, List frontier) { frontier.clear(); - boolean sticky = STICKY_MECHANICAL_PISTON.typeOf(world.getBlockState(pos.offset(orientation, -1))); + boolean sticky = isStickyPiston(world.getBlockState(pos.offset(orientation, -1))); boolean retracting = direction != orientation; if (retracting && !sticky) return true; @@ -155,7 +157,7 @@ public class PistonContraption extends Contraption { BlockState state = world.getBlockState(currentPos); if (BlockMovementTraits.isBrittle(state) && !(state.getBlock() instanceof CarpetBlock)) return true; - if (AllBlocks.MECHANICAL_PISTON_HEAD.typeOf(state) && state.get(FACING) == direction.getOpposite()) + if (isPistonHead(state) && state.get(FACING) == direction.getOpposite()) return true; if (!BlockMovementTraits.movementAllowed(world, currentPos)) return retracting; @@ -175,7 +177,8 @@ public class PistonContraption extends Contraption { public void addGlue(SuperGlueEntity entity) { BlockPos pos = entity.getHangingPosition(); Direction direction = entity.getFacingDirection(); - BlockPos localPos = pos.subtract(anchor).offset(orientation, -initialExtensionProgress); + BlockPos localPos = pos.subtract(anchor) + .offset(orientation, -initialExtensionProgress); this.superglue.add(Pair.of(localPos, direction)); glueToRemove.add(entity); } @@ -189,9 +192,9 @@ public class PistonContraption extends Contraption { if (pos.equals(pistonPos)) { if (te == null || te.isRemoved()) return true; - if (!AllBlocks.PISTON_POLE.typeOf(state) && pistonState.getBlock() instanceof MechanicalPistonBlock) + if (!isExtensionPole(state) && isPiston(pistonState)) world.setBlockState(pistonPos, pistonState.with(MechanicalPistonBlock.STATE, PistonState.RETRACTED), - 3 | 16); + 3 | 16); return true; } return false; @@ -203,7 +206,7 @@ public class PistonContraption extends Contraption { super.removeBlocksFromWorld(world, offset, (pos, state) -> { BlockPos pistonPos = anchor.offset(orientation, -1); BlockState blockState = world.getBlockState(pos); - if (pos.equals(pistonPos) && blockState.getBlock() instanceof MechanicalPistonBlock) { + if (pos.equals(pistonPos) && isPiston(blockState)) { world.setBlockState(pos, blockState.with(MechanicalPistonBlock.STATE, PistonState.MOVING), 66 | 16); return true; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonPoleBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonExtensionPoleBlock.java similarity index 58% rename from src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonPoleBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonExtensionPoleBlock.java index 2b7e2256a..9f379f575 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonPoleBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonExtensionPoleBlock.java @@ -1,13 +1,15 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; -import com.simibubi.create.AllBlocks; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPiston; +import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPistonHead; + import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.IWrenchable; import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; @@ -21,13 +23,13 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -public class PistonPoleBlock extends ProperDirectionalBlock implements IWrenchable { +public class PistonExtensionPoleBlock extends ProperDirectionalBlock implements IWrenchable { - public PistonPoleBlock() { - super(Properties.from(Blocks.PISTON_HEAD)); + public PistonExtensionPoleBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(FACING, Direction.UP)); } - + @Override public PushReaction getPushReaction(BlockState state) { return PushReaction.NORMAL; @@ -35,7 +37,8 @@ public class PistonPoleBlock extends ProperDirectionalBlock implements IWrenchab @Override public void onBlockHarvested(World worldIn, BlockPos pos, BlockState state, PlayerEntity player) { - Axis axis = state.get(FACING).getAxis(); + Axis axis = state.get(FACING) + .getAxis(); Direction direction = Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis); BlockPos pistonHead = null; BlockPos pistonBase = null; @@ -46,32 +49,32 @@ public class PistonPoleBlock extends ProperDirectionalBlock implements IWrenchab BlockPos currentPos = pos.offset(direction, offset); BlockState block = worldIn.getBlockState(currentPos); - if (AllBlocks.PISTON_POLE.typeOf(block) && axis == block.get(FACING).getAxis()) + if (isExtensionPole(block) && axis == block.get(FACING) + .getAxis()) continue; - if ((AllBlocks.MECHANICAL_PISTON.typeOf(block) || AllBlocks.STICKY_MECHANICAL_PISTON.typeOf(block)) - && block.get(BlockStateProperties.FACING).getAxis() == axis) { + if (isPiston(block) && block.get(BlockStateProperties.FACING) + .getAxis() == axis) pistonBase = currentPos; - } - if (AllBlocks.MECHANICAL_PISTON_HEAD.typeOf(block) - && block.get(BlockStateProperties.FACING).getAxis() == axis) { + if (isPistonHead(block) && block.get(BlockStateProperties.FACING) + .getAxis() == axis) pistonHead = currentPos; - } break; } } - if (pistonHead != null && pistonBase != null - && worldIn.getBlockState(pistonHead).get(BlockStateProperties.FACING) == worldIn - .getBlockState(pistonBase).get(BlockStateProperties.FACING)) { + if (pistonHead != null && pistonBase != null && worldIn.getBlockState(pistonHead) + .get(BlockStateProperties.FACING) == worldIn.getBlockState(pistonBase) + .get(BlockStateProperties.FACING)) { final BlockPos basePos = pistonBase; - BlockPos.getAllInBox(pistonBase, pistonHead).filter(p -> !p.equals(pos) && !p.equals(basePos)) - .forEach(p -> worldIn.destroyBlock(p, !player.isCreative())); - worldIn.setBlockState(basePos, - worldIn.getBlockState(basePos).with(MechanicalPistonBlock.STATE, PistonState.RETRACTED)); + BlockPos.getAllInBox(pistonBase, pistonHead) + .filter(p -> !p.equals(pos) && !p.equals(basePos)) + .forEach(p -> worldIn.destroyBlock(p, !player.isCreative())); + worldIn.setBlockState(basePos, worldIn.getBlockState(basePos) + .with(MechanicalPistonBlock.STATE, PistonState.RETRACTED)); } super.onBlockHarvested(worldIn, pos, state, player); @@ -79,12 +82,14 @@ public class PistonPoleBlock extends ProperDirectionalBlock implements IWrenchab @Override public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { - return AllShapes.FOUR_VOXEL_POLE.get(state.get(FACING).getAxis()); + return AllShapes.FOUR_VOXEL_POLE.get(state.get(FACING) + .getAxis()); } @Override public BlockState getStateForPlacement(BlockItemUseContext context) { - return getDefaultState().with(FACING, context.getFace().getOpposite()); + return getDefaultState().with(FACING, context.getFace() + .getOpposite()); } } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java index c4345c860..88148b014 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java @@ -1,14 +1,15 @@ package com.simibubi.create.modules.contraptions.components.contraptions.pulley; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.HorizontalAxisKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; import net.minecraft.state.EnumProperty; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; @@ -18,6 +19,7 @@ import net.minecraft.util.Direction.Axis; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; @@ -26,9 +28,9 @@ import net.minecraft.world.World; public class PulleyBlock extends HorizontalAxisKineticBlock implements ITE { public static EnumProperty HORIZONTAL_AXIS = BlockStateProperties.HORIZONTAL_AXIS; - - public PulleyBlock() { - super(Properties.from(Blocks.ANDESITE)); + + public PulleyBlock(Properties properties) { + super(properties); } @Override @@ -91,6 +93,12 @@ public class PulleyBlock extends HorizontalAxisKineticBlock implements ITE 0 ? Direction.DOWN : Direction.UP; if (ContraptionCollider.isCollidingWithWorld(world, contraption, anchor.offset(movementDirection), - movementDirection)) + movementDirection)) contraption = null; } @@ -69,7 +70,8 @@ public class PulleyTileEntity extends LinearActuatorTileEntity { if (contraption != null && !contraption.blocks.isEmpty()) { contraption.removeBlocksFromWorld(world, BlockPos.ZERO); - movedContraption = ContraptionEntity.createStationary(world, contraption).controlledBy(this); + movedContraption = ContraptionEntity.createStationary(world, contraption) + .controlledBy(this); movedContraption.setPosition(anchor.getX(), anchor.getY(), anchor.getZ()); world.addEntity(movedContraption); forceMove = true; @@ -92,17 +94,20 @@ public class PulleyTileEntity extends LinearActuatorTileEntity { if (!world.isRemote) { if (offset > 0) { BlockPos magnetPos = pos.down((int) offset); - world.destroyBlock(magnetPos, - world.getBlockState(magnetPos).getCollisionShape(world, magnetPos).isEmpty()); - world.setBlockState(magnetPos, AllBlocks.PULLEY_MAGNET.getDefault(), 66); + world.destroyBlock(magnetPos, world.getBlockState(magnetPos) + .getCollisionShape(world, magnetPos) + .isEmpty()); + world.setBlockState(magnetPos, AllBlocksNew.PULLEY_MAGNET.getDefaultState(), 66); } for (int i = 1; i <= ((int) offset) - 1; i++) { BlockPos ropePos = pos.down(i); - world.destroyBlock(ropePos, world.getBlockState(ropePos).getCollisionShape(world, ropePos).isEmpty()); + world.destroyBlock(ropePos, world.getBlockState(ropePos) + .getCollisionShape(world, ropePos) + .isEmpty()); } for (int i = 1; i <= ((int) offset) - 1; i++) - world.setBlockState(pos.down(i), AllBlocks.ROPE.getDefault(), 66); + world.setBlockState(pos.down(i), AllBlocksNew.ROPE.getDefaultState(), 66); if (movedContraption != null) movedContraption.disassemble(); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputHandler.java index 672579ef3..cc13395e3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputHandler.java @@ -1,6 +1,5 @@ package com.simibubi.create.modules.contraptions.components.crafter; -import static com.simibubi.create.AllBlocks.MECHANICAL_CRAFTER; import static com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; import java.util.ArrayList; @@ -16,6 +15,7 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; import com.google.common.base.Predicates; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.utility.RaycastHelper; import com.simibubi.create.foundation.utility.VecHelper; @@ -64,7 +64,7 @@ public class ConnectedInputHandler { if (!AllItems.WRENCH.typeOf(heldItem)) return; BlockState blockState = world.getBlockState(pos); - if (!MECHANICAL_CRAFTER.typeOf(blockState)) + if (!AllBlocksNew.MECHANICAL_CRAFTER.has(blockState)) return; BlockRayTraceResult ray = RaycastHelper.rayTraceRange(world, player, 10); @@ -99,7 +99,7 @@ public class ConnectedInputHandler { continue; BlockPos neighbourPos = pos.offset(direction); BlockState neighbour = world.getBlockState(neighbourPos); - if (!MECHANICAL_CRAFTER.typeOf(neighbour)) + if (!AllBlocksNew.MECHANICAL_CRAFTER.has(neighbour)) continue; if (refDirection != neighbour.get(HORIZONTAL_FACING)) continue; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputRenderer.java index a7d85db6c..995ec0921 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/ConnectedInputRenderer.java @@ -3,7 +3,7 @@ package com.simibubi.create.modules.contraptions.components.crafter; import org.apache.commons.lang3.tuple.Pair; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.TessellatorHelper; @@ -46,7 +46,7 @@ public class ConnectedInputRenderer { return; if (!AllItems.WRENCH.typeOf(heldItem)) return; - if (!AllBlocks.MECHANICAL_CRAFTER.typeOf(blockState)) + if (!AllBlocksNew.MECHANICAL_CRAFTER.has(blockState)) return; if (target.getType() != Type.BLOCK) return; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java index f5419212c..fc6768d08 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.crafter; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AngleHelper; @@ -12,7 +12,6 @@ import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCra 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.ItemStack; @@ -42,8 +41,8 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock implements IT public static final EnumProperty POINTING = EnumProperty.create("pointing", Pointing.class); - public MechanicalCrafterBlock() { - super(Properties.from(Blocks.GOLD_BLOCK)); + public MechanicalCrafterBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(POINTING, Pointing.UP)); } @@ -262,7 +261,7 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock implements IT BlockState targetState = world.getBlockState(targetPos); if (!world.isBlockPresent(targetPos)) return false; - if (!AllBlocks.MECHANICAL_CRAFTER.typeOf(targetState)) + if (!AllBlocksNew.MECHANICAL_CRAFTER.has(targetState)) return false; if (crafterState.get(HORIZONTAL_FACING) != targetState.get(HORIZONTAL_FACING)) return false; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java index f01e987a4..3ec2fcc91 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/MechanicalCrafterTileEntity.java @@ -8,7 +8,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.behaviour.base.TileEntityBehaviour; @@ -362,7 +361,7 @@ public class MechanicalCrafterTileEntity extends KineticTileEntity { public void eject() { BlockState blockState = getBlockState(); - boolean present = AllBlocks.MECHANICAL_CRAFTER.typeOf(blockState); + boolean present = AllBlocksNew.MECHANICAL_CRAFTER.has(blockState); Vec3d vec = present ? new Vec3d(blockState.get(HORIZONTAL_FACING).getDirectionVec()).scale(.75f) : Vec3d.ZERO; Vec3d ejectPos = VecHelper.getCenterOf(pos).add(vec); groupedItems.grid.forEach((pair, stack) -> dropItem(ejectPos, stack)); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java index 501339c6b..0bbee157b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java @@ -13,7 +13,7 @@ import java.util.function.Predicate; import org.apache.commons.lang3.tuple.Pair; import com.google.common.base.Predicates; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllRecipes; import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock.Pointing; @@ -35,7 +35,7 @@ public class RecipeGridHandler { } public static List getAllCraftersOfChainIf(MechanicalCrafterTileEntity root, - Predicate test) { + Predicate test) { List crafters = new ArrayList<>(); List> frontier = new ArrayList<>(); Set visited = new HashSet<>(); @@ -64,16 +64,17 @@ public class RecipeGridHandler { public static MechanicalCrafterTileEntity getTargetingCrafter(MechanicalCrafterTileEntity crafter) { BlockState state = crafter.getBlockState(); - if (!AllBlocks.MECHANICAL_CRAFTER.typeOf(state)) + if (!isCrafter(state)) return null; - BlockPos targetPos = crafter.getPos().offset(MechanicalCrafterBlock.getTargetDirection(state)); + BlockPos targetPos = crafter.getPos() + .offset(MechanicalCrafterBlock.getTargetDirection(state)); MechanicalCrafterTileEntity targetTE = CrafterHelper.getCrafter(crafter.getWorld(), targetPos); if (targetTE == null) return null; BlockState targetState = targetTE.getBlockState(); - if (!AllBlocks.MECHANICAL_CRAFTER.typeOf(targetState)) + if (!isCrafter(targetState)) return null; if (state.get(HORIZONTAL_FACING) != targetState.get(HORIZONTAL_FACING)) return null; @@ -85,7 +86,7 @@ public class RecipeGridHandler { World world = crafter.getWorld(); List crafters = new ArrayList<>(); BlockState blockState = crafter.getBlockState(); - if (!AllBlocks.MECHANICAL_CRAFTER.typeOf(blockState)) + if (!isCrafter(blockState)) return crafters; Direction blockFacing = blockState.get(HORIZONTAL_FACING); @@ -98,7 +99,7 @@ public class RecipeGridHandler { BlockPos neighbourPos = pos.offset(facing); BlockState neighbourState = world.getBlockState(neighbourPos); - if (!AllBlocks.MECHANICAL_CRAFTER.typeOf(neighbourState)) + if (!isCrafter(neighbourState)) continue; if (MechanicalCrafterBlock.getTargetDirection(neighbourState) != facing.getOpposite()) continue; @@ -114,15 +115,22 @@ public class RecipeGridHandler { return crafters; } + private static boolean isCrafter(BlockState state) { + return AllBlocksNew.MECHANICAL_CRAFTER.has(state); + } + public static ItemStack tryToApplyRecipe(World world, GroupedItems items) { items.calcStats(); CraftingInventory craftinginventory = new MechanicalCraftingInventory(items); - ItemStack result = world.getRecipeManager().getRecipe(IRecipeType.CRAFTING, craftinginventory, world) - .map(r -> r.getCraftingResult(craftinginventory)).orElse(null); + ItemStack result = world.getRecipeManager() + .getRecipe(IRecipeType.CRAFTING, craftinginventory, world) + .map(r -> r.getCraftingResult(craftinginventory)) + .orElse(null); if (result == null) result = world.getRecipeManager() - .getRecipe(AllRecipes.MECHANICAL_CRAFTING.getType(), craftinginventory, world) - .map(r -> r.getCraftingResult(craftinginventory)).orElse(null); + .getRecipe(AllRecipes.MECHANICAL_CRAFTING.getType(), craftinginventory, world) + .map(r -> r.getCraftingResult(craftinginventory)) + .orElse(null); return result; } @@ -132,8 +140,7 @@ public class RecipeGridHandler { int minX, minY, maxX, maxY, width, height; boolean statsReady; - public GroupedItems() { - } + public GroupedItems() {} public GroupedItems(ItemStack stack) { grid.put(Pair.of(0, 0), stack); @@ -142,8 +149,8 @@ public class RecipeGridHandler { public void mergeOnto(GroupedItems other, Pointing pointing) { int xOffset = pointing == Pointing.LEFT ? 1 : pointing == Pointing.RIGHT ? -1 : 0; int yOffset = pointing == Pointing.DOWN ? 1 : pointing == Pointing.UP ? -1 : 0; - grid.forEach((pair, stack) -> other.grid.put(Pair.of(pair.getKey() + xOffset, pair.getValue() + yOffset), - stack)); + grid.forEach( + (pair, stack) -> other.grid.put(Pair.of(pair.getKey() + xOffset, pair.getValue() + yOffset), stack)); other.statsReady = false; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankBlock.java index 3f3ee1eec..c917d6f07 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crank/HandCrankBlock.java @@ -5,8 +5,8 @@ import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.DirectionalKineticBlock; import net.minecraft.block.Block; +import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.tileentity.TileEntity; @@ -24,14 +24,19 @@ import net.minecraft.world.World; public class HandCrankBlock extends DirectionalKineticBlock implements ITE { - public HandCrankBlock() { - super(Properties.from(Blocks.OAK_PLANKS)); + public HandCrankBlock(Properties properties) { + super(properties); } @Override public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { return AllShapes.CRANK.get(state.get(FACING)); } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.ENTITYBLOCK_ANIMATED; + } @Override public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java index 31401a49f..b9edd9094 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.components.crusher; import static com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerBlock.VALID; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; @@ -23,8 +23,8 @@ import net.minecraft.world.World; public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE { - public CrushingWheelBlock() { - super(Properties.from(Blocks.DIORITE)); + public CrushingWheelBlock(Properties properties) { + super(properties); } @Override @@ -36,7 +36,7 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE public Axis getRotationAxis(BlockState state) { return state.get(AXIS); } - + @Override public BlockRenderType getRenderType(BlockState state) { return BlockRenderType.ENTITYBLOCK_ANIMATED; @@ -44,7 +44,7 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE @Override public VoxelShape getCollisionShape(BlockState state, IBlockReader worldIn, BlockPos pos, - ISelectionContext context) { + ISelectionContext context) { return AllShapes.CRUSHING_WHEEL_COLLISION_SHAPE; } @@ -52,9 +52,10 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { for (Direction d : Direction.values()) { - if (d.getAxis() == state.get(AXIS) || d.getAxis().isVertical()) + if (d.getAxis() == state.get(AXIS) || d.getAxis() + .isVertical()) continue; - if (AllBlocks.CRUSHING_WHEEL_CONTROLLER.typeOf(worldIn.getBlockState(pos.offset(d)))) + if (AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.has(worldIn.getBlockState(pos.offset(d)))) worldIn.setBlockState(pos.offset(d), Blocks.AIR.getDefaultState()); } @@ -64,7 +65,8 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE } public void updateControllers(BlockState state, World world, BlockPos pos, Direction facing) { - if (facing.getAxis() == state.get(AXIS) || facing.getAxis().isVertical()) + if (facing.getAxis() == state.get(AXIS) || facing.getAxis() + .isVertical()) return; if (world == null) return; @@ -72,13 +74,14 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE BlockPos controllerPos = pos.offset(facing); BlockPos otherWheelPos = pos.offset(facing, 2); - boolean controllerExists = AllBlocks.CRUSHING_WHEEL_CONTROLLER.typeOf(world.getBlockState(controllerPos)); - boolean controllerIsValid = controllerExists && world.getBlockState(controllerPos).get(VALID); + boolean controllerExists = AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.has(world.getBlockState(controllerPos)); + boolean controllerIsValid = controllerExists && world.getBlockState(controllerPos) + .get(VALID); boolean controllerShouldExist = false; boolean controllerShouldBeValid = false; BlockState otherState = world.getBlockState(otherWheelPos); - if (AllBlocks.CRUSHING_WHEEL.typeOf(otherState)) { + if (AllBlocksNew.CRUSHING_WHEEL.has(otherState)) { controllerShouldExist = true; try { @@ -86,9 +89,10 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE CrushingWheelTileEntity otherTe = getTileEntity(world, otherWheelPos); if (te != null && otherTe != null && (te.getSpeed() > 0) != (otherTe.getSpeed() > 0) - && te.getSpeed() != 0) { + && te.getSpeed() != 0) { float signum = Math.signum(te.getSpeed()) * (state.get(AXIS) == Axis.X ? -1 : 1); - controllerShouldBeValid = facing.getAxisDirection().getOffset() != signum; + controllerShouldBeValid = facing.getAxisDirection() + .getOffset() != signum; } if (otherState.get(AXIS) != state.get(AXIS)) controllerShouldExist = false; @@ -105,16 +109,19 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE } if (!controllerExists) { - if (!world.getBlockState(controllerPos).getMaterial().isReplaceable()) + if (!world.getBlockState(controllerPos) + .getMaterial() + .isReplaceable()) return; - world.setBlockState(controllerPos, - AllBlocks.CRUSHING_WHEEL_CONTROLLER.get().getDefaultState().with(VALID, controllerShouldBeValid)); + world.setBlockState(controllerPos, AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.getDefaultState() + .with(VALID, controllerShouldBeValid)); } else if (controllerIsValid != controllerShouldBeValid) { - world.setBlockState(controllerPos, world.getBlockState(controllerPos).with(VALID, controllerShouldBeValid)); + world.setBlockState(controllerPos, world.getBlockState(controllerPos) + .with(VALID, controllerShouldBeValid)); } - ((CrushingWheelControllerBlock) AllBlocks.CRUSHING_WHEEL_CONTROLLER.get()) - .updateSpeed(world.getBlockState(controllerPos), world, controllerPos); + ((CrushingWheelControllerBlock) AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.get()) + .updateSpeed(world.getBlockState(controllerPos), world, controllerPos); } @@ -136,9 +143,11 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE x = te.getSpeed() / -20f; z += (pos.getZ() + .5f - entityIn.getZ()) * .1f; } - entityIn.setMotion(entityIn.getMotion().add(x, 0, z)); + entityIn.setMotion(entityIn.getMotion() + .add(x, 0, z)); - } catch (TileEntityException e) {} + } catch (TileEntityException e) { + } } @Override @@ -147,9 +156,9 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE BlockPos neighbourPos = pos.offset(direction); BlockState neighbourState = worldIn.getBlockState(neighbourPos); Axis stateAxis = state.get(AXIS); - if (AllBlocks.CRUSHING_WHEEL_CONTROLLER.typeOf(neighbourState) && direction.getAxis() != stateAxis) + if (AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.has(neighbourState) && direction.getAxis() != stateAxis) return false; - if (!AllBlocks.CRUSHING_WHEEL.typeOf(neighbourState)) + if (!AllBlocksNew.CRUSHING_WHEEL.has(neighbourState)) continue; if (neighbourState.get(AXIS) != stateAxis || stateAxis != direction.getAxis()) return false; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java index feb7620d3..c05edd97b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java @@ -2,14 +2,13 @@ package com.simibubi.create.modules.contraptions.components.crusher; import java.util.Random; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; @@ -36,12 +35,12 @@ import net.minecraft.world.World; public class CrushingWheelControllerBlock extends Block implements ITE { - public static final BooleanProperty VALID = BooleanProperty.create("valid"); - - public CrushingWheelControllerBlock() { - super(Properties.from(Blocks.AIR).noDrops()); + public CrushingWheelControllerBlock(Properties p_i48440_1_) { + super(p_i48440_1_); } + public static final BooleanProperty VALID = BooleanProperty.create("valid"); + @Override public boolean hasTileEntity(BlockState state) { return true; @@ -134,7 +133,7 @@ public class CrushingWheelControllerBlock extends Block if (d.getAxis().isVertical()) continue; BlockState neighbour = world.getBlockState(pos.offset(d)); - if (!AllBlocks.CRUSHING_WHEEL.typeOf(neighbour)) + if (!AllBlocksNew.CRUSHING_WHEEL.has(neighbour)) continue; if (neighbour.get(BlockStateProperties.AXIS) == d.getAxis()) continue; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerBlock.java index 544be097c..94078ab73 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerBlock.java @@ -10,7 +10,6 @@ import com.simibubi.create.modules.contraptions.components.contraptions.IPortabl import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -30,8 +29,8 @@ public class DeployerBlock extends DirectionalAxisKineticBlock public static MovementBehaviour MOVEMENT = new DeployerMovementBehaviour(); - public DeployerBlock() { - super(Properties.from(Blocks.ANDESITE)); + public DeployerBlock(Properties properties) { + super(properties); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java index 6e7a8ec6a..735a7aefd 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; @@ -326,7 +326,7 @@ public class DeployerTileEntity extends KineticTileEntity { } protected Vec3d getMovementVector() { - if (!AllBlocks.DEPLOYER.typeOf(getBlockState())) + if (!AllBlocksNew.DEPLOYER.has(getBlockState())) return Vec3d.ZERO; return new Vec3d(getBlockState().get(FACING).getDirectionVec()); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java index e83290a91..9c01124e7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java @@ -21,8 +21,8 @@ import net.minecraft.world.World; public class NozzleBlock extends ProperDirectionalBlock implements IWrenchable { - public NozzleBlock() { - super(Properties.from(AllBlocksNew.ENCASED_FAN.get())); + public NozzleBlock(Properties p_i48415_1_) { + super(p_i48415_1_); } @Override @@ -45,11 +45,6 @@ public class NozzleBlock extends ProperDirectionalBlock implements IWrenchable { return getDefaultState().with(FACING, context.getFace()); } -// @Override // TODO 1.15 register layer -// public BlockRenderLayer getRenderLayer() { -// return BlockRenderLayer.CUTOUT_MIPPED; -// } - @Override public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { return AllShapes.NOZZLE.get(state.get(FACING)); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelBlock.java index 2f40ac30a..8bc1422aa 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelBlock.java @@ -5,7 +5,6 @@ import com.simibubi.create.modules.contraptions.base.HorizontalKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.EnumProperty; import net.minecraft.state.StateContainer.Builder; @@ -22,8 +21,8 @@ public class FlywheelBlock extends HorizontalKineticBlock { public static EnumProperty CONNECTION = EnumProperty.create("connection", ConnectionState.class); - public FlywheelBlock() { - super(Properties.from(Blocks.GOLD_BLOCK)); + public FlywheelBlock(Properties properties) { + super(properties); setDefaultState(getDefaultState().with(CONNECTION, ConnectionState.NONE)); } 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 new file mode 100644 index 000000000..686c0ac92 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/FlywheelGenerator.java @@ -0,0 +1,32 @@ +package com.simibubi.create.modules.contraptions.components.flywheel; + +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 FlywheelGenerator extends SpecialBlockStateGen { + + @Override + protected int getXRotation(BlockState state) { + return 0; + } + + @Override + protected int getYRotation(BlockState state) { + return ((int) state.get(FlywheelBlock.HORIZONTAL_FACING) + .getHorizontalAngle() + 90 + 360) % 360; + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + return prov.models() + .getExistingFile(prov.modLoc("block/" + ctx.getName() + "/casing_" + state.get(FlywheelBlock.CONNECTION) + .getName())); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java index 7f77ad255..964b10aa6 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.components.flywheel.engine; import java.util.List; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelBlock; @@ -54,7 +54,7 @@ public class EngineTileEntity extends SmartTileEntity { Direction engineFacing = getBlockState().get(EngineBlock.HORIZONTAL_FACING); BlockPos wheelPos = pos.offset(engineFacing, 2); BlockState wheelState = world.getBlockState(wheelPos); - if (!AllBlocks.FLYWHEEL.typeOf(wheelState)) + if (!AllBlocksNew.FLYWHEEL.has(wheelState)) return; Direction wheelFacing = wheelState.get(FlywheelBlock.HORIZONTAL_FACING); if (wheelFacing.getAxis() != engineFacing.rotateY().getAxis()) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java index bc5afe937..49fe83941 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java @@ -1,7 +1,7 @@ package com.simibubi.create.modules.contraptions.components.flywheel.engine; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.foundation.utility.WrappedWorld; @@ -9,7 +9,6 @@ import com.simibubi.create.foundation.utility.WrappedWorld; import net.minecraft.block.AbstractFurnaceBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -26,8 +25,8 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber; @EventBusSubscriber public class FurnaceEngineBlock extends EngineBlock implements ITE { - public FurnaceEngineBlock() { - super(Properties.from(Blocks.GOLD_BLOCK)); + public FurnaceEngineBlock(Properties properties) { + super(properties); } @Override @@ -70,7 +69,7 @@ public class FurnaceEngineBlock extends EngineBlock implements ITE { - public MillstoneBlock() { - super(Properties.from(Blocks.ANDESITE)); + public MillstoneBlock(Properties properties) { + super(properties); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/BasinOperatorBlockItem.java b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/BasinOperatorBlockItem.java index 49cff787a..bcb5b850a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/BasinOperatorBlockItem.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/BasinOperatorBlockItem.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.mixer; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -21,7 +21,7 @@ public class BasinOperatorBlockItem extends BlockItem { BlockPos placedOnPos = context.getPos().offset(context.getFace().getOpposite()); BlockState placedOnState = context.getWorld().getBlockState(placedOnPos); - if (AllBlocks.BASIN.typeOf(placedOnState)) { + if (AllBlocksNew.BASIN.has(placedOnState)) { if (context.getWorld().getBlockState(placedOnPos.up(2)).getMaterial().isReplaceable()) context = BlockItemUseContext.func_221536_a(context, placedOnPos.up(2), Direction.UP); else diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java index 80bbb17fb..dea134b72 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/mixer/MechanicalMixerBlock.java @@ -1,12 +1,11 @@ package com.simibubi.create.modules.contraptions.components.mixer; -import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.KineticBlock; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; @@ -17,11 +16,10 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -public class MechanicalMixerBlock extends KineticBlock - implements ITE { +public class MechanicalMixerBlock extends KineticBlock implements ITE { - public MechanicalMixerBlock() { - super(Properties.from(Blocks.ANDESITE)); + public MechanicalMixerBlock(Properties properties) { + super(properties); } @Override @@ -36,7 +34,7 @@ public class MechanicalMixerBlock extends KineticBlock @Override public boolean isValidPosition(BlockState state, IWorldReader worldIn, BlockPos pos) { - return !AllBlocks.BASIN.typeOf(worldIn.getBlockState(pos.down())); + return !AllBlocksNew.BASIN.has(worldIn.getBlockState(pos.down())); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java index 02e34994b..430e8ed83 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/press/MechanicalPressBlock.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; @@ -20,7 +19,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.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; @@ -38,8 +36,8 @@ import net.minecraft.world.World; public class MechanicalPressBlock extends HorizontalKineticBlock implements ITE, IBeltAttachment { - public MechanicalPressBlock() { - super(Properties.from(Blocks.PISTON)); + public MechanicalPressBlock(Properties properties) { + super(properties); } @Override @@ -52,7 +50,7 @@ public class MechanicalPressBlock extends HorizontalKineticBlock @Override public boolean isValidPosition(BlockState state, IWorldReader worldIn, BlockPos pos) { - return !AllBlocks.BASIN.typeOf(worldIn.getBlockState(pos.down())); + return !AllBlocksNew.BASIN.has(worldIn.getBlockState(pos.down())); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java index 4d11e2a37..3eef2c62f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawBlock.java @@ -12,7 +12,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.block.material.PushReaction; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; @@ -38,16 +37,11 @@ public class SawBlock extends DirectionalAxisKineticBlock implements ITE ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + String path = "block/saw/"; + String orientation = state.get(SawBlock.FACING) + .getAxis() + .isVertical() ? "vertical" : "horizontal"; + String active = state.get(SawBlock.RUNNING) ? "" : "_inactive"; + + return prov.models() + .getExistingFile(prov.modLoc(path + orientation + active)); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java index fd2d119ec..e7cd8090a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/saw/SawTileEntity.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Random; import java.util.stream.Collectors; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.AllRecipes; import com.simibubi.create.AllTileEntities; @@ -172,7 +171,7 @@ public class SawTileEntity extends BlockBreakingKineticTileEntity { } // Try moving items onto next saw - if (AllBlocks.SAW.typeOf(world.getBlockState(nextPos))) { + if (AllBlocksNew.SAW.has(world.getBlockState(nextPos))) { TileEntity te = world.getTileEntity(nextPos); if (te != null && te instanceof SawTileEntity) { SawTileEntity sawTileEntity = (SawTileEntity) te; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java index aa8629b5e..cea7de2ef 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/turntable/TurntableBlock.java @@ -6,8 +6,8 @@ import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.contraptions.base.KineticBlock; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; +import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -25,8 +25,8 @@ import net.minecraft.world.World; public class TurntableBlock extends KineticBlock implements ITE { - public TurntableBlock() { - super(Properties.from(Blocks.STRIPPED_SPRUCE_LOG)); + public TurntableBlock(Properties properties) { + super(properties); } @Override @@ -34,6 +34,11 @@ public class TurntableBlock extends KineticBlock implements ITE, IWrenchable { - public BasinBlock() { - super(Properties.from(Blocks.ANDESITE)); + public BasinBlock(Properties p_i48440_1_) { + super(p_i48440_1_); } @Override @@ -71,7 +70,7 @@ public class BasinBlock extends Block implements ITE, IWrenchab @Override public void onLanded(IBlockReader worldIn, Entity entityIn) { super.onLanded(worldIn, entityIn); - if (!AllBlocks.BASIN.typeOf(worldIn.getBlockState(entityIn.getPosition()))) + if (!AllBlocksNew.BASIN.has(worldIn.getBlockState(entityIn.getPosition()))) return; if (!(entityIn instanceof ItemEntity)) return; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerBlock.java index 281b020d7..2fb086769 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/SpeedControllerBlock.java @@ -5,7 +5,6 @@ import com.simibubi.create.modules.contraptions.base.HorizontalAxisKineticBlock; import com.simibubi.create.modules.contraptions.relays.elementary.CogWheelBlock; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.item.BlockItemUseContext; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction.Axis; @@ -16,8 +15,8 @@ import net.minecraft.world.IBlockReader; public class SpeedControllerBlock extends HorizontalAxisKineticBlock { - public SpeedControllerBlock() { - super(Properties.from(Blocks.ANDESITE)); + public SpeedControllerBlock(Properties properties) { + super(properties); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java index cb698c3ee..d01870312 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java @@ -9,7 +9,6 @@ import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; @@ -38,8 +37,8 @@ public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implemen public static final BooleanProperty VERTICAL = BooleanProperty.create("vertical"); public static final IntegerProperty STATE = IntegerProperty.create("state", 0, 5); - public SequencedGearshiftBlock() { - super(Properties.from(Blocks.ANDESITE)); + public SequencedGearshiftBlock(Properties properties) { + super(properties); } @Override @@ -59,7 +58,7 @@ public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implemen @Override public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, - boolean isMoving) { + boolean isMoving) { if (worldIn.isRemote) return; @@ -71,13 +70,14 @@ public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implemen @Override public boolean hasShaftTowards(IWorldReader world, BlockPos pos, BlockState state, Direction face) { if (state.get(VERTICAL)) - return face.getAxis().isVertical(); + return face.getAxis() + .isVertical(); return super.hasShaftTowards(world, pos, state, face); } @Override public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, - BlockRayTraceResult hit) { + BlockRayTraceResult hit) { ItemStack held = player.getHeldItemMainhand(); if (AllItems.WRENCH.typeOf(held)) return ActionResultType.PASS; @@ -88,7 +88,7 @@ public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implemen } DistExecutor.runWhenOn(Dist.CLIENT, - () -> () -> withTileEntityDo(worldIn, pos, te -> this.displayScreen(te, player))); + () -> () -> withTileEntityDo(worldIn, pos, te -> this.displayScreen(te, player))); return ActionResultType.SUCCESS; } @@ -101,17 +101,21 @@ public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implemen @Override public BlockState getStateForPlacement(BlockItemUseContext context) { Axis preferredAxis = RotatedPillarKineticBlock.getPreferredAxis(context); - if (preferredAxis != null && !context.getPlayer().isSneaking()) + if (preferredAxis != null && !context.getPlayer() + .isSneaking()) return withAxis(preferredAxis, context); - return withAxis(context.getNearestLookingDirection().getAxis(), context); + return withAxis(context.getNearestLookingDirection() + .getAxis(), context); } @Override public ActionResultType onWrenched(BlockState state, ItemUseContext context) { BlockState newState = state; - if (context.getFace().getAxis() != Axis.Y) - if (newState.get(HORIZONTAL_AXIS) != context.getFace().getAxis()) + if (context.getFace() + .getAxis() != Axis.Y) + if (newState.get(HORIZONTAL_AXIS) != context.getFace() + .getAxis()) newState = newState.cycle(VERTICAL); return super.onWrenched(newState, context); @@ -120,7 +124,8 @@ public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implemen private BlockState withAxis(Axis axis, BlockItemUseContext context) { BlockState state = getDefaultState().with(VERTICAL, axis.isVertical()); if (axis.isVertical()) - return state.with(HORIZONTAL_AXIS, context.getPlacementHorizontalFacing().getAxis()); + return state.with(HORIZONTAL_AXIS, context.getPlacementHorizontalFacing() + .getAxis()); return state.with(HORIZONTAL_AXIS, axis); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java new file mode 100644 index 000000000..d56b8fc0f --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftGenerator.java @@ -0,0 +1,35 @@ +package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; + +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.minecraft.util.Direction.Axis; +import net.minecraftforge.client.model.generators.ModelFile; + +public class SequencedGearshiftGenerator extends SpecialBlockStateGen { + + @Override + protected int getXRotation(BlockState state) { + return state.get(SequencedGearshiftBlock.VERTICAL) ? 90 : 0; + } + + @Override + protected int getYRotation(BlockState state) { + return state.get(SequencedGearshiftBlock.HORIZONTAL_AXIS) == Axis.X ? 90 : 0; + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + String variant = "idle"; + int seq = state.get(SequencedGearshiftBlock.STATE); + if (seq > 0) + variant = "seq_" + seq; + return prov.models() + .getExistingFile(prov.modLoc("block/" + ctx.getName() + "/" + variant)); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java index a5be9d539..52ebd9b35 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java @@ -3,7 +3,7 @@ package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; import java.util.Vector; 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; @@ -18,7 +18,7 @@ import net.minecraft.util.math.BlockPos; public class SequencedGearshiftScreen extends AbstractSimiScreen { - private final ItemStack renderedItem = new ItemStack(AllBlocks.SEQUENCED_GEARSHIFT.get()); + private final ItemStack renderedItem = new ItemStack(AllBlocksNew.SEQUENCED_GEARSHIFT.get()); private final ScreenResources background = ScreenResources.SEQUENCER; private final String title = Lang.translate("gui.sequenced_gearshift.title"); 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 1a40ead5c..847000309 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 @@ -5,9 +5,11 @@ 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; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.CompoundNBT; @@ -18,19 +20,19 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; import net.minecraft.world.World; -public enum AllBeltAttachments { +public enum AllBeltAttachments { //TODO rework this nonsense - BELT_FUNNEL(AllBlocks.BELT_FUNNEL), - BELT_OBSERVER(AllBlocks.ENTITY_DETECTOR), - MECHANICAL_PRESS(AllBlocks.MECHANICAL_PRESS), - LOGISTICAL_ATTACHABLES(AllBlocks.EXTRACTOR), + BELT_FUNNEL(AllBlocks.BELT_FUNNEL.get()), + BELT_OBSERVER(AllBlocks.ENTITY_DETECTOR.get()), + MECHANICAL_PRESS(AllBlocksNew.MECHANICAL_PRESS.get()), + LOGISTICAL_ATTACHABLES(AllBlocks.EXTRACTOR.get()), ; IBeltAttachment attachment; - private AllBeltAttachments(AllBlocks attachment) { - this.attachment = (IBeltAttachment) attachment.get(); + private AllBeltAttachments(Block attachment) { + this.attachment = (IBeltAttachment) attachment; } public interface IBeltAttachment { 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 631057748..7101d94de 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 @@ -70,7 +70,8 @@ import net.minecraftforge.common.Tags; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -public class BeltBlock extends HorizontalKineticBlock implements ITE, IHaveColorHandler, ISpecialBlockItemRequirement { +public class BeltBlock extends HorizontalKineticBlock + implements ITE, IHaveColorHandler, ISpecialBlockItemRequirement { public static final IProperty SLOPE = EnumProperty.create("slope", Slope.class); public static final IProperty PART = EnumProperty.create("part", Part.class); @@ -78,14 +79,16 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE p_149666_2_) { p_149666_2_.add(AllItems.BELT_CONNECTOR.asStack()); } - + @Override public boolean hasShaftTowards(IWorldReader world, BlockPos pos, BlockState state, Direction face) { if (face.getAxis() != getRotationAxis(state)) @@ -99,12 +102,14 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE getDrops(BlockState state, net.minecraft.world.storage.loot.LootContext.Builder builder) { List drops = super.getDrops(state, builder); if (state.get(CASING)) - drops.addAll(AllBlocks.BRASS_CASING.getDefault().getDrops(builder)); + drops.addAll(AllBlocksNew.BRASS_CASING.getDefaultState() + .getDrops(builder)); TileEntity tileEntity = builder.get(LootParameters.BLOCK_ENTITY); if (tileEntity instanceof BeltTileEntity && ((BeltTileEntity) tileEntity).hasPulley()) - drops.addAll(AllBlocksNew.SHAFT.getDefaultState().getDrops(builder)); + drops.addAll(AllBlocksNew.SHAFT.getDefaultState() + .getDrops(builder)); return drops; } @@ -129,7 +136,8 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE { ItemEntity itemEntity = (ItemEntity) entityIn; - IItemHandler handler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null); + IItemHandler handler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + .orElse(null); if (handler == null) return; - ItemStack remainder = handler.insertItem(0, itemEntity.getItem().copy(), false); + ItemStack remainder = handler.insertItem(0, itemEntity.getItem() + .copy(), false); if (remainder.isEmpty()) itemEntity.remove(); }); @@ -210,12 +220,14 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE { - player.inventory.placeItemBackInInventory(worldIn, transportedItemStack.stack); - return Collections.emptyList(); - }); + controllerBelt.getInventory() + .forEachWithin(belt.index + .5f, .55f, (transportedItemStack) -> { + player.inventory.placeItemBackInInventory(worldIn, transportedItemStack.stack); + return Collections.emptyList(); + }); } if (isShaft) { @@ -285,7 +298,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE required = new ArrayList<>(); if (state.get(PART) != Part.MIDDLE) - required.add(new ItemStack(AllBlocksNew.SHAFT.get())); + required.add(AllBlocksNew.SHAFT.asStack()); if (state.get(CASING)) - required.add(new ItemStack(AllBlocks.BRASS_CASING.get())); + required.add(AllBlocksNew.BRASS_CASING.asStack()); if (state.get(PART) == Part.START) required.add(AllItems.BELT_CONNECTOR.asStack()); if (required.isEmpty()) @@ -643,7 +659,9 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE optional = diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java index 400f13d4d..cc741a9f5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java @@ -1,6 +1,5 @@ package com.simibubi.create.modules.contraptions.relays.elementary; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllBlocksNew; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.IRotate; @@ -28,11 +27,11 @@ public class CogWheelBlock extends ShaftBlock { public static CogWheelBlock small(Properties properties) { return new CogWheelBlock(false, properties); } - + public static CogWheelBlock large(Properties properties) { return new CogWheelBlock(true, properties); } - + private CogWheelBlock(boolean large, Properties properties) { super(properties); isLarge = large; @@ -58,23 +57,29 @@ public class CogWheelBlock extends ShaftBlock { @Override public BlockState getStateForPlacement(BlockItemUseContext context) { - BlockPos placedOnPos = context.getPos().offset(context.getFace().getOpposite()); + BlockPos placedOnPos = context.getPos() + .offset(context.getFace() + .getOpposite()); World world = context.getWorld(); BlockState placedAgainst = world.getBlockState(placedOnPos); Block block = placedAgainst.getBlock(); - BlockState stateBelow = world.getBlockState(context.getPos().down()); - if (AllBlocks.ROTATION_SPEED_CONTROLLER.typeOf(stateBelow) && isLarge) { - return this.getDefaultState().with(AXIS, - stateBelow.get(SpeedControllerBlock.HORIZONTAL_AXIS) == Axis.X ? Axis.Z : Axis.X); + BlockState stateBelow = world.getBlockState(context.getPos() + .down()); + if (AllBlocksNew.ROTATION_SPEED_CONTROLLER.has(stateBelow) && isLarge) { + return this.getDefaultState() + .with(AXIS, stateBelow.get(SpeedControllerBlock.HORIZONTAL_AXIS) == Axis.X ? Axis.Z : Axis.X); } if (!(block instanceof IRotate) - || !(((IRotate) block).hasIntegratedCogwheel(world, placedOnPos, placedAgainst))) { + || !(((IRotate) block).hasIntegratedCogwheel(world, placedOnPos, placedAgainst))) { Axis preferredAxis = getPreferredAxis(context); if (preferredAxis != null) - return this.getDefaultState().with(AXIS, preferredAxis); - return this.getDefaultState().with(AXIS, context.getFace().getAxis()); + return this.getDefaultState() + .with(AXIS, preferredAxis); + return this.getDefaultState() + .with(AXIS, context.getFace() + .getAxis()); } return getDefaultState().with(AXIS, ((IRotate) block).getRotationAxis(placedAgainst)); @@ -89,11 +94,11 @@ public class CogWheelBlock extends ShaftBlock { public float getParticleInitialRadius() { return isLarge ? 1f : .75f; } - + public static boolean isSmallCog(BlockState state) { return AllBlocksNew.COGWHEEL.has(state); } - + public static boolean isLargeCog(BlockState state) { return AllBlocksNew.LARGE_COGWHEEL.has(state); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeBlock.java index 1f2897f4b..97dca1726 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeBlock.java @@ -43,8 +43,16 @@ public class GaugeBlock extends DirectionalAxisKineticBlock { } } - public GaugeBlock(Type type) { - super(Properties.from(Blocks.PISTON)); + public static GaugeBlock speed(Properties properties) { + return new GaugeBlock(properties, Type.SPEED); + } + + public static GaugeBlock stress(Properties properties) { + return new GaugeBlock(properties, Type.STRESS); + } + + protected GaugeBlock(Properties properties, Type type) { + super(properties); this.type = type; } 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 new file mode 100644 index 000000000..0f05de8a8 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gauge/GaugeGenerator.java @@ -0,0 +1,53 @@ +package com.simibubi.create.modules.contraptions.relays.gauge; + +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.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; +import net.minecraftforge.client.model.generators.ModelFile; + +public class GaugeGenerator extends SpecialBlockStateGen { + + @Override + protected int getXRotation(BlockState state) { + Direction direction = state.get(GaugeBlock.FACING); + boolean alongFirst = state.get(GaugeBlock.AXIS_ALONG_FIRST_COORDINATE); + + if (direction == Direction.DOWN) + return 180; + if (direction == Direction.UP) + return 0; + if ((direction.getAxis() == Axis.X) == alongFirst) + return 90; + + return 0; + } + + @Override + protected int getYRotation(BlockState state) { + Direction direction = state.get(GaugeBlock.FACING); + boolean alongFirst = state.get(GaugeBlock.AXIS_ALONG_FIRST_COORDINATE); + + if (direction.getAxis() + .isVertical()) + return alongFirst ? 90 : 0; + + return ((int) direction.getHorizontalAngle() + 360 + 90) % 360; + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + boolean vertical = state.get(GaugeBlock.FACING) + .getAxis() + .isVertical(); + String partial = vertical ? "base" : "base_wall"; + return prov.models() + .getExistingFile(prov.modLoc("block/gauge/" + partial)); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/palettes/PalettesVariantEntry.java b/src/main/java/com/simibubi/create/modules/palettes/PalettesVariantEntry.java index b28f6cfba..620af384d 100644 --- a/src/main/java/com/simibubi/create/modules/palettes/PalettesVariantEntry.java +++ b/src/main/java/com/simibubi/create/modules/palettes/PalettesVariantEntry.java @@ -1,5 +1,7 @@ package com.simibubi.create.modules.palettes; +import static com.simibubi.create.foundation.registrate.CreateRegistrate.connectedTextures; + import com.google.common.collect.ImmutableList; import com.simibubi.create.Create; import com.simibubi.create.foundation.registrate.CreateRegistrate; @@ -34,9 +36,7 @@ public class PalettesVariantEntry { if (pattern.isTranslucent()) builder.addLayer(() -> RenderType::getTranslucent); pattern.createCTBehaviour(variant) - .ifPresent(b -> { - builder.transform(registrate.connectedTextures(b)); - }); + .ifPresent(b -> builder.transform(connectedTextures(b))); BlockEntry block = builder.initialProperties(initialProperties) .simpleItem() diff --git a/src/main/resources/assets/create/blockstates/andesite_casing.json b/src/main/resources/assets/create/blockstates/andesite_casing.json deleted file mode 100644 index f709c9e67..000000000 --- a/src/main/resources/assets/create/blockstates/andesite_casing.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/andesite_casing" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/basin.json b/src/main/resources/assets/create/blockstates/basin.json deleted file mode 100644 index e4e1d20f2..000000000 --- a/src/main/resources/assets/create/blockstates/basin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/basin" } - } -} diff --git a/src/main/resources/assets/create/blockstates/brass_casing.json b/src/main/resources/assets/create/blockstates/brass_casing.json deleted file mode 100644 index 57aaf1e18..000000000 --- a/src/main/resources/assets/create/blockstates/brass_casing.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/brass_casing" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/cart_assembler.json b/src/main/resources/assets/create/blockstates/cart_assembler.json deleted file mode 100644 index 30acbf36d..000000000 --- a/src/main/resources/assets/create/blockstates/cart_assembler.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "shape=north_south,powered=false": { "model": "create:block/cart_assembler" }, - "shape=east_west,powered=false": { "model": "create:block/cart_assembler", "y": 90 }, - "shape=north_south,powered=true": { "model": "create:block/cart_assembler_powered" }, - "shape=east_west,powered=true": { "model": "create:block/cart_assembler_powered", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/clockwork_bearing.json b/src/main/resources/assets/create/blockstates/clockwork_bearing.json deleted file mode 100644 index 147dbfe4e..000000000 --- a/src/main/resources/assets/create/blockstates/clockwork_bearing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=up" : { "model": "create:block/bearing/clockwork" }, - "facing=down" : { "model": "create:block/bearing/clockwork", "x": 180 }, - "facing=north" : { "model": "create:block/bearing/clockwork", "x": 90 }, - "facing=east" : { "model": "create:block/bearing/clockwork", "x": 90, "y": 90 }, - "facing=south" : { "model": "create:block/bearing/clockwork", "x": 90, "y": 180 }, - "facing=west" : { "model": "create:block/bearing/clockwork", "x": 90, "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/cocoa_log.json b/src/main/resources/assets/create/blockstates/cocoa_log.json deleted file mode 100644 index d067f5d33..000000000 --- a/src/main/resources/assets/create/blockstates/cocoa_log.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "age=0,axis=y": { "model": "create:block/cocoa_log_0" }, - "age=1,axis=y": { "model": "create:block/cocoa_log_1" }, - "age=2,axis=y": { "model": "create:block/cocoa_log_2" }, - "age=0,axis=x": { "model": "create:block/cocoa_log_0", "x": 90, "y": 90 }, - "age=1,axis=x": { "model": "create:block/cocoa_log_1", "x": 90, "y": 90 }, - "age=2,axis=x": { "model": "create:block/cocoa_log_2", "x": 90, "y": 90 }, - "age=0,axis=z": { "model": "create:block/cocoa_log_0", "x": 90 }, - "age=1,axis=z": { "model": "create:block/cocoa_log_1", "x": 90 }, - "age=2,axis=z": { "model": "create:block/cocoa_log_2", "x": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/copper_casing.json b/src/main/resources/assets/create/blockstates/copper_casing.json deleted file mode 100644 index e3889caa5..000000000 --- a/src/main/resources/assets/create/blockstates/copper_casing.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/copper_casing" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/crushing_wheel.json b/src/main/resources/assets/create/blockstates/crushing_wheel.json deleted file mode 100644 index 253a8e976..000000000 --- a/src/main/resources/assets/create/blockstates/crushing_wheel.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "axis=y": { "model": "create:block/crushing_wheel" }, - "axis=z": { "model": "create:block/crushing_wheel", "x": 90 }, - "axis=x": { "model": "create:block/crushing_wheel", "x": 90, "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/crushing_wheel_controller.json b/src/main/resources/assets/create/blockstates/crushing_wheel_controller.json deleted file mode 100644 index ef94b2a53..000000000 --- a/src/main/resources/assets/create/blockstates/crushing_wheel_controller.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "valid=true": { "model": "block/air" }, - "valid=false": { "model": "block/air" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/cuckoo_clock.json b/src/main/resources/assets/create/blockstates/cuckoo_clock.json deleted file mode 100644 index d377391b9..000000000 --- a/src/main/resources/assets/create/blockstates/cuckoo_clock.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/cuckoo_clock/casing", "y": 90 }, - "facing=south": { "model": "create:block/cuckoo_clock/casing", "y": 270 }, - "facing=east": { "model": "create:block/cuckoo_clock/casing", "y": 180 }, - "facing=west": { "model": "create:block/cuckoo_clock/casing", "y": 0 } - } -} diff --git a/src/main/resources/assets/create/blockstates/deployer.json b/src/main/resources/assets/create/blockstates/deployer.json deleted file mode 100644 index 105b12a12..000000000 --- a/src/main/resources/assets/create/blockstates/deployer.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "facing=east,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 0, "y": 270 }, - "facing=west,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 0, "y": 90 }, - "facing=up,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 90, "y": 90 }, - "facing=down,axis_along_first=false": { "model": "create:block/deployer/horizontal", "x": 270, "y": 90 }, - "facing=south,axis_along_first=false": { "model": "create:block/deployer/vertical", "x": 0, "y": 0 }, - "facing=north,axis_along_first=false": { "model": "create:block/deployer/vertical", "x": 0, "y": 180 }, - - "facing=east,axis_along_first=true": { "model": "create:block/deployer/vertical", "x": 0, "y": 270 }, - "facing=west,axis_along_first=true": { "model": "create:block/deployer/vertical", "x": 0, "y": 90 }, - "facing=up,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 90, "y": 0 }, - "facing=down,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 270, "y": 0 }, - "facing=south,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 0, "y": 0 }, - "facing=north,axis_along_first=true": { "model": "create:block/deployer/horizontal", "x": 0, "y": 180 } - } -} diff --git a/src/main/resources/assets/create/blockstates/drill.json b/src/main/resources/assets/create/blockstates/drill.json deleted file mode 100644 index 7b581954e..000000000 --- a/src/main/resources/assets/create/blockstates/drill.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/drill_base", "y": 180 }, - "facing=south": { "model": "create:block/drill_base" }, - "facing=west": { "model": "create:block/drill_base", "y": 90 }, - "facing=up": { "model": "create:block/drill_base", "x": 90 }, - "facing=down": { "model": "create:block/drill_base", "x": 270 }, - "facing=east": { "model": "create:block/drill_base", "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/flywheel.json b/src/main/resources/assets/create/blockstates/flywheel.json deleted file mode 100644 index 287528b2d..000000000 --- a/src/main/resources/assets/create/blockstates/flywheel.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "connection=none,facing=north": { "model": "create:block/flywheel/casing_no_connection", "y": 270 }, - "connection=none,facing=south": { "model": "create:block/flywheel/casing_no_connection", "y": 90 }, - "connection=none,facing=east": { "model": "create:block/flywheel/casing_no_connection", "y": 0 }, - "connection=none,facing=west": { "model": "create:block/flywheel/casing_no_connection", "y": 180 }, - "connection=left,facing=north": { "model": "create:block/flywheel/casing_left", "y": 270 }, - "connection=left,facing=south": { "model": "create:block/flywheel/casing_left", "y": 90 }, - "connection=left,facing=east": { "model": "create:block/flywheel/casing_left", "y": 0 }, - "connection=left,facing=west": { "model": "create:block/flywheel/casing_left", "y": 180 }, - "connection=right,facing=north": { "model": "create:block/flywheel/casing_right", "y": 270 }, - "connection=right,facing=south": { "model": "create:block/flywheel/casing_right", "y": 90 }, - "connection=right,facing=east": { "model": "create:block/flywheel/casing_right", "y": 0 }, - "connection=right,facing=west": { "model": "create:block/flywheel/casing_right", "y": 180 } - } -} diff --git a/src/main/resources/assets/create/blockstates/furnace_engine.json b/src/main/resources/assets/create/blockstates/furnace_engine.json deleted file mode 100644 index 97798781d..000000000 --- a/src/main/resources/assets/create/blockstates/furnace_engine.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/furnace_engine/body", "y": 180 }, - "facing=south": { "model": "create:block/furnace_engine/body", "y": 0 }, - "facing=west": { "model": "create:block/furnace_engine/body", "y": 90 }, - "facing=east": { "model": "create:block/furnace_engine/body", "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/hand_crank.json b/src/main/resources/assets/create/blockstates/hand_crank.json deleted file mode 100644 index 9cba26df5..000000000 --- a/src/main/resources/assets/create/blockstates/hand_crank.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north":{ "model": "create:block/hand_crank/block" }, - "facing=south":{ "model": "create:block/hand_crank/block", "y": 180 }, - "facing=west": { "model": "create:block/hand_crank/block", "y": 270 }, - "facing=up": { "model": "create:block/hand_crank/block", "x": 270 }, - "facing=down": { "model": "create:block/hand_crank/block", "x": 90 }, - "facing=east": { "model": "create:block/hand_crank/block", "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/harvester.json b/src/main/resources/assets/create/blockstates/harvester.json deleted file mode 100644 index eb5f9c000..000000000 --- a/src/main/resources/assets/create/blockstates/harvester.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/harvester", "y": 180 }, - "facing=south": { "model": "create:block/harvester" }, - "facing=east": { "model": "create:block/harvester", "y": 270 }, - "facing=west": { "model": "create:block/harvester", "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/mechanical_bearing.json b/src/main/resources/assets/create/blockstates/mechanical_bearing.json deleted file mode 100644 index 2fe5eabe9..000000000 --- a/src/main/resources/assets/create/blockstates/mechanical_bearing.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=up" : { "model": "create:block/bearing/regular" }, - "facing=down" : { "model": "create:block/bearing/regular", "x": 180 }, - "facing=north" : { "model": "create:block/bearing/regular", "x": 90 }, - "facing=east" : { "model": "create:block/bearing/regular", "x": 90, "y": 90 }, - "facing=south" : { "model": "create:block/bearing/regular", "x": 90, "y": 180 }, - "facing=west" : { "model": "create:block/bearing/regular", "x": 90, "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/mechanical_crafter.json b/src/main/resources/assets/create/blockstates/mechanical_crafter.json deleted file mode 100644 index b9ca34cb7..000000000 --- a/src/main/resources/assets/create/blockstates/mechanical_crafter.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/crafter/casing", "y": 90 }, - "facing=south": { "model": "create:block/crafter/casing", "y": 270 }, - "facing=west": { "model": "create:block/crafter/casing", "y": 0 }, - "facing=east": { "model": "create:block/crafter/casing", "y": 180 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/mechanical_mixer.json b/src/main/resources/assets/create/blockstates/mechanical_mixer.json deleted file mode 100644 index fc094d2d9..000000000 --- a/src/main/resources/assets/create/blockstates/mechanical_mixer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/mixer_base" } - } -} diff --git a/src/main/resources/assets/create/blockstates/mechanical_piston.json b/src/main/resources/assets/create/blockstates/mechanical_piston.json deleted file mode 100644 index 4a97bd500..000000000 --- a/src/main/resources/assets/create/blockstates/mechanical_piston.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "forgemarker": 1, - "defaults": { - "model": "create:block/mechanical_piston" - }, - "variants": { - "axis_along_first=false,state=retracted,facing=south": { "model": "create:block/mechanical_piston", "x": 90, "y": 180 }, - "axis_along_first=false,state=retracted,facing=north": { "model": "create:block/mechanical_piston", "x": 90 }, - "axis_along_first=false,state=retracted,facing=west": { "model": "create:block/mechanical_piston/rotated", "x": 90, "y": 270 }, - "axis_along_first=false,state=retracted,facing=up": { "model": "create:block/mechanical_piston" }, - "axis_along_first=false,state=retracted,facing=down": { "model": "create:block/mechanical_piston", "x": 180 }, - "axis_along_first=false,state=retracted,facing=east": { "model": "create:block/mechanical_piston/rotated", "x": 90, "y": 90 }, - - "axis_along_first=false,state=moving,facing=south": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 180 }, - "axis_along_first=false,state=moving,facing=north": { "model": "create:block/mechanical_piston/base", "x": 90 }, - "axis_along_first=false,state=moving,facing=west": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 270 }, - "axis_along_first=false,state=moving,facing=up": { "model": "create:block/mechanical_piston/base" }, - "axis_along_first=false,state=moving,facing=down": { "model": "create:block/mechanical_piston/base", "x": 180 }, - "axis_along_first=false,state=moving,facing=east": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 90 }, - - "axis_along_first=false,state=extended,facing=south": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90, "y": 180 }, - "axis_along_first=false,state=extended,facing=north": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90 }, - "axis_along_first=false,state=extended,facing=west": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 270 }, - "axis_along_first=false,state=extended,facing=up": { "model": "create:block/mechanical_piston/base_with_extension" }, - "axis_along_first=false,state=extended,facing=down": { "model": "create:block/mechanical_piston/base_with_extension", "x": 180 }, - "axis_along_first=false,state=extended,facing=east": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 90 }, - - - "axis_along_first=true,state=retracted,facing=south": { "model": "create:block/mechanical_piston/rotated", "x": 90, "y": 180 }, - "axis_along_first=true,state=retracted,facing=north": { "model": "create:block/mechanical_piston/rotated", "x": 90 }, - "axis_along_first=true,state=retracted,facing=west": { "model": "create:block/mechanical_piston", "x": 90, "y": 270 }, - "axis_along_first=true,state=retracted,facing=up": { "model": "create:block/mechanical_piston/rotated" }, - "axis_along_first=true,state=retracted,facing=down": { "model": "create:block/mechanical_piston/rotated", "x": 180 }, - "axis_along_first=true,state=retracted,facing=east": { "model": "create:block/mechanical_piston", "x": 90, "y": 90 }, - - "axis_along_first=true,state=moving,facing=south": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 180 }, - "axis_along_first=true,state=moving,facing=north": { "model": "create:block/mechanical_piston/base_rotated", "x": 90 }, - "axis_along_first=true,state=moving,facing=west": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 270 }, - "axis_along_first=true,state=moving,facing=up": { "model": "create:block/mechanical_piston/base_rotated" }, - "axis_along_first=true,state=moving,facing=down": { "model": "create:block/mechanical_piston/base_rotated", "x": 180 }, - "axis_along_first=true,state=moving,facing=east": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 90 }, - - "axis_along_first=true,state=extended,facing=south": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 180 }, - "axis_along_first=true,state=extended,facing=north": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90 }, - "axis_along_first=true,state=extended,facing=west": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90, "y": 270 }, - "axis_along_first=true,state=extended,facing=up": { "model": "create:block/mechanical_piston/base_with_extension_rotated" }, - "axis_along_first=true,state=extended,facing=down": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 180 }, - "axis_along_first=true,state=extended,facing=east": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90, "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/mechanical_piston_head.json b/src/main/resources/assets/create/blockstates/mechanical_piston_head.json deleted file mode 100644 index 061c185fa..000000000 --- a/src/main/resources/assets/create/blockstates/mechanical_piston_head.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "type=normal,facing=south": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 180 }, - "type=normal,facing=north": { "model": "create:block/mechanical_piston_head", "x": 90 }, - "type=normal,facing=west": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 270 }, - "type=normal,facing=up": { "model": "create:block/mechanical_piston_head" }, - "type=normal,facing=down": { "model": "create:block/mechanical_piston_head", "x": 180 }, - "type=normal,facing=east": { "model": "create:block/mechanical_piston_head", "x": 90, "y": 90 }, - - "type=sticky,facing=south": { "model": "create:block/mechanical_piston_head_sticky", "x": 90, "y": 180 }, - "type=sticky,facing=north": { "model": "create:block/mechanical_piston_head_sticky", "x": 90 }, - "type=sticky,facing=west": { "model": "create:block/mechanical_piston_head_sticky", "x": 90, "y": 270 }, - "type=sticky,facing=up": { "model": "create:block/mechanical_piston_head_sticky" }, - "type=sticky,facing=down": { "model": "create:block/mechanical_piston_head_sticky", "x": 180 }, - "type=sticky,facing=east": { "model": "create:block/mechanical_piston_head_sticky", "x": 90, "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/mechanical_press.json b/src/main/resources/assets/create/blockstates/mechanical_press.json deleted file mode 100644 index b229bebfd..000000000 --- a/src/main/resources/assets/create/blockstates/mechanical_press.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": {"model": "create:block/mechanical_press_base", "y": 0 }, - "facing=east": {"model": "create:block/mechanical_press_base", "y": 90 }, - "facing=west": {"model": "create:block/mechanical_press_base", "y": 90 }, - "facing=south": {"model": "create:block/mechanical_press_base", "y": 0 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/millstone.json b/src/main/resources/assets/create/blockstates/millstone.json deleted file mode 100644 index 4d78d4cab..000000000 --- a/src/main/resources/assets/create/blockstates/millstone.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/millstone/casing" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/minecart_anchor.json b/src/main/resources/assets/create/blockstates/minecart_anchor.json deleted file mode 100644 index 3db12c94b..000000000 --- a/src/main/resources/assets/create/blockstates/minecart_anchor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "axis=x": { "model": "create:block/minecart_anchor", "y": 90 }, - "axis=z": { "model": "create:block/minecart_anchor" } - } -} diff --git a/src/main/resources/assets/create/blockstates/mossy_gabbro_bricks.json b/src/main/resources/assets/create/blockstates/mossy_gabbro_bricks.json deleted file mode 100644 index 3db1f27fe..000000000 --- a/src/main/resources/assets/create/blockstates/mossy_gabbro_bricks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/palettes/mossy_gabbro_bricks" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/mysterious_cuckoo_clock.json b/src/main/resources/assets/create/blockstates/mysterious_cuckoo_clock.json deleted file mode 100644 index d377391b9..000000000 --- a/src/main/resources/assets/create/blockstates/mysterious_cuckoo_clock.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/cuckoo_clock/casing", "y": 90 }, - "facing=south": { "model": "create:block/cuckoo_clock/casing", "y": 270 }, - "facing=east": { "model": "create:block/cuckoo_clock/casing", "y": 180 }, - "facing=west": { "model": "create:block/cuckoo_clock/casing", "y": 0 } - } -} diff --git a/src/main/resources/assets/create/blockstates/nozzle.json b/src/main/resources/assets/create/blockstates/nozzle.json deleted file mode 100644 index 40733046b..000000000 --- a/src/main/resources/assets/create/blockstates/nozzle.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/nozzle/block", "y": 0 }, - "facing=south": { "model": "create:block/nozzle/block", "y": 180 }, - "facing=west": { "model": "create:block/nozzle/block", "y": 270 }, - "facing=up": { "model": "create:block/nozzle/block", "x": 270 }, - "facing=down": { "model": "create:block/nozzle/block", "x": 90 }, - "facing=east": { "model": "create:block/nozzle/block", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/piston_pole.json b/src/main/resources/assets/create/blockstates/piston_pole.json deleted file mode 100644 index f38c11480..000000000 --- a/src/main/resources/assets/create/blockstates/piston_pole.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=up": { "model": "create:block/mechanical_piston/pole" }, - "facing=down": { "model": "create:block/mechanical_piston/pole" , "x": 180 }, - "facing=south": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 180 }, - "facing=north": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 0 }, - "facing=east": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 90 }, - "facing=west": { "model": "create:block/mechanical_piston/pole", "x": 90, "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/plough.json b/src/main/resources/assets/create/blockstates/plough.json deleted file mode 100644 index 35b68345d..000000000 --- a/src/main/resources/assets/create/blockstates/plough.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/plough", "y": 180 }, - "facing=south": { "model": "create:block/plough" }, - "facing=east": { "model": "create:block/plough", "y": 270 }, - "facing=west": { "model": "create:block/plough", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/portable_storage_interface.json b/src/main/resources/assets/create/blockstates/portable_storage_interface.json deleted file mode 100644 index 16eeab7b1..000000000 --- a/src/main/resources/assets/create/blockstates/portable_storage_interface.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "create:block/portable_storage_interface", "x": 90 }, - "facing=south": { "model": "create:block/portable_storage_interface", "x": 90, "y": 180 }, - "facing=west": { "model": "create:block/portable_storage_interface", "x": 90, "y": 270 }, - "facing=up": { "model": "create:block/portable_storage_interface" }, - "facing=down": { "model": "create:block/portable_storage_interface", "x": 180 }, - "facing=east": { "model": "create:block/portable_storage_interface", "x": 90, "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/pulley_magnet.json b/src/main/resources/assets/create/blockstates/pulley_magnet.json deleted file mode 100644 index eff11d04e..000000000 --- a/src/main/resources/assets/create/blockstates/pulley_magnet.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "" : { "model": "create:block/pulley/magnet" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/rope.json b/src/main/resources/assets/create/blockstates/rope.json deleted file mode 100644 index 9890e2ac6..000000000 --- a/src/main/resources/assets/create/blockstates/rope.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/pulley/rope" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/rope_pulley.json b/src/main/resources/assets/create/blockstates/rope_pulley.json deleted file mode 100644 index b312e0b2d..000000000 --- a/src/main/resources/assets/create/blockstates/rope_pulley.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "axis=z": { "model": "create:block/pulley/casing" }, - "axis=x": { "model": "create:block/pulley/casing", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/rotation_chassis.json b/src/main/resources/assets/create/blockstates/rotation_chassis.json deleted file mode 100644 index 2506c0523..000000000 --- a/src/main/resources/assets/create/blockstates/rotation_chassis.json +++ /dev/null @@ -1,98 +0,0 @@ -{ -"multipart": [ - { "when": { "axis": "x" }, - "apply": { "model": "create:block/rotation_chassis_base", "x": 90, "y": 90 } - }, - { "when": { "axis": "y" }, - "apply": { "model": "create:block/rotation_chassis_base" } - }, - { "when": { "axis": "z" }, - "apply": { "model": "create:block/rotation_chassis_base", "x": 90 } - }, - - - { "when": { "axis": "x", "sticky_south": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_x", "x": 180, "y": 0 } - }, - { "when": { "axis": "y", "sticky_south": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_y" } - }, - { "when": { "axis": "z", "sticky_south": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_x", "x": 180, "y": 90 } - }, - - { "when": { "axis": "x", "sticky_south": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_x_sticky", "x": 180, "y": 0 } - }, - { "when": { "axis": "y", "sticky_south": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_y_sticky" } - }, - { "when": { "axis": "z", "sticky_south": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_x_sticky", "x": 180, "y": 90 } - }, - - - { "when": { "axis": "x", "sticky_north": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_x", "x": 0, "y": 0 } - }, - { "when": { "axis": "y", "sticky_north": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_y", "x": 0, "y": 180 } - }, - { "when": { "axis": "z", "sticky_north": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_x", "x": 0, "y": 90 } - }, - - { "when": { "axis": "x", "sticky_north": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_x_sticky", "x": 0, "y": 0 } - }, - { "when": { "axis": "y", "sticky_north": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_y_sticky", "x": 0, "y": 180 } - }, - { "when": { "axis": "z", "sticky_north": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_x_sticky", "x": 0, "y": 90 } - }, - - - { "when": { "axis": "x", "sticky_east": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_x", "x": 270, "y": 0 } - }, - { "when": { "axis": "y", "sticky_east": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_y", "x": 0, "y": 270 } - }, - { "when": { "axis": "z", "sticky_east": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_z", "x": 0, "y": 0 } - }, - - { "when": { "axis": "x", "sticky_east": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_x_sticky", "x": 270, "y": 0 } - }, - { "when": { "axis": "y", "sticky_east": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_y_sticky", "x": 0, "y": 270 } - }, - { "when": { "axis": "z", "sticky_east": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_z_sticky", "x": 0, "y": 0 } - }, - - - { "when": { "axis": "x", "sticky_west": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_x", "x": 90, "y": 0 } - }, - { "when": { "axis": "y", "sticky_west": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_y", "x": 0, "y": 90 } - }, - { "when": { "axis": "z", "sticky_west": "false" }, - "apply": { "model": "create:block/rotation_chassis_side_z", "x": 0, "y": 180 } - }, - - { "when": { "axis": "x", "sticky_west": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_x_sticky", "x": 90, "y": 0 } - }, - { "when": { "axis": "y", "sticky_west": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_y_sticky", "x": 0, "y": 90 } - }, - { "when": { "axis": "z", "sticky_west": "true" }, - "apply": { "model": "create:block/rotation_chassis_side_z_sticky", "x": 0, "y": 180 } - } - - ] -} diff --git a/src/main/resources/assets/create/blockstates/rotation_speed_controller.json b/src/main/resources/assets/create/blockstates/rotation_speed_controller.json deleted file mode 100644 index 438b75866..000000000 --- a/src/main/resources/assets/create/blockstates/rotation_speed_controller.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "axis=z": { "model": "create:block/rotation_speed_controller" }, - "axis=x": { "model": "create:block/rotation_speed_controller", "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/saw.json b/src/main/resources/assets/create/blockstates/saw.json deleted file mode 100644 index 253d2bdeb..000000000 --- a/src/main/resources/assets/create/blockstates/saw.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - - "axis_along_first=true,running=true,facing=up": { "model": "create:block/saw", "y": 90 }, - "axis_along_first=false,running=true,facing=up": { "model": "create:block/saw" }, - "axis_along_first=true,running=true,facing=down": { "model": "create:block/saw", "x": 180, "y": 90 }, - "axis_along_first=false,running=true,facing=down": { "model": "create:block/saw", "x": 180 }, - "axis_along_first=true,running=false,facing=up": { "model": "create:block/saw_inactive", "y": 90 }, - "axis_along_first=false,running=false,facing=up": { "model": "create:block/saw_inactive" }, - "axis_along_first=true,running=false,facing=down": { "model": "create:block/saw_inactive", "x": 180, "y": 90 }, - "axis_along_first=false,running=false,facing=down": { "model": "create:block/saw_inactive", "x": 180 }, - - "axis_along_first=false,running=true,facing=south": { "model": "create:block/saw_horizontal", "y": 0 }, - "axis_along_first=false,running=true,facing=north": { "model": "create:block/saw_horizontal", "y": 180 }, - "axis_along_first=false,running=true,facing=west": { "model": "create:block/saw_horizontal", "y": 90 }, - "axis_along_first=false,running=true,facing=east": { "model": "create:block/saw_horizontal", "y": 270 }, - "axis_along_first=true,running=true,facing=south": { "model": "create:block/saw_horizontal", "y": 0 }, - "axis_along_first=true,running=true,facing=north": { "model": "create:block/saw_horizontal", "y": 180 }, - "axis_along_first=true,running=true,facing=west": { "model": "create:block/saw_horizontal", "y": 90 }, - "axis_along_first=true,running=true,facing=east": { "model": "create:block/saw_horizontal", "y": 270 }, - - "axis_along_first=false,running=false,facing=south": { "model": "create:block/saw_horizontal_inactive", "y": 0 }, - "axis_along_first=false,running=false,facing=north": { "model": "create:block/saw_horizontal_inactive", "y": 180 }, - "axis_along_first=false,running=false,facing=west": { "model": "create:block/saw_horizontal_inactive", "y": 90 }, - "axis_along_first=false,running=false,facing=east": { "model": "create:block/saw_horizontal_inactive", "y": 270 }, - "axis_along_first=true,running=false,facing=south": { "model": "create:block/saw_horizontal_inactive", "y": 0 }, - "axis_along_first=true,running=false,facing=north": { "model": "create:block/saw_horizontal_inactive", "y": 180 }, - "axis_along_first=true,running=false,facing=west": { "model": "create:block/saw_horizontal_inactive", "y": 90 }, - "axis_along_first=true,running=false,facing=east": { "model": "create:block/saw_horizontal_inactive", "y": 270 } - - } -} diff --git a/src/main/resources/assets/create/blockstates/sequenced_gearshift.json b/src/main/resources/assets/create/blockstates/sequenced_gearshift.json deleted file mode 100644 index 17c2890c1..000000000 --- a/src/main/resources/assets/create/blockstates/sequenced_gearshift.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "variants": { - "vertical=false,axis=x,state=0" : { "model": "create:block/sequenced_gearshift/idle", "y": 90 }, - "vertical=false,axis=x,state=1" : { "model": "create:block/sequenced_gearshift/seq_1", "y": 90 }, - "vertical=false,axis=x,state=2" : { "model": "create:block/sequenced_gearshift/seq_2", "y": 90 }, - "vertical=false,axis=x,state=3" : { "model": "create:block/sequenced_gearshift/seq_3", "y": 90 }, - "vertical=false,axis=x,state=4" : { "model": "create:block/sequenced_gearshift/seq_4", "y": 90 }, - "vertical=false,axis=x,state=5" : { "model": "create:block/sequenced_gearshift/seq_5", "y": 90 }, - - "vertical=false,axis=z,state=0" : { "model": "create:block/sequenced_gearshift/idle" }, - "vertical=false,axis=z,state=1" : { "model": "create:block/sequenced_gearshift/seq_1" }, - "vertical=false,axis=z,state=2" : { "model": "create:block/sequenced_gearshift/seq_2" }, - "vertical=false,axis=z,state=3" : { "model": "create:block/sequenced_gearshift/seq_3" }, - "vertical=false,axis=z,state=4" : { "model": "create:block/sequenced_gearshift/seq_4" }, - "vertical=false,axis=z,state=5" : { "model": "create:block/sequenced_gearshift/seq_5" }, - - "vertical=true,axis=x,state=0" : { "model": "create:block/sequenced_gearshift/idle", "x": 90, "y": 90 }, - "vertical=true,axis=x,state=1" : { "model": "create:block/sequenced_gearshift/seq_1", "x": 90, "y": 90 }, - "vertical=true,axis=x,state=2" : { "model": "create:block/sequenced_gearshift/seq_2", "x": 90, "y": 90 }, - "vertical=true,axis=x,state=3" : { "model": "create:block/sequenced_gearshift/seq_3", "x": 90, "y": 90 }, - "vertical=true,axis=x,state=4" : { "model": "create:block/sequenced_gearshift/seq_4", "x": 90, "y": 90 }, - "vertical=true,axis=x,state=5" : { "model": "create:block/sequenced_gearshift/seq_5", "x": 90, "y": 90 }, - - "vertical=true,axis=z,state=0" : { "model": "create:block/sequenced_gearshift/idle", "x": 90 }, - "vertical=true,axis=z,state=1" : { "model": "create:block/sequenced_gearshift/seq_1", "x": 90 }, - "vertical=true,axis=z,state=2" : { "model": "create:block/sequenced_gearshift/seq_2", "x": 90 }, - "vertical=true,axis=z,state=3" : { "model": "create:block/sequenced_gearshift/seq_3", "x": 90 }, - "vertical=true,axis=z,state=4" : { "model": "create:block/sequenced_gearshift/seq_4", "x": 90 }, - "vertical=true,axis=z,state=5" : { "model": "create:block/sequenced_gearshift/seq_5", "x": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/slightly_mossy_gabbro_bricks.json b/src/main/resources/assets/create/blockstates/slightly_mossy_gabbro_bricks.json deleted file mode 100644 index 1bb06af93..000000000 --- a/src/main/resources/assets/create/blockstates/slightly_mossy_gabbro_bricks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/palettes/slightly_mossy_gabbro_bricks" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/speed_gauge.json b/src/main/resources/assets/create/blockstates/speed_gauge.json deleted file mode 100644 index 3ee2fb580..000000000 --- a/src/main/resources/assets/create/blockstates/speed_gauge.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "facing=east,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 0, "y": 0 }, - "facing=west,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 0, "y": 180 }, - "facing=up,axis_along_first=false": { "model": "create:block/gauge/base", "x": 0, "y": 0 }, - "facing=down,axis_along_first=false": { "model": "create:block/gauge/base", "x": 180, "y": 0 }, - "facing=south,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 90, "y": 90 }, - "facing=north,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 90, "y": 270 }, - - "facing=east,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 0 }, - "facing=west,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 180 }, - "facing=up,axis_along_first=true": { "model": "create:block/gauge/base", "x": 0, "y": 90 }, - "facing=down,axis_along_first=true": { "model": "create:block/gauge/base", "x": 180, "y": 90 }, - "facing=south,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 0, "y": 90 }, - "facing=north,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 0, "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/sticky_mechanical_piston.json b/src/main/resources/assets/create/blockstates/sticky_mechanical_piston.json deleted file mode 100644 index 1bde6f94d..000000000 --- a/src/main/resources/assets/create/blockstates/sticky_mechanical_piston.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "variants": { - "axis_along_first=false,state=retracted,facing=south": { "model": "create:block/mechanical_piston_sticky", "x": 90, "y": 180 }, - "axis_along_first=false,state=retracted,facing=north": { "model": "create:block/mechanical_piston_sticky", "x": 90 }, - "axis_along_first=false,state=retracted,facing=west": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 90, "y": 270 }, - "axis_along_first=false,state=retracted,facing=up": { "model": "create:block/mechanical_piston_sticky" }, - "axis_along_first=false,state=retracted,facing=down": { "model": "create:block/mechanical_piston_sticky", "x": 180 }, - "axis_along_first=false,state=retracted,facing=east": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 90, "y": 90 }, - - "axis_along_first=false,state=moving,facing=south": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 180 }, - "axis_along_first=false,state=moving,facing=north": { "model": "create:block/mechanical_piston/base", "x": 90 }, - "axis_along_first=false,state=moving,facing=west": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 270 }, - "axis_along_first=false,state=moving,facing=up": { "model": "create:block/mechanical_piston/base" }, - "axis_along_first=false,state=moving,facing=down": { "model": "create:block/mechanical_piston/base", "x": 180 }, - "axis_along_first=false,state=moving,facing=east": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 90 }, - - "axis_along_first=false,state=extended,facing=south": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90, "y": 180 }, - "axis_along_first=false,state=extended,facing=north": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90 }, - "axis_along_first=false,state=extended,facing=west": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 270 }, - "axis_along_first=false,state=extended,facing=up": { "model": "create:block/mechanical_piston/base_with_extension" }, - "axis_along_first=false,state=extended,facing=down": { "model": "create:block/mechanical_piston/base_with_extension", "x": 180 }, - "axis_along_first=false,state=extended,facing=east": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 90 }, - - - "axis_along_first=true,state=retracted,facing=south": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 90, "y": 180 }, - "axis_along_first=true,state=retracted,facing=north": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 90 }, - "axis_along_first=true,state=retracted,facing=west": { "model": "create:block/mechanical_piston_sticky", "x": 90, "y": 270 }, - "axis_along_first=true,state=retracted,facing=up": { "model": "create:block/mechanical_piston/rotated_sticky" }, - "axis_along_first=true,state=retracted,facing=down": { "model": "create:block/mechanical_piston/rotated_sticky", "x": 180 }, - "axis_along_first=true,state=retracted,facing=east": { "model": "create:block/mechanical_piston_sticky", "x": 90, "y": 90 }, - - "axis_along_first=true,state=moving,facing=south": { "model": "create:block/mechanical_piston/base_rotated", "x": 90, "y": 180 }, - "axis_along_first=true,state=moving,facing=north": { "model": "create:block/mechanical_piston/base_rotated", "x": 90 }, - "axis_along_first=true,state=moving,facing=west": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 270 }, - "axis_along_first=true,state=moving,facing=up": { "model": "create:block/mechanical_piston/base_rotated" }, - "axis_along_first=true,state=moving,facing=down": { "model": "create:block/mechanical_piston/base_rotated", "x": 180 }, - "axis_along_first=true,state=moving,facing=east": { "model": "create:block/mechanical_piston/base", "x": 90, "y": 90 }, - - "axis_along_first=true,state=extended,facing=south": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90, "y": 180 }, - "axis_along_first=true,state=extended,facing=north": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 90 }, - "axis_along_first=true,state=extended,facing=west": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90, "y": 270 }, - "axis_along_first=true,state=extended,facing=up": { "model": "create:block/mechanical_piston/base_with_extension_rotated" }, - "axis_along_first=true,state=extended,facing=down": { "model": "create:block/mechanical_piston/base_with_extension_rotated", "x": 180 }, - "axis_along_first=true,state=extended,facing=east": { "model": "create:block/mechanical_piston/base_with_extension", "x": 90, "y": 90 } - } -} diff --git a/src/main/resources/assets/create/blockstates/stress_gauge.json b/src/main/resources/assets/create/blockstates/stress_gauge.json deleted file mode 100644 index 3ee2fb580..000000000 --- a/src/main/resources/assets/create/blockstates/stress_gauge.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "variants": { - "facing=east,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 0, "y": 0 }, - "facing=west,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 0, "y": 180 }, - "facing=up,axis_along_first=false": { "model": "create:block/gauge/base", "x": 0, "y": 0 }, - "facing=down,axis_along_first=false": { "model": "create:block/gauge/base", "x": 180, "y": 0 }, - "facing=south,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 90, "y": 90 }, - "facing=north,axis_along_first=false": { "model": "create:block/gauge/base_wall", "x": 90, "y": 270 }, - - "facing=east,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 0 }, - "facing=west,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 90, "y": 180 }, - "facing=up,axis_along_first=true": { "model": "create:block/gauge/base", "x": 0, "y": 90 }, - "facing=down,axis_along_first=true": { "model": "create:block/gauge/base", "x": 180, "y": 90 }, - "facing=south,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 0, "y": 90 }, - "facing=north,axis_along_first=true": { "model": "create:block/gauge/base_wall", "x": 0, "y": 270 } - } -} diff --git a/src/main/resources/assets/create/blockstates/translation_chassis.json b/src/main/resources/assets/create/blockstates/translation_chassis.json deleted file mode 100644 index 9bc46f235..000000000 --- a/src/main/resources/assets/create/blockstates/translation_chassis.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - - "sticky_top=false,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/regular", "x": 90, "y": 90 }, - "sticky_top=false,sticky_bottom=false,axis=y": { "model": "create:block/translation_chassis/regular" }, - "sticky_top=false,sticky_bottom=false,axis=z": { "model": "create:block/translation_chassis/regular", "x": 90, "y": 180 }, - - "sticky_top=false,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/regular_bottom_sticky", "x": 90, "y": 90 }, - "sticky_top=false,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/regular_bottom_sticky" }, - "sticky_top=false,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/regular_bottom_sticky", "x": 90, "y": 180 }, - - "sticky_top=true,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/regular_top_sticky", "x": 90, "y": 90 }, - "sticky_top=true,sticky_bottom=false,axis=y": { "model": "create:block/translation_chassis/regular_top_sticky" }, - "sticky_top=true,sticky_bottom=false,axis=z": { "model": "create:block/translation_chassis/regular_top_sticky", "x": 90, "y": 180 }, - - "sticky_top=true,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/regular_both_sticky", "x": 90, "y": 90 }, - "sticky_top=true,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/regular_both_sticky" }, - "sticky_top=true,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/regular_both_sticky", "x": 90, "y": 180 } - - } -} diff --git a/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json b/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json deleted file mode 100644 index efc93504e..000000000 --- a/src/main/resources/assets/create/blockstates/translation_chassis_secondary.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - - "sticky_top=false,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/alt", "x": 90, "y": 90 }, - "sticky_top=false,sticky_bottom=false,axis=y": { "model": "create:block/translation_chassis/alt" }, - "sticky_top=false,sticky_bottom=false,axis=z": { "model": "create:block/translation_chassis/alt", "x": 90, "y": 180 }, - - "sticky_top=false,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/alt_bottom_sticky", "x": 90, "y": 90 }, - "sticky_top=false,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/alt_bottom_sticky" }, - "sticky_top=false,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/alt_bottom_sticky", "x": 90, "y": 180 }, - - "sticky_top=true,sticky_bottom=false,axis=x": { "model": "create:block/translation_chassis/alt_top_sticky", "x": 90, "y": 90 }, - "sticky_top=true,sticky_bottom=false,axis=y": { "model": "create:block/translation_chassis/alt_top_sticky" }, - "sticky_top=true,sticky_bottom=false,axis=z": { "model": "create:block/translation_chassis/alt_top_sticky", "x": 90, "y": 180 }, - - "sticky_top=true,sticky_bottom=true,axis=x": { "model": "create:block/translation_chassis/alt_both_sticky", "x": 90, "y": 90 }, - "sticky_top=true,sticky_bottom=true,axis=y": { "model": "create:block/translation_chassis/alt_both_sticky" }, - "sticky_top=true,sticky_bottom=true,axis=z": { "model": "create:block/translation_chassis/alt_both_sticky", "x": 90, "y": 180 } - - } -} diff --git a/src/main/resources/assets/create/blockstates/turntable.json b/src/main/resources/assets/create/blockstates/turntable.json deleted file mode 100644 index 81e633d84..000000000 --- a/src/main/resources/assets/create/blockstates/turntable.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "create:block/turntable" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/bearing/regular.json b/src/main/resources/assets/create/models/block/bearing/block.json similarity index 92% rename from src/main/resources/assets/create/models/block/bearing/regular.json rename to src/main/resources/assets/create/models/block/bearing/block.json index bbd3f02a6..4671586a2 100644 --- a/src/main/resources/assets/create/models/block/bearing/regular.json +++ b/src/main/resources/assets/create/models/block/bearing/block.json @@ -1,9 +1,8 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "textures": { - "particle": "create:block/bearing_side", - "gearbox": "create:block/gearbox", - "bearing_side": "create:block/bearing_side", + "particle": "#side", + "gearbox": "#back", + "bearing_side": "#side", "brass_casing": "create:block/brass_casing" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/bearing/clockwork.json b/src/main/resources/assets/create/models/block/bearing/clockwork.json deleted file mode 100644 index a41847e0c..000000000 --- a/src/main/resources/assets/create/models/block/bearing/clockwork.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "create:block/bearing/regular", - "textures": { - "particle": "create:block/clockwork_bearing_side", - "gearbox": "create:block/brass_gearbox", - "bearing_side": "create:block/clockwork_bearing_side", - "brass_casing": "create:block/brass_casing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/mechanical_bearing.json b/src/main/resources/assets/create/models/block/bearing/item.json similarity index 95% rename from src/main/resources/assets/create/models/item/mechanical_bearing.json rename to src/main/resources/assets/create/models/block/bearing/item.json index 3b4733de5..88c82ddb0 100644 --- a/src/main/resources/assets/create/models/item/mechanical_bearing.json +++ b/src/main/resources/assets/create/models/block/bearing/item.json @@ -2,10 +2,10 @@ "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "parent": "block/block", "textures": { - "particle": "create:block/bearing_side", + "particle": "#side", "bearing_top": "create:block/bearing_top", - "gearbox": "create:block/gearbox", - "bearing_side": "create:block/bearing_side" + "gearbox": "#back", + "bearing_side": "#side" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/bearing/top.json b/src/main/resources/assets/create/models/block/bearing/top.json index 7ff228e49..b8cfe38cc 100644 --- a/src/main/resources/assets/create/models/block/bearing/top.json +++ b/src/main/resources/assets/create/models/block/bearing/top.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "textures": { "bearing_top": "create:block/bearing_top", - "particle": "create:block/bearing_side", - "bearing_side": "create:block/bearing_side", + "particle": "create:block/mechanical_bearing_side", + "bearing_side": "create:block/mechanical_bearing_side", "brass_casing": "create:block/brass_casing" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/brass_block.json b/src/main/resources/assets/create/models/block/brass_block.json deleted file mode 100644 index 333017081..000000000 --- a/src/main/resources/assets/create/models/block/brass_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/brass_block" - } -} diff --git a/src/main/resources/assets/create/models/block/cart_assembler.json b/src/main/resources/assets/create/models/block/cart_assembler/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/cart_assembler.json rename to src/main/resources/assets/create/models/block/cart_assembler/block.json diff --git a/src/main/resources/assets/create/models/block/cart_assembler_powered.json b/src/main/resources/assets/create/models/block/cart_assembler/block_powered.json similarity index 60% rename from src/main/resources/assets/create/models/block/cart_assembler_powered.json rename to src/main/resources/assets/create/models/block/cart_assembler/block_powered.json index ae3a2f798..bbb648335 100644 --- a/src/main/resources/assets/create/models/block/cart_assembler_powered.json +++ b/src/main/resources/assets/create/models/block/cart_assembler/block_powered.json @@ -1,5 +1,5 @@ { - "parent": "create:block/cart_assembler", + "parent": "create:block/cart_assembler/block", "textures": { "clutch_off": "create:block/clutch_on" } diff --git a/src/main/resources/assets/create/models/block/minecart_anchor.json b/src/main/resources/assets/create/models/block/cart_assembler/minecart_anchor.json similarity index 100% rename from src/main/resources/assets/create/models/block/minecart_anchor.json rename to src/main/resources/assets/create/models/block/cart_assembler/minecart_anchor.json diff --git a/src/main/resources/assets/create/models/block/cocoa_log.json b/src/main/resources/assets/create/models/block/cocoa_log.json deleted file mode 100644 index 80f9a538d..000000000 --- a/src/main/resources/assets/create/models/block/cocoa_log.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_column", - "textures": { - "end": "block/jungle_log_top" - } -} diff --git a/src/main/resources/assets/create/models/block/cocoa_log_0.json b/src/main/resources/assets/create/models/block/cocoa_log_0.json deleted file mode 100644 index b77be3d2e..000000000 --- a/src/main/resources/assets/create/models/block/cocoa_log_0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/cocoa_log", - "textures": { - "side": "create:block/cocoa_log_0" - } -} diff --git a/src/main/resources/assets/create/models/block/cocoa_log_1.json b/src/main/resources/assets/create/models/block/cocoa_log_1.json deleted file mode 100644 index 348c41760..000000000 --- a/src/main/resources/assets/create/models/block/cocoa_log_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/cocoa_log", - "textures": { - "side": "create:block/cocoa_log_1" - } -} diff --git a/src/main/resources/assets/create/models/block/cocoa_log_2.json b/src/main/resources/assets/create/models/block/cocoa_log_2.json deleted file mode 100644 index a76048cc6..000000000 --- a/src/main/resources/assets/create/models/block/cocoa_log_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/cocoa_log", - "textures": { - "side": "create:block/cocoa_log_2" - } -} diff --git a/src/main/resources/assets/create/models/block/crafter/Logistical Crafter.bbmodel b/src/main/resources/assets/create/models/block/crafter/Logistical Crafter.bbmodel deleted file mode 100644 index 241ac283a..000000000 --- a/src/main/resources/assets/create/models/block/crafter/Logistical Crafter.bbmodel +++ /dev/null @@ -1 +0,0 @@ -{"meta":{"format_version":"3.2","model_format":"java_block","box_uv":false},"name":"casing","parent":"block/block","ambientocclusion":true,"resolution":{"width":16,"height":16},"elements":[{"name":"Top","from":[0,10,0],"to":[16,16,16],"autouv":0,"color":2,"origin":[8,8,8],"faces":{"north":{"uv":[0,0,16,6],"texture":2},"east":{"uv":[0,0,16,6],"texture":2},"south":{"uv":[0,0,16,6],"texture":2},"west":{"uv":[0,0,16,6],"texture":2},"up":{"uv":[0,0,16,16],"rotation":270,"texture":3},"down":{"uv":[0,0,16,16],"rotation":90,"texture":3}},"uuid":"eb9a173b-de5b-8b07-18f8-169e3ee7a6b4"},{"name":"Crafting Table","from":[3,16,3],"to":[13,20,13],"autouv":0,"color":1,"origin":[8,8,8],"faces":{"north":{"uv":[3,3,13,7],"texture":0},"east":{"uv":[3,3,13,7],"texture":0},"south":{"uv":[3,3,13,7],"texture":0},"west":{"uv":[3,3,13,7],"texture":0},"up":{"uv":[3,3,13,13],"texture":0},"down":{"uv":[0,0,10,10],"texture":0}},"uuid":"59eee492-c9e5-ce77-b998-db9a967bc686"},{"name":"Bottom","from":[0,0,0],"to":[16,6,16],"autouv":0,"color":2,"origin":[8,8,8],"faces":{"north":{"uv":[0,0,16,6],"texture":2},"east":{"uv":[0,0,16,6],"texture":2},"south":{"uv":[0,0,16,6],"texture":2},"west":{"uv":[0,0,16,6],"texture":2},"up":{"uv":[0,0,16,16],"rotation":270,"texture":3},"down":{"uv":[0,0,16,16],"rotation":90,"texture":3}},"uuid":"a0ebb05c-878f-e6c2-8b43-dfd1d42fa53f"},{"name":"Middle","from":[1.0999999999999996,6,1.0999999999999996],"to":[14.9,10,14.9],"autouv":0,"color":2,"origin":[8,8,8],"faces":{"north":{"uv":[1,0,15,4],"texture":1},"east":{"uv":[1,0,15,4],"texture":1},"south":{"uv":[1,0,15,4],"texture":1},"west":{"uv":[1,0,15,4],"texture":1},"up":{"uv":[0,0,13.8,13.8],"rotation":270,"texture":null},"down":{"uv":[0,0,13.8,13.8],"rotation":90,"texture":null}},"uuid":"c50a1191-32a7-d227-a459-ceaea82f79ab"},{"name":"Middle","from":[1,7,1],"to":[15,9,15],"autouv":0,"color":2,"origin":[8,8,8],"faces":{"north":{"uv":[1,5,15,7],"texture":1},"east":{"uv":[1,5,15,7],"texture":1},"south":{"uv":[1,5,15,7],"texture":1},"west":{"uv":[1,5,15,7],"texture":1},"up":{"uv":[1,1,15,15],"rotation":270,"texture":3},"down":{"uv":[0,0,14,14],"rotation":90,"texture":null}},"uuid":"1c8932e4-1c5f-ef3f-7649-c0cafab63665"}],"outliner":["eb9a173b-de5b-8b07-18f8-169e3ee7a6b4","a0ebb05c-878f-e6c2-8b43-dfd1d42fa53f","c50a1191-32a7-d227-a459-ceaea82f79ab","1c8932e4-1c5f-ef3f-7649-c0cafab63665","59eee492-c9e5-ce77-b998-db9a967bc686"],"textures":[{"path":"D:\\simon\\Minecraft\\Minecraft Assets\\minecraft\\textures\\block\\crafting_table_top.png","name":"crafting_table_top.png","folder":"block","namespace":"minecraft","id":"8","particle":false,"mode":"bitmap","saved":true,"uuid":"70e79315-ccef-b67d-269f-d9cf603ae9c8","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABSUlEQVQ4T2OUFOH5//X7LwYQ4OZkY9DgZ2IwEhMC89HBuVfvGG5++s/w5dtPBh4udob///8zMPJxs/1f1xsDVtvavYYh1kyFQUCAC6sBHz58Y1h86g5DdWkIWD6oeAnCAJDmXDc9rBrRBSfvugQ2BGwAyAsgZ4M0Lz//guHb5y8MXLw8cD0gPjIAyUUaSjCADLnx8R8Do6My33+Ys0EGeCrygb0AYoMUgsDcQ3cYku1UwGyYOMw7jMWWCv+tDWRQJGGagvWk4IZhM/johScMGAaANCN7Axsb5jKsBsAkkb2Ai019A0CBBQOg0IbFACxWYN7B6QWQAbCAg4U8KLTXXnqGEQsgi8BewBWNyFGHbDBGNEqJ8v5X52OEJyT0WMCWNGEJCZQv4HmB7KQMcsGi5lCyMlNc7WpIXmBkZIRnUZB38GVnUPpHzv4AoD31LTkmdq8AAAAASUVORK5CYII="},{"path":"C:\\Users\\simon\\Desktop\\Forge\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\logistical_crafter.png","name":"logistical_crafter.png","folder":"block","namespace":"create","id":"9","particle":false,"mode":"bitmap","saved":true,"uuid":"adf3d1a3-a2d3-19f2-8320-105a54d24ff4","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA+ElEQVQ4T2NkYGBgKMs0/C/IJ8GwcOZOBmYOZgYuTg6QMBh8+/4DzgexQSA3P4hh9+EDDGu3vWRkBAkkhin+11NTZ1iz+jRYAwz8/fcfzOTl5oSLgRjWTnIMr99+YJi/6j6mASAFQjwsYA3///9neP/1L4pmkJyrvw3D+SvnEAYEe4n/11fXYliz+iSGjVLCPGCDfv76CTcwJNSU4dKtmwgDUKwgkQMOg9TU1P+ioqIMcnJyDG/evGEQERGB0x8+fGAQEBBA4X/8+JHhz58/DN3d3ZAwqKqq+s/Hx8fw6dMnog25e/cuw+zZsyEGUAJGDWBgGA0DBgYAlc14ES4JswkAAAAASUVORK5CYII="},{"path":"C:\\Users\\simon\\Desktop\\Forge\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\crafter_side.png","name":"crafter_side.png","folder":"block","namespace":"create","id":"3","particle":false,"mode":"bitmap","saved":true,"uuid":"22e3d119-558d-bc26-0ac3-aebf3a567df4","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB9klEQVQ4T6WSz2vUQBTHv5NMNpnd7NKtorKC0osFodaUrQttTwVBevFQf5xFEIp38aAXEXpUPOlR8CItggcPshdLW6iUtqAFqf+ClHab3Z1MssnITEjY4in4Lnnz3pvP++bNIw/ujUkUsJNuHzW3jOxLFKDltdDjASxqQCYxDALYtgViJOCBj8EgAjUIXHYWpkXA7JJu+fFLGxowPdlEKDgopaCmhG1RWCULSRKh0z1CGA4AQlB3z8FhJoSIYVKCz+21FNDyZhCFXTi2CaY7GxhEMUQk0PFPYBoUdomCMYay46AfCPQ5x87+L5DFhfOyed1DjTFUmAWCGCKMkMAA5xwiCsDsMkZqVZQsqoTg8LgDv+tj++dBqkD9jxqKMjWgzLLYcHw4puIa0Jzw8Pj5J1LgMfBkyZN/Do9TwI2pWSw9/VAI8OrZLbmxuweiSJcbY4UVvHmxKNe2NlIFFxsNvHy9WUjB2+X7sr3+LVVQr13A+3df9QhMx0SZOfk4+jzIz8pXpvIPHy1AA5SCa1fGsbqyrZNZkfLjJN3yaoX9M9/Z+UvIhzgMUJWjLtUXpJQ46sWnLme5m7fnsLe/my7S5PhVrK58zwuHOzbOuBokQnEKeOfuNH78PkgBc1Me/J7IASP1Ub11mfFeR7tZTbVi67N+xv/dxL+U7N4ZTLqYlQAAAABJRU5ErkJggg=="},{"path":"C:\\Users\\simon\\Desktop\\Forge\\Create\\src\\main\\resources\\assets\\create\\textures\\block\\brass_casing.png","name":"brass_casing.png","folder":"block","namespace":"create","id":"5","particle":false,"mode":"bitmap","saved":true,"uuid":"1b1616d1-457a-c26e-5dbd-eba4c75c920a","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB+UlEQVQ4T4WTTUsbURSG30lmrphoagRRI1RFUCiondhOIrooBYsUuijSIi4C0pV/wB/ShboV2qqLoFBo6wdt1CzUhdFSWvQPdBGCX5nEGZOMnDu540Qlns29594zz7znnnOkyfedFqrYeTbn3AbqfCDfvUoEiIajyOYMMMUDyyqhWCghb+hoqA/AKJTAvBIAC+lMBoz5IHuKUGQvkvspcEBE1TA3+53/yce8fJUVCYUri69uozOy0TdPcXj01wYMai8w8zGOrlAdvyyYpYqPzKJVVmEfp88NxD68wm5qzwa0P+7A2soBmgI1oOBqRumc5E1MxEZuAM/7B7D46SeCtYwDznTTSYMrKst+5GdcCSmgFLKXp7aCZ70qPs//AgWQ/T/JozVYWyGEoOKe9sMjHUhnygAtPISF+W8VCihYN684xM8UvqdVpPB2TLOrMD2lWu2hTix9SdwLIPkEEwpECuOxl9jcSdoptIVC2Fr9dwfgzkEooDOCURXWtxO2gmCgBV/jO04VxCPmzCLvC9EL7hSoChxACvq6e7Ac33MUPFRGqkLFI7oB9PHtxhFAmXl4kxGA3iD1Zx/S2Otmq7/nCTZ+HDqtK+peTcm78Qh+Hx/ZgOGwigvdcOIbgo1giuz4ef2M70VMvb+G+84wkSPGlkZV2O1RdseJmGtgdBGoNZvNDwAAAABJRU5ErkJggg=="}]} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crafter/casing.json b/src/main/resources/assets/create/models/block/crafter/casing.json deleted file mode 100644 index 151a2b565..000000000 --- a/src/main/resources/assets/create/models/block/crafter/casing.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "3": "create:block/crafter_thingies", - "4": "create:block/crafter_side", - "5": "create:block/brass_casing", - "6": "create:block/crafter_top", - "7": "create:block/crafter_topunderside", - "particle": "create:block/brass_casing" - }, - "elements": [ - { - "name": "Top", - "from": [0, 0, 0], - "to": [6, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 6], "rotation": 90, "texture": "#4"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#7"}, - "south": {"uv": [16, 0, 0, 6], "rotation": 270, "texture": "#4"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#6"}, - "up": {"uv": [0, 0, 16, 6], "rotation": 270, "texture": "#4"}, - "down": {"uv": [0, 0, 16, 6], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [10, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 10, 16, 16], "rotation": 90, "texture": "#4"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#6"}, - "south": {"uv": [16, 10, 0, 16], "rotation": 270, "texture": "#4"}, - "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, - "up": {"uv": [0, 10, 16, 16], "rotation": 270, "texture": "#4"}, - "down": {"uv": [0, 10, 16, 16], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Side1", - "from": [6, 15.9, 0], - "to": [10, 16, 16], - "faces": { - "up": {"uv": [0, 6, 16, 10], "rotation": 270, "texture": "#4"}, - "down": {"uv": [0, 6, 16, 10], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Side2", - "from": [6, 0, 0], - "to": [10, 0.1, 16], - "faces": { - "up": {"uv": [0, 6, 16, 10], "rotation": 270, "texture": "#4"}, - "down": {"uv": [0, 6, 16, 10], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Side3", - "from": [6, 0, 0], - "to": [10, 16, 0.1], - "faces": { - "north": {"uv": [0, 6, 16, 10], "rotation": 90, "texture": "#4"}, - "south": {"uv": [0, 6, 16, 10], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "Side4", - "from": [6, 0, 15.9], - "to": [10, 16, 16], - "faces": { - "north": {"uv": [0, 6, 16, 10], "rotation": 90, "texture": "#4"}, - "south": {"uv": [16, 6, 0, 10], "rotation": 270, "texture": "#4"} - } - }, - { - "name": "valve_case", - "from": [-1, 4, 4], - "to": [0, 5, 12], - "faces": { - "north": {"uv": [8, 2, 9, 3], "rotation": 90, "texture": "#5"}, - "south": {"uv": [7, 2, 8, 3], "rotation": 270, "texture": "#5"}, - "west": {"uv": [2, 4, 3, 12], "rotation": 270, "texture": "#5"}, - "up": {"uv": [4, 2, 12, 3], "rotation": 270, "texture": "#5"}, - "down": {"uv": [4, 2, 12, 3], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "valve_case", - "from": [-1, 11, 4], - "to": [0, 12, 12], - "faces": { - "north": {"uv": [8, 2, 9, 3], "rotation": 90, "texture": "#5"}, - "south": {"uv": [7, 2, 8, 3], "rotation": 270, "texture": "#5"}, - "west": {"uv": [2, 4, 3, 12], "rotation": 270, "texture": "#5"}, - "up": {"uv": [4, 2, 12, 3], "rotation": 270, "texture": "#5"}, - "down": {"uv": [4, 2, 12, 3], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "valve_case", - "from": [-1, 5, 4], - "to": [0, 11, 5], - "faces": { - "north": {"uv": [6, 2, 12, 3], "rotation": 90, "texture": "#5"}, - "south": {"uv": [5, 2, 11, 3], "rotation": 270, "texture": "#5"}, - "west": {"uv": [5, 2, 11, 3], "rotation": 270, "texture": "#5"}, - "up": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#5"}, - "down": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "valve_case", - "from": [-1, 5, 11], - "to": [0, 11, 12], - "faces": { - "north": {"uv": [6, 2, 12, 3], "rotation": 90, "texture": "#5"}, - "south": {"uv": [5, 2, 11, 3], "rotation": 270, "texture": "#5"}, - "west": {"uv": [5, 2, 11, 3], "rotation": 270, "texture": "#5"}, - "up": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#5"}, - "down": {"uv": [2, 4, 3, 5], "rotation": 270, "texture": "#5"} - } - }, - { - "name": "opening", - "from": [-0.5, 5, 5], - "to": [0.5, 11, 11], - "faces": { - "west": {"uv": [6, 0, 12, 6], "rotation": 270, "texture": "#3"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/cuckoo_clock/block.json b/src/main/resources/assets/create/models/block/cuckoo_clock/block.json new file mode 100644 index 000000000..e748a2587 --- /dev/null +++ b/src/main/resources/assets/create/models/block/cuckoo_clock/block.json @@ -0,0 +1,159 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "block/stripped_oak_log", + "2": "block/spruce_log", + "3": "create:block/cuckoo_clock", + "4": "block/spruce_log_top", + "particle": "block/stripped_spruce_log" + }, + "elements": [ + { + "name": "Base", + "from": [1, 0, 1], + "to": [15, 2, 15], + "faces": { + "north": {"uv": [0, 0, 14, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 14, 2], "texture": "#2"}, + "south": {"uv": [0, 0, 14, 2], "texture": "#2"}, + "west": {"uv": [0, 0, 14, 2], "texture": "#2"}, + "up": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#4"}, + "down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#2"} + } + }, + { + "name": "LowerBody", + "from": [3, 2, 2], + "to": [13, 6, 14], + "faces": { + "north": {"uv": [11, 5, 16, 7], "texture": "#3"}, + "east": {"uv": [0, 3, 6, 5], "texture": "#3"}, + "south": {"uv": [11, 3, 16, 5], "texture": "#3"}, + "west": {"uv": [0, 3, 6, 5], "texture": "#3"} + } + }, + { + "name": "MidBody", + "from": [2, 6, 2], + "to": [14, 12, 14], + "faces": { + "north": {"uv": [10, 0, 16, 3], "texture": "#3"}, + "east": {"uv": [0, 5, 6, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 6, 3], "texture": "#3"}, + "west": {"uv": [0, 5, 6, 8], "texture": "#3"}, + "down": {"uv": [0, 10, 6, 16], "rotation": 270, "texture": "#3"} + } + }, + { + "name": "UpperMidBody", + "from": [3, 12, 2], + "to": [13, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, + "faces": { + "north": {"uv": [6, 4, 11, 5], "texture": "#3"}, + "south": {"uv": [0, 9, 5, 10], "texture": "#3"} + } + }, + { + "name": "TopBody", + "from": [5, 14, 2], + "to": [11, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, + "faces": { + "north": {"uv": [7, 3, 10, 4], "texture": "#3"}, + "south": {"uv": [1, 8, 4, 9], "texture": "#3"} + } + }, + { + "name": "RoofLeft", + "from": [13, 10, 1], + "to": [15, 20, 15], + "rotation": {"angle": 45, "axis": "z", "origin": [14, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 10], "texture": "#1"}, + "east": {"uv": [0, 0, 14, 10], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 10], "texture": "#1"}, + "west": {"uv": [0, 0, 14, 10], "texture": "#1"}, + "up": {"uv": [0, 0, 14, 2], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 14, 2], "rotation": 270, "texture": "#1"} + } + }, + { + "name": "RoofRight", + "from": [1, 10, 1], + "to": [3, 20, 15], + "rotation": {"angle": -45, "axis": "z", "origin": [2, 12, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 10], "texture": "#1"}, + "east": {"uv": [0, 0, 14, 10], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 10], "texture": "#1"}, + "west": {"uv": [0, 0, 14, 10], "texture": "#1"}, + "up": {"uv": [0, 0, 14, 2], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 14, 2], "rotation": 270, "texture": "#1"} + } + }, + { + "name": "RoofCenter", + "from": [7, 16, 0.75], + "to": [9, 19, 15.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 3], "texture": "#2"}, + "east": {"uv": [0, 0, 14.5, 3], "texture": "#2"}, + "south": {"uv": [0, 0, 2, 3], "texture": "#2"}, + "west": {"uv": [0, 0, 14.5, 3], "texture": "#2"}, + "up": {"uv": [0, 0, 14.5, 2], "rotation": 90, "texture": "#2"}, + "down": {"uv": [0, 0, 14.5, 2], "rotation": 270, "texture": "#2"} + } + }, + { + "name": "Clock", + "from": [4.5, 2.5, 1.75], + "to": [11.5, 9.5, 1.75], + "faces": { + "north": {"uv": [6, 5, 9.5, 8.5], "texture": "#3"} + } + }, + { + "name": "ClockCenter", + "from": [7.475, 5.475, 1.45], + "to": [8.525, 6.525, 2.3], + "faces": { + "north": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, + "east": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, + "south": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, + "west": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, + "up": {"uv": [9, 9.5, 9.5, 10], "rotation": 90, "texture": "#3"}, + "down": {"uv": [9, 9.5, 9.5, 10], "rotation": 270, "texture": "#3"} + } + } + ], + "groups": [ + { + "name": "shaft_half", + "origin": [8, 8, 8], + "children": [] + }, + { + "name": "Creeper", + "origin": [6, 17, 12], + "children": [] + }, + { + "name": "Door", + "origin": [8, 8, 8], + "children": [] + }, + { + "name": "MovingClock", + "origin": [2, 6, 8], + "children": [] + }, + { + "name": "CuckooClock", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/cuckoo_clock/casing.json b/src/main/resources/assets/create/models/block/cuckoo_clock/casing.json deleted file mode 100644 index 0e054ed81..000000000 --- a/src/main/resources/assets/create/models/block/cuckoo_clock/casing.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "block/stripped_oak_log", - "2": "block/spruce_log", - "3": "create:block/cuckoo_clock", - "4": "block/spruce_log_top", - "particle": "block/stripped_spruce_log" - }, - "elements": [ - { - "name": "Base", - "from": [1, 0, 1], - "to": [15, 2, 15], - "faces": { - "north": {"uv": [0, 0, 14, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 14, 2], "texture": "#2"}, - "south": {"uv": [0, 0, 14, 2], "texture": "#2"}, - "west": {"uv": [0, 0, 14, 2], "texture": "#2"}, - "up": {"uv": [1, 1, 15, 15], "texture": "#4"}, - "down": {"uv": [0, 0, 14, 14], "texture": "#2"} - } - }, - { - "name": "LowerBody", - "from": [2, 2, 3], - "to": [14, 6, 13], - "faces": { - "north": {"uv": [0, 3, 6, 5], "texture": "#3"}, - "east": {"uv": [11, 3, 16, 5], "texture": "#3"}, - "south": {"uv": [0, 3, 6, 5], "texture": "#3"}, - "west": {"uv": [11, 5, 16, 7], "texture": "#3"} - } - }, - { - "name": "MidBody", - "from": [2, 6, 2], - "to": [14, 12, 14], - "faces": { - "north": {"uv": [0, 5, 6, 8], "texture": "#3"}, - "east": {"uv": [0, 0, 6, 3], "texture": "#3"}, - "south": {"uv": [0, 5, 6, 8], "texture": "#3"}, - "west": {"uv": [10, 0, 16, 3], "texture": "#3"}, - "down": {"uv": [0, 10, 6, 16], "texture": "#3"} - } - }, - { - "name": "UpperMidBody", - "from": [2, 12, 3], - "to": [14, 14, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, - "faces": { - "east": {"uv": [0, 9, 5, 10], "texture": "#3"}, - "west": {"uv": [6, 4, 11, 5], "texture": "#3"} - } - }, - { - "name": "TopBody", - "from": [2, 14, 5], - "to": [14, 16, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, - "faces": { - "east": {"uv": [1, 8, 4, 9], "texture": "#3"}, - "west": {"uv": [7, 3, 10, 4], "texture": "#3"} - } - }, - { - "name": "RoofLeft", - "from": [1, 10, 1], - "to": [15, 20, 3], - "rotation": {"angle": 45, "axis": "x", "origin": [8, 12, 2]}, - "faces": { - "north": {"uv": [0, 0, 14, 10], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#1"}, - "south": {"uv": [0, 0, 14, 10], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#1"}, - "up": {"uv": [0, 0, 14, 2], "texture": "#1"}, - "down": {"uv": [0, 0, 14, 2], "texture": "#1"} - } - }, - { - "name": "RoofRight", - "from": [1, 10, 13], - "to": [15, 20, 15], - "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 14]}, - "faces": { - "north": {"uv": [0, 0, 14, 10], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 10], "texture": "#1"}, - "south": {"uv": [0, 0, 14, 10], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 10], "texture": "#1"}, - "up": {"uv": [0, 0, 14, 2], "texture": "#1"}, - "down": {"uv": [0, 0, 14, 2], "texture": "#1"} - } - }, - { - "name": "RoofCenter", - "from": [0.75, 16, 7], - "to": [15.25, 19, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 8]}, - "faces": { - "north": {"uv": [0, 0, 14.5, 3], "texture": "#2"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#2"}, - "south": {"uv": [0, 0, 14.5, 3], "texture": "#2"}, - "west": {"uv": [0, 0, 2, 3], "texture": "#2"}, - "up": {"uv": [0, 0, 14.5, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 14.5, 2], "texture": "#2"} - } - }, - { - "name": "Clock", - "from": [1.75, 2.5, 4.5], - "to": [1.75, 9.5, 11.5], - "faces": { - "west": {"uv": [6, 5, 9.5, 8.5], "texture": "#3"} - } - }, - { - "name": "ClockCenter", - "from": [1.45, 5.475, 7.475], - "to": [2.3, 6.525, 8.525], - "faces": { - "north": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, - "east": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, - "south": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, - "west": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, - "up": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"}, - "down": {"uv": [9, 9.5, 9.5, 10], "texture": "#3"} - } - } - ], - "groups": [ - { - "name": "shaft_half", - "origin": [8, 8, 8], - "children": [] - }, - { - "name": "Creeper", - "origin": [6, 17, 12], - "children": [] - }, - { - "name": "Door", - "origin": [8, 8, 8], - "children": [] - }, - { - "name": "MovingClock", - "origin": [2, 6, 8], - "children": [] - }, - { - "name": "CuckooClock", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/drill/block.json b/src/main/resources/assets/create/models/block/drill/block.json new file mode 100644 index 000000000..3a4cf2dec --- /dev/null +++ b/src/main/resources/assets/create/models/block/drill/block.json @@ -0,0 +1,77 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "10": "create:block/andesite_casing_very_short", + "gearbox_top": "create:block/gearbox_top", + "particle": "create:block/gearbox", + "gearbox": "create:block/gearbox", + "andesite_casing_short": "create:block/andesite_casing_short" + }, + "elements": [ + { + "name": "Body", + "from": [2, 1, 2], + "to": [14, 9, 14], + "faces": { + "up": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, + "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#gearbox"} + } + }, + { + "name": "Bottom", + "from": [0, 0, 14], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [0, 4, 16, 16], "rotation": 180, "texture": "#andesite_casing_short"}, + "east": {"uv": [14, 6, 16, 16], "rotation": 180, "texture": "#10"}, + "south": {"uv": [0, 6, 16, 16], "texture": "#10"}, + "west": {"uv": [14, 6, 16, 16], "texture": "#10"}, + "up": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, + "down": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#gearbox_top"} + } + }, + { + "name": "Top", + "from": [0, 0, 0], + "to": [16, 10, 2], + "faces": { + "north": {"uv": [0, 6, 16, 16], "rotation": 180, "texture": "#10"}, + "east": {"uv": [0, 6, 2, 16], "rotation": 180, "texture": "#10"}, + "south": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, + "west": {"uv": [0, 6, 2, 16], "texture": "#10"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, + "down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#gearbox_top"} + } + }, + { + "name": "Side", + "from": [0, 0, 2], + "to": [2, 10, 14], + "faces": { + "east": {"uv": [2, 4, 14, 16], "rotation": 180, "texture": "#andesite_casing_short"}, + "west": {"uv": [2, 6, 14, 16], "texture": "#10"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, + "down": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#gearbox_top"} + } + }, + { + "name": "Side", + "from": [14, 0, 2], + "to": [16, 10, 14], + "faces": { + "east": {"uv": [2, 6, 14, 16], "rotation": 180, "texture": "#10"}, + "west": {"uv": [2, 4, 14, 16], "rotation": 180, "texture": "#andesite_casing_short"}, + "up": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, + "down": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#gearbox_top"} + } + } + ], + "groups": [ + { + "name": "casing", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/drill.json b/src/main/resources/assets/create/models/block/drill/head.json similarity index 100% rename from src/main/resources/assets/create/models/block/drill.json rename to src/main/resources/assets/create/models/block/drill/head.json diff --git a/src/main/resources/assets/create/models/item/drill.json b/src/main/resources/assets/create/models/block/drill/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/drill.json rename to src/main/resources/assets/create/models/block/drill/item.json diff --git a/src/main/resources/assets/create/models/block/drill_base.json b/src/main/resources/assets/create/models/block/drill_base.json deleted file mode 100644 index 5d425f7ab..000000000 --- a/src/main/resources/assets/create/models/block/drill_base.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "10": "create:block/andesite_casing_very_short", - "particle": "block/anvil", - "gearbox_top": "create:block/gearbox_top", - "gearbox": "create:block/gearbox", - "andesite_casing_short": "create:block/andesite_casing_short" - }, - "elements": [ - { - "name": "Body", - "from": [2, 2, 1], - "to": [14, 14, 9], - "faces": { - "north": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, - "south": {"uv": [2, 2, 14, 14], "texture": "#gearbox"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 2, 10], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, - "east": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, - "west": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, - "down": {"uv": [0, 6, 16, 16], "texture": "#10"} - } - }, - { - "name": "Top", - "from": [0, 14, 0], - "to": [16, 16, 10], - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, - "east": {"uv": [0, 6, 2, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, - "west": {"uv": [0, 6, 2, 16], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 6, 16, 16], "texture": "#10"}, - "down": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"} - } - }, - { - "name": "Side", - "from": [0, 2, 0], - "to": [2, 14, 10], - "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, - "east": {"uv": [2, 4, 14, 16], "rotation": 90, "texture": "#andesite_casing_short"}, - "south": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, - "west": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"} - } - }, - { - "name": "Side", - "from": [14, 2, 0], - "to": [16, 14, 10], - "faces": { - "north": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, - "east": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, - "west": {"uv": [2, 4, 14, 16], "rotation": 270, "texture": "#andesite_casing_short"} - } - } - ], - "display": {}, - "groups": [ - { - "name": "casing", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_fan.json b/src/main/resources/assets/create/models/block/encased_fan.json deleted file mode 100644 index 5df575ec1..000000000 --- a/src/main/resources/assets/create/models/block/encased_fan.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:block/fan_side", - "fan_casing": "create:block/fan_casing", - "fan_side": "create:block/fan_side" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#fan_casing", "uv": [ 0, 14, 16, 16 ] }, - "east": { "texture": "#fan_side", "uv": [ 14, 0, 16, 16 ], "rotation": 90 }, - "south": { "texture": "#fan_casing", "uv": [ 0, 14, 16, 16 ] }, - "west": { "texture": "#fan_side", "uv": [ 14, 0, 16, 16 ], "rotation": 90 }, - "up": { "texture": "#fan_side", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#fan_side", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Top", - "from": [ 0, 14, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "north": { "texture": "#fan_casing", "uv": [ 0, 0, 16, 2 ] }, - "east": { "texture": "#fan_side", "uv": [ 0, 0, 2, 16 ], "rotation": 90 }, - "south": { "texture": "#fan_casing", "uv": [ 0, 0, 16, 2 ] }, - "west": { "texture": "#fan_side", "uv": [ 14, 0, 16, 16 ], "rotation": 270 }, - "up": { "texture": "#fan_side", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#fan_side", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Side", - "from": [ 0, 2, 0 ], - "to": [ 2, 14, 16 ], - "faces": { - "north": { "texture": "#fan_casing", "uv": [ 14, 2, 16, 14 ] }, - "east": { "texture": "#fan_side", "uv": [ 2, 0, 14, 16 ], "rotation": 90 }, - "south": { "texture": "#fan_casing", "uv": [ 0, 2, 2, 14 ] }, - "west": { "texture": "#fan_side", "uv": [ 14, 0, 2, 16 ], "rotation": 270 } - } - }, - { - "name": "Side", - "from": [ 14, 2, 0 ], - "to": [ 16, 14, 16 ], - "faces": { - "north": { "texture": "#fan_casing", "uv": [ 0, 2, 2, 14 ] }, - "east": { "texture": "#fan_side", "uv": [ 2, 0, 14, 16 ], "rotation": 270 }, - "south": { "texture": "#fan_casing", "uv": [ 14, 2, 16, 14 ] }, - "west": { "texture": "#fan_side", "uv": [ 14, 0, 2, 16 ], "rotation": 270 } - } - }, - { - "name": "Lattice", - "from": [ 2, 2, 1 ], - "to": [ 14, 14, 1 ], - "faces": { - "north": { "texture": "#fan_casing", "uv": [ 2, 2, 14, 14 ] }, - "south": { "texture": "#fan_casing", "uv": [ 2, 2, 14, 14 ] } - } - }, - { - "name": "Lattice", - "from": [ 2, 2, 15 ], - "to": [ 14, 14, 15 ], - "faces": { - "north": { "texture": "#fan_casing", "uv": [ 2, 2, 14, 14 ] }, - "south": { "texture": "#fan_casing", "uv": [ 2, 2, 14, 14 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/encased_fan_inner.json b/src/main/resources/assets/create/models/block/encased_fan_inner.json deleted file mode 100644 index 33f4dbbd8..000000000 --- a/src/main/resources/assets/create/models/block/encased_fan_inner.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "particle": "create:block/fan_side", - "axis_top": "create:block/axis_top", - "fan_blades": "create:block/fan_blades", - "axis": "create:block/axis" - }, - "elements": [ - { - "name": "Shaft", - "from": [ 6, 6, 0 ], - "to": [ 10, 10, 16 ], - "faces": { - "north": { "texture": "#axis_top", "uv": [ 6, 6, 10, 10 ] }, - "east": { "texture": "#axis", "uv": [ 6, 0, 10, 16 ], "rotation": 90 }, - "south": { "texture": "#axis_top", "uv": [ 6, 6, 10, 10 ] }, - "west": { "texture": "#axis", "uv": [ 6, 0, 10, 16 ], "rotation": 270 }, - "up": { "texture": "#axis", "uv": [ 6, 0, 10, 16 ] }, - "down": { "texture": "#axis", "uv": [ 6, 0, 10, 16 ] } - } - }, - { - "name": "Fan", - "from": [ 1, 1, 4 ], - "to": [ 15, 15, 12 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "#fan_blades", "uv": [ 1, 1, 15, 15 ] }, - "south": { "texture": "#fan_blades", "uv": [ 1, 1, 15, 15 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/flywheel/casing_no_connection.json b/src/main/resources/assets/create/models/block/flywheel/casing_none.json similarity index 100% rename from src/main/resources/assets/create/models/block/flywheel/casing_no_connection.json rename to src/main/resources/assets/create/models/block/flywheel/casing_none.json diff --git a/src/main/resources/assets/create/models/block/furnace_engine/block.json b/src/main/resources/assets/create/models/block/furnace_engine/block.json new file mode 100644 index 000000000..dde47cc73 --- /dev/null +++ b/src/main/resources/assets/create/models/block/furnace_engine/block.json @@ -0,0 +1,133 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "5": "create:block/brass_casing", + "1_1": "create:block/furnace_cylinder", + "particle": "create:block/brass_block" + }, + "elements": [ + { + "name": "Ring", + "from": [0, 0, 2], + "to": [16, 16, 7], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "east": {"uv": [0, 7, 2.5, 15], "texture": "#1_1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "west": {"uv": [0, 7, 2.5, 15], "texture": "#1_1"}, + "up": {"uv": [0, 7, 2.5, 15], "rotation": 90, "texture": "#1_1"}, + "down": {"uv": [0, 7, 2.5, 15], "rotation": 270, "texture": "#1_1"} + } + }, + { + "name": "Cylinder", + "from": [1, 1, 0], + "to": [15, 15, 16], + "faces": { + "north": {"uv": [8, 0, 15, 7], "texture": "#1_1"}, + "east": {"uv": [0, 0, 8, 7], "rotation": 180, "texture": "#1_1"}, + "south": {"uv": [8, 0, 15, 7], "texture": "#1_1"}, + "west": {"uv": [0, 0, 8, 7], "texture": "#1_1"}, + "up": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#1_1"}, + "down": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#1_1"} + } + }, + { + "from": [1.5, 0, 7], + "to": [5.5, 4, 16], + "faces": { + "east": {"uv": [2.5, 7, 7, 9], "rotation": 180, "texture": "#1_1"}, + "west": {"uv": [2.5, 7, 7, 9], "rotation": 180, "texture": "#1_1"}, + "up": {"uv": [2.5, 7, 7, 9], "rotation": 270, "texture": "#1_1"}, + "down": {"uv": [2.5, 7, 7, 9], "rotation": 90, "texture": "#1_1"} + } + }, + { + "from": [10.5, 0, 7], + "to": [14.5, 4, 16], + "faces": { + "east": {"uv": [7, 7, 2.5, 9], "rotation": 180, "texture": "#1_1"}, + "west": {"uv": [7, 7, 2.5, 9], "rotation": 180, "texture": "#1_1"}, + "up": {"uv": [2.5, 9, 7, 7], "rotation": 270, "texture": "#1_1"}, + "down": {"uv": [2.5, 9, 7, 7], "rotation": 90, "texture": "#1_1"} + } + }, + { + "name": "LowerPort", + "from": [1.5, 0.1, -0.9], + "to": [5.5, 4.1, 2.1], + "faces": { + "north": {"uv": [2.5, 13, 4.5, 15], "texture": "#1_1"}, + "east": {"uv": [3, 13, 4.5, 15], "texture": "#1_1"}, + "south": {"uv": [10, 0, 14, 4], "texture": "#1_1"}, + "west": {"uv": [3, 13, 4.5, 15], "rotation": 180, "texture": "#1_1"}, + "up": {"uv": [3, 13, 4.5, 15], "rotation": 270, "texture": "#1_1"}, + "down": {"uv": [3, 13, 4.5, 15], "rotation": 90, "texture": "#1_1"} + } + }, + { + "name": "LowerPort", + "from": [10.5, 0.1, -0.9], + "to": [14.5, 4.1, 2.1], + "faces": { + "north": {"uv": [4.5, 13, 2.5, 15], "texture": "#1_1"}, + "east": {"uv": [4.5, 13, 3, 15], "rotation": 180, "texture": "#1_1"}, + "south": {"uv": [14, 0, 10, 4], "texture": "#1_1"}, + "west": {"uv": [4.5, 13, 3, 15], "texture": "#1_1"}, + "up": {"uv": [3, 15, 4.5, 13], "rotation": 270, "texture": "#1_1"}, + "down": {"uv": [3, 15, 4.5, 13], "rotation": 90, "texture": "#1_1"} + } + }, + { + "name": "Port", + "from": [4, 4, -1.8], + "to": [12, 12, 0.2], + "faces": { + "north": {"uv": [2.5, 9, 6.5, 13], "texture": "#1_1"}, + "east": {"uv": [5.5, 9, 6.5, 13], "texture": "#1_1"}, + "west": {"uv": [5.5, 9, 6.5, 13], "rotation": 180, "texture": "#1_1"}, + "up": {"uv": [5.5, 9, 6.5, 13], "rotation": 270, "texture": "#1_1"}, + "down": {"uv": [5.5, 9, 6.5, 13], "rotation": 90, "texture": "#1_1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 135, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 135, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "rotation": [0, 180, 0], + "scale": [0.5, 0.5, 0.5] + } + }, + "groups": [ + { + "name": "SteamCylinder", + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4, 5, 6] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/furnace_engine/body.json b/src/main/resources/assets/create/models/block/furnace_engine/body.json deleted file mode 100644 index d421a627f..000000000 --- a/src/main/resources/assets/create/models/block/furnace_engine/body.json +++ /dev/null @@ -1,133 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "5": "create:block/brass_casing", - "particle": "create:block/brass_block", - "1_1": "create:block/furnace_cylinder" - }, - "elements": [ - { - "name": "Ring", - "from": [0, 0, 9], - "to": [16, 16, 14], - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#5"}, - "east": {"uv": [0, 7, 2.5, 15], "texture": "#1_1"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#5"}, - "west": {"uv": [0, 7, 2.5, 15], "texture": "#1_1"}, - "up": {"uv": [0, 7, 2.5, 15], "rotation": 270, "texture": "#1_1"}, - "down": {"uv": [0, 7, 2.5, 15], "rotation": 90, "texture": "#1_1"} - } - }, - { - "name": "Cylinder", - "from": [1, 1, 0], - "to": [15, 15, 16], - "faces": { - "north": {"uv": [8, 0, 15, 7], "texture": "#1_1"}, - "east": {"uv": [0, 0, 8, 7], "texture": "#1_1"}, - "south": {"uv": [8, 0, 15, 7], "texture": "#1_1"}, - "west": {"uv": [0, 0, 8, 7], "rotation": 180, "texture": "#1_1"}, - "up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#1_1"}, - "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#1_1"} - } - }, - { - "from": [10.5, 0, 0], - "to": [14.5, 4, 9], - "faces": { - "east": {"uv": [2.5, 7, 7, 9], "rotation": 180, "texture": "#1_1"}, - "west": {"uv": [2.5, 7, 7, 9], "rotation": 180, "texture": "#1_1"}, - "up": {"uv": [2.5, 7, 7, 9], "rotation": 90, "texture": "#1_1"}, - "down": {"uv": [2.5, 7, 7, 9], "rotation": 270, "texture": "#1_1"} - } - }, - { - "from": [1.5, 0, 0], - "to": [5.5, 4, 9], - "faces": { - "east": {"uv": [7, 7, 2.5, 9], "rotation": 180, "texture": "#1_1"}, - "west": {"uv": [7, 7, 2.5, 9], "rotation": 180, "texture": "#1_1"}, - "up": {"uv": [2.5, 9, 7, 7], "rotation": 90, "texture": "#1_1"}, - "down": {"uv": [2.5, 9, 7, 7], "rotation": 270, "texture": "#1_1"} - } - }, - { - "name": "LowerPort", - "from": [10.5, 0.1, 13.9], - "to": [14.5, 4.1, 16.9], - "faces": { - "north": {"uv": [10, 0, 14, 4], "texture": "#1_1"}, - "east": {"uv": [3, 13, 4.5, 15], "rotation": 180, "texture": "#1_1"}, - "south": {"uv": [2.5, 13, 4.5, 15], "texture": "#1_1"}, - "west": {"uv": [3, 13, 4.5, 15], "texture": "#1_1"}, - "up": {"uv": [3, 13, 4.5, 15], "rotation": 90, "texture": "#1_1"}, - "down": {"uv": [3, 13, 4.5, 15], "rotation": 270, "texture": "#1_1"} - } - }, - { - "name": "LowerPort", - "from": [1.5, 0.1, 13.9], - "to": [5.5, 4.1, 16.9], - "faces": { - "north": {"uv": [14, 0, 10, 4], "texture": "#1_1"}, - "east": {"uv": [4.5, 13, 3, 15], "texture": "#1_1"}, - "south": {"uv": [4.5, 13, 2.5, 15], "texture": "#1_1"}, - "west": {"uv": [4.5, 13, 3, 15], "rotation": 180, "texture": "#1_1"}, - "up": {"uv": [3, 15, 4.5, 13], "rotation": 90, "texture": "#1_1"}, - "down": {"uv": [3, 15, 4.5, 13], "rotation": 270, "texture": "#1_1"} - } - }, - { - "name": "Port", - "from": [4, 4, 15.8], - "to": [12, 12, 17.8], - "faces": { - "east": {"uv": [5.5, 9, 6.5, 13], "rotation": 180, "texture": "#1_1"}, - "south": {"uv": [2.5, 9, 6.5, 13], "texture": "#1_1"}, - "west": {"uv": [5.5, 9, 6.5, 13], "texture": "#1_1"}, - "up": {"uv": [5.5, 9, 6.5, 13], "rotation": 90, "texture": "#1_1"}, - "down": {"uv": [5.5, 9, 6.5, 13], "rotation": 270, "texture": "#1_1"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 135, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 135, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 45, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [0, 180, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "SteamCylinder", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/furnace_engine/item.json b/src/main/resources/assets/create/models/block/furnace_engine/item.json index 22110a645..ac8647000 100644 --- a/src/main/resources/assets/create/models/block/furnace_engine/item.json +++ b/src/main/resources/assets/create/models/block/furnace_engine/item.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "textures": { "5": "create:block/brass_casing", - "particle": "create:block/steam_engine_wheel", + "particle": "create:block/brass_block", "1_1": "create:block/furnace_cylinder" }, "elements": [ diff --git a/src/main/resources/assets/create/models/block/gauge/speed.json b/src/main/resources/assets/create/models/block/gauge/speedometer/head.json similarity index 100% rename from src/main/resources/assets/create/models/block/gauge/speed.json rename to src/main/resources/assets/create/models/block/gauge/speedometer/head.json diff --git a/src/main/resources/assets/create/models/block/gauge/item_speed.json b/src/main/resources/assets/create/models/block/gauge/speedometer/item.json similarity index 100% rename from src/main/resources/assets/create/models/block/gauge/item_speed.json rename to src/main/resources/assets/create/models/block/gauge/speedometer/item.json diff --git a/src/main/resources/assets/create/models/block/gauge/stress.json b/src/main/resources/assets/create/models/block/gauge/stressometer/head.json similarity index 100% rename from src/main/resources/assets/create/models/block/gauge/stress.json rename to src/main/resources/assets/create/models/block/gauge/stressometer/head.json diff --git a/src/main/resources/assets/create/models/block/gauge/item_stress.json b/src/main/resources/assets/create/models/block/gauge/stressometer/item.json similarity index 100% rename from src/main/resources/assets/create/models/block/gauge/item_stress.json rename to src/main/resources/assets/create/models/block/gauge/stressometer/item.json diff --git a/src/main/resources/assets/create/models/block/harvester.json b/src/main/resources/assets/create/models/block/harvester.json deleted file mode 100644 index 8eae4a571..000000000 --- a/src/main/resources/assets/create/models/block/harvester.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "harvester": "create:block/harvester", - "anvil": "minecraft:block/anvil", - "andesite_casing_short": "create:block/andesite_casing_short", - "particle": "create:block/andesite_casing_short" - }, - "elements": [ - { - "name": "Core", - "from": [ 0, 2, 0 ], - "to": [ 16, 14, 2.9 ], - "faces": { - "north": { "texture": "#andesite_casing_short", "uv": [ 0, 4, 16, 16 ] }, - "east": { "texture": "#andesite_casing_short", "uv": [ 2, 0, 14, 3 ], "rotation": 270 }, - "south": { "texture": "#andesite_casing_short", "uv": [ 0, 4, 16, 16 ] }, - "west": { "texture": "#andesite_casing_short", "uv": [ 2, 0, 14, 3 ], "rotation": 90 }, - "up": { "texture": "#andesite_casing_short", "uv": [ 0, 0, 16, 2.9 ], "rotation": 180 }, - "down": { "texture": "#andesite_casing_short", "uv": [ 0, 0, 16, 2.9 ] } - } - }, - { - "name": "Attachment", - "from": [ 0.1, 7, 3 ], - "to": [ 2, 10, 11 ], - "rotation": { "origin": [ 0, 10, 3 ], "axis": "x", "angle": 22.5 }, - "faces": { - "north": { "texture": "#andesite_casing_short", "uv": [ 0, 0, 1.9, 3 ] }, - "east": { "texture": "#andesite_casing_short", "uv": [ 0, 0, 8, 3 ] }, - "south": { "texture": "#andesite_casing_short", "uv": [ 0.1, 8, 2, 11 ] }, - "west": { "texture": "#andesite_casing_short", "uv": [ 0, 0, 8, 3 ] }, - "up": { "texture": "#andesite_casing_short", "uv": [ 0.1, 6, 2, 14 ] }, - "down": { "texture": "#andesite_casing_short", "uv": [ 0.1, 6, 2, 14 ] } - } - }, - { - "name": "Attachment", - "from": [ 14, 7, 3 ], - "to": [ 15.9, 10, 11 ], - "rotation": { "origin": [ 0, 10, 3 ], "axis": "x", "angle": 22.5 }, - "faces": { - "north": { "texture": "#andesite_casing_short", "uv": [ 0, 0, 1.9, 3 ] }, - "east": { "texture": "#andesite_casing_short", "uv": [ 0, 0, 8, 3 ] }, - "south": { "texture": "#andesite_casing_short", "uv": [ 14, 8, 15.9, 11 ] }, - "west": { "texture": "#andesite_casing_short", "uv": [ 0, 0, 8, 3 ] }, - "up": { "texture": "#andesite_casing_short", "uv": [ 14, 6, 15.9, 14 ] }, - "down": { "texture": "#andesite_casing_short", "uv": [ 14, 6, 15.9, 14 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/harvester_blade.json b/src/main/resources/assets/create/models/block/harvester/blade.json similarity index 100% rename from src/main/resources/assets/create/models/block/harvester_blade.json rename to src/main/resources/assets/create/models/block/harvester/blade.json diff --git a/src/main/resources/assets/create/models/block/harvester/block.json b/src/main/resources/assets/create/models/block/harvester/block.json new file mode 100644 index 000000000..46c82eece --- /dev/null +++ b/src/main/resources/assets/create/models/block/harvester/block.json @@ -0,0 +1,50 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "create:block/andesite_casing_short", + "andesite_casing_short": "create:block/andesite_casing_short" + }, + "elements": [ + { + "name": "Core", + "from": [0, 2, 13.1], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, + "east": {"uv": [2, 0, 14, 3], "rotation": 90, "texture": "#andesite_casing_short"}, + "south": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, + "west": {"uv": [2, 0, 14, 3], "rotation": 270, "texture": "#andesite_casing_short"}, + "up": {"uv": [0, 0, 16, 2.9], "texture": "#andesite_casing_short"}, + "down": {"uv": [0, 0, 16, 2.9], "rotation": 180, "texture": "#andesite_casing_short"} + } + }, + { + "name": "Attachment", + "from": [14, 7, 5], + "to": [15.9, 10, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 10, 13]}, + "faces": { + "north": {"uv": [0.1, 8, 2, 11], "texture": "#andesite_casing_short"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#andesite_casing_short"}, + "south": {"uv": [0, 0, 1.9, 3], "texture": "#andesite_casing_short"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#andesite_casing_short"}, + "up": {"uv": [0.1, 6, 2, 14], "rotation": 180, "texture": "#andesite_casing_short"}, + "down": {"uv": [0.1, 6, 2, 14], "rotation": 180, "texture": "#andesite_casing_short"} + } + }, + { + "name": "Attachment", + "from": [0.1, 7, 5], + "to": [2, 10, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 10, 13]}, + "faces": { + "north": {"uv": [14, 8, 15.9, 11], "texture": "#andesite_casing_short"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#andesite_casing_short"}, + "south": {"uv": [0, 0, 1.9, 3], "texture": "#andesite_casing_short"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#andesite_casing_short"}, + "up": {"uv": [14, 6, 15.9, 14], "rotation": 180, "texture": "#andesite_casing_short"}, + "down": {"uv": [14, 6, 15.9, 14], "rotation": 180, "texture": "#andesite_casing_short"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/harvester.json b/src/main/resources/assets/create/models/block/harvester/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/harvester.json rename to src/main/resources/assets/create/models/block/harvester/item.json diff --git a/src/main/resources/assets/create/models/block/large_wheels.json b/src/main/resources/assets/create/models/block/large_wheels.json index 3f1503bd0..1f4be8293 100644 --- a/src/main/resources/assets/create/models/block/large_wheels.json +++ b/src/main/resources/assets/create/models/block/large_wheels.json @@ -5,6 +5,11 @@ "rotation": [ 30, 225, 0 ], "translation": [ 0, 0, 0], "scale":[ 0.5, 0.5, 0.5 ] + }, + "fixed": { + "rotation": [ 90, 0, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_casing.json b/src/main/resources/assets/create/models/block/logistical_casing.json deleted file mode 100644 index 5ac07276b..000000000 --- a/src/main/resources/assets/create/models/block/logistical_casing.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:block/brass_casing_side", - "brass_casing_side": "create:block/brass_casing_side", - "brass_casing": "create:block/brass_casing" - }, - "elements": [ - { - "name": "Center", - "from": [ 1, 2, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 2, 1, 14, 15 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 2, 1, 14, 15 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 2, 1, 14, 15 ], "rotation": 90 }, - "west": { "texture": "#brass_casing_side", "uv": [ 2, 1, 14, 15 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 1, 1, 15, 15 ] }, - "down": { "texture": "#brass_casing", "uv": [ 1, 1, 15, 15 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ] }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ] }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ] }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ] }, - "up": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 14, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ] }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ] }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 16 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_casing_end.json b/src/main/resources/assets/create/models/block/logistical_casing_end.json deleted file mode 100644 index 891562165..000000000 --- a/src/main/resources/assets/create/models/block/logistical_casing_end.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:block/brass_casing_side", - "brass_casing_side": "create:block/brass_casing_side", - "brass_casing": "create:block/brass_casing" - }, - "elements": [ - { - "name": "Center", - "from": [ 1, 0, 1 ], - "to": [ 15, 14, 15 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 2, 1, 16, 15 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 2, 1, 16, 15 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 2, 1, 16, 15 ], "rotation": 90 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 1, 14, 15 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 1, 1, 15, 15 ] }, - "down": { "texture": "#brass_casing", "uv": [ 1, 1, 15, 15 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 0, 0 ], - "to": [ 2, 14, 2 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 2, 0, 16, 2 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 2, 0, 16, 2 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 2, 0, 16, 2 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 0, 0, 2, 2 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 14, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 14, 0, 0 ], - "to": [ 16, 14, 2 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 14, 0, 16, 2 ] }, - "down": { "texture": "#brass_casing", "uv": [ 14, 14, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 14, 0, 14 ], - "to": [ 16, 14, 16 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 14, 14, 16, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 14, 0, 16, 2 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 0, 14 ], - "to": [ 2, 14, 16 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 0, 14, 2, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 0, 2, 2 ] } - } - }, - { - "name": "Cube", - "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 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_casing_middle.json b/src/main/resources/assets/create/models/block/logistical_casing_middle.json deleted file mode 100644 index 89fcafe43..000000000 --- a/src/main/resources/assets/create/models/block/logistical_casing_middle.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:block/brass_casing_side", - "brass_casing_side": "create:block/brass_casing_side", - "brass_casing": "create:block/brass_casing" - }, - "elements": [ - { - "name": "Center", - "from": [ 1, 0, 1 ], - "to": [ 15, 16, 15 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 1, 16, 15 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 1, 16, 15 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 1, 16, 15 ], "rotation": 90 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 1, 16, 15 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 1, 1, 15, 15 ] }, - "down": { "texture": "#brass_casing", "uv": [ 1, 1, 15, 15 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 0, 0 ], - "to": [ 2, 16, 2 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 0, 0, 2, 2 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 14, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 14, 0, 0 ], - "to": [ 16, 16, 2 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 14, 0, 16, 2 ] }, - "down": { "texture": "#brass_casing", "uv": [ 14, 14, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 14, 0, 14 ], - "to": [ 16, 16, 16 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 14, 14, 16, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 14, 0, 16, 2 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 0, 14 ], - "to": [ 2, 16, 16 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 0, 16, 2 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 14, 16, 16 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 0, 14, 2, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 0, 2, 2 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_casing_start.json b/src/main/resources/assets/create/models/block/logistical_casing_start.json deleted file mode 100644 index 5a9f7e9c8..000000000 --- a/src/main/resources/assets/create/models/block/logistical_casing_start.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:block/brass_casing_side", - "brass_casing_side": "create:block/brass_casing_side", - "brass_casing": "create:block/brass_casing" - }, - "elements": [ - { - "name": "Center", - "from": [ 1, 2, 1 ], - "to": [ 15, 16, 15 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 1, 14, 15 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 1, 14, 15 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 1, 14, 15 ], "rotation": 90 }, - "west": { "texture": "#brass_casing_side", "uv": [ 2, 1, 16, 15 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 1, 1, 15, 15 ] }, - "down": { "texture": "#brass_casing", "uv": [ 1, 1, 15, 15 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 2, 0 ], - "to": [ 2, 16, 2 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 2, 0, 16, 2 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 2, 0, 16, 2 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 2, 0, 16, 2 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 0, 0, 2, 2 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 14, 2, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 14, 2, 0 ], - "to": [ 16, 16, 2 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 14, 0, 16, 2 ] }, - "down": { "texture": "#brass_casing", "uv": [ 14, 14, 16, 16 ] } - } - }, - { - "name": "Cube", - "from": [ 14, 2, 14 ], - "to": [ 16, 16, 16 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 14, 14, 16, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 14, 0, 16, 2 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 2, 14 ], - "to": [ 2, 16, 16 ], - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 90 }, - "east": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 90 }, - "south": { "texture": "#brass_casing_side", "uv": [ 0, 0, 14, 2 ], "rotation": 270 }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 14, 14, 16 ], "rotation": 270 }, - "up": { "texture": "#brass_casing", "uv": [ 0, 14, 2, 16 ] }, - "down": { "texture": "#brass_casing", "uv": [ 0, 0, 2, 2 ] } - } - }, - { - "name": "Cube", - "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 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_controller.json b/src/main/resources/assets/create/models/block/logistical_controller.json deleted file mode 100644 index 10bda8ea8..000000000 --- a/src/main/resources/assets/create/models/block/logistical_controller.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "particle": "create:block/logistical_controller", - "logistical_controller": "create:block/logistical_controller" - }, - "elements": [ - { - "name": "Body", - "from": [ 2, 2, -1 ], - "to": [ 14, 14, 3 ], - "faces": { - "north": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "east": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ] }, - "south": { "texture": "#logistical_controller", "uv": [ 0, 0, 12, 12 ] }, - "west": { "texture": "#logistical_controller", "uv": [ 12, 0, 16, 12 ], "rotation": 180 }, - "up": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ], "rotation": 180 }, - "down": { "texture": "#logistical_controller", "uv": [ 0, 12, 12, 16 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_controller_icon_calculation.json b/src/main/resources/assets/create/models/block/logistical_controller_icon_calculation.json deleted file mode 100644 index e05641b3c..000000000 --- a/src/main/resources/assets/create/models/block/logistical_controller_icon_calculation.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "logistical_controller": "create:block/logistical_controller", - "logistical_icons_1": "create:block/logistical_icons_1" - }, - "elements": [ - { - "name": "Indicator", - "from": [ 1.99, 3, 0 ], - "to": [ 14.01, 13, 2 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "tintindex": 0 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Icon", - "from": [ 5, 5, 2.5 ], - "to": [ 11, 11, 3.5 ], - "shade": false, - "faces": { - "south": { "texture": "#logistical_icons_1", "uv": [ 9, 2, 14, 7 ], "tintindex": 1 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_controller_icon_request.json b/src/main/resources/assets/create/models/block/logistical_controller_icon_request.json deleted file mode 100644 index bd2e4022c..000000000 --- a/src/main/resources/assets/create/models/block/logistical_controller_icon_request.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "logistical_controller": "create:block/logistical_controller", - "logistical_icons_1": "create:block/logistical_icons_1" - }, - "elements": [ - { - "name": "Indicator", - "from": [ 1.99, 3, 0 ], - "to": [ 14.01, 13, 2 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "tintindex": 0 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Icon", - "from": [ 5, 5, 2.5 ], - "to": [ 11, 11, 3.5 ], - "shade": false, - "faces": { - "south": { "texture": "#logistical_icons_1", "uv": [ 9, 9, 14, 14 ], "tintindex": 1 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_controller_icon_storage.json b/src/main/resources/assets/create/models/block/logistical_controller_icon_storage.json deleted file mode 100644 index 55257391f..000000000 --- a/src/main/resources/assets/create/models/block/logistical_controller_icon_storage.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "logistical_controller": "create:block/logistical_controller", - "logistical_icons_1": "create:block/logistical_icons_1" - }, - "elements": [ - { - "name": "Indicator", - "from": [ 1.99, 3, 0 ], - "to": [ 14.01, 13, 2 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "tintindex": 0 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Icon", - "from": [ 5, 5, 2.5 ], - "to": [ 11, 11, 3.5 ], - "shade": false, - "faces": { - "south": { "texture": "#logistical_icons_1", "uv": [ 2, 2, 7, 7 ], "tintindex": 1 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_controller_icon_supply.json b/src/main/resources/assets/create/models/block/logistical_controller_icon_supply.json deleted file mode 100644 index 82ff249cc..000000000 --- a/src/main/resources/assets/create/models/block/logistical_controller_icon_supply.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "logistical_controller": "create:block/logistical_controller", - "logistical_icons_1": "create:block/logistical_icons_1" - }, - "elements": [ - { - "name": "Indicator", - "from": [ 1.99, 3, 0 ], - "to": [ 14.01, 13, 2 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "tintindex": 0 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 1, 15, 11 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Icon", - "from": [ 5, 5, 2.5 ], - "to": [ 11, 11, 3.5 ], - "shade": false, - "faces": { - "south": { "texture": "#logistical_icons_1", "uv": [ 2, 9, 7, 14 ], "tintindex": 1 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_controller_icon_transactions.json b/src/main/resources/assets/create/models/block/logistical_controller_icon_transactions.json deleted file mode 100644 index 6db45a02b..000000000 --- a/src/main/resources/assets/create/models/block/logistical_controller_icon_transactions.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/logistical_controller_icon_storage", - "textures": { - "logistical_icons_1": "create:block/logistical_icons_2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logistical_index.json b/src/main/resources/assets/create/models/block/logistical_index.json deleted file mode 100644 index 2c3632661..000000000 --- a/src/main/resources/assets/create/models/block/logistical_index.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "redstone_antenna": "create:block/redstone_antenna_powered", - "logistical_index_side_overlay": "create:block/logistical_index_side_overlay", - "logistical_index_side": "create:block/logistical_index_side", - "particle": "create:block/logistical_index_side" - }, - "elements": [ - { - "name": "Inner", - "from": [ 3, 1, -1 ], - "to": [ 13, 15, 3 ], - "faces": { - "north": { "texture": "#logistical_index_side", "uv": [ 0, 0, 10, 14 ] }, - "east": { "texture": "#logistical_index_side", "uv": [ 10, 0, 14, 14 ] }, - "south": { "texture": "#logistical_index_side", "uv": [ 0, 0, 10, 14 ] }, - "west": { "texture": "#logistical_index_side", "uv": [ 10, 0, 14, 14 ], "rotation": 180 }, - "up": { "texture": "#logistical_index_side", "uv": [ 12, 2, 16, 12 ], "rotation": 270 }, - "down": { "texture": "#logistical_index_side", "uv": [ 12, 2, 16, 12 ], "rotation": 90 } - } - }, - { - "name": "Overlay", - "from": [ 2.99, 1, -1 ], - "to": [ 13.01, 15, 3.01 ], - "shade": false, - "faces": { - "east": { "texture": "#logistical_index_side_overlay", "uv": [ 10, 0, 14.01, 14 ], "tintindex": 0 }, - "south": { "texture": "#logistical_index_side_overlay", "uv": [ 0, 0, 10.02, 14 ], "tintindex": 0 }, - "west": { "texture": "#logistical_index_side_overlay", "uv": [ 10, 0, 14.01, 14 ], "rotation": 180, "tintindex": 0 } - } - }, - { - "name": "Antenna stick", - "from": [ 2, 11, 1 ], - "to": [ 3, 18, 2 ], - "faces": { - "north": { "texture": "#redstone_antenna", "uv": [ 11, 3, 12, 10 ] }, - "east": { "texture": "#redstone_antenna", "uv": [ 11, 3, 12, 10 ] }, - "south": { "texture": "#redstone_antenna", "uv": [ 11, 3, 12, 10 ] }, - "west": { "texture": "#redstone_antenna", "uv": [ 11, 3, 12, 10 ] }, - "down": { "texture": "#redstone_antenna", "uv": [ 11, 9, 12, 10 ] } - } - }, - { - "name": "Antenna Top", - "from": [ 1, 18, 1 ], - "to": [ 4, 21, 2 ], - "shade": false, - "faces": { - "north": { "texture": "#redstone_antenna", "uv": [ 10, 0, 13, 3 ], "tintindex": 0 }, - "south": { "texture": "#redstone_antenna", "uv": [ 10, 0, 13, 3 ], "tintindex": 0 } - } - }, - { - "name": "Antenna Top2", - "from": [ 2, 18, 0 ], - "to": [ 3, 21, 3 ], - "shade": false, - "faces": { - "east": { "texture": "#redstone_antenna", "uv": [ 10, 0, 13, 3 ], "tintindex": 0 }, - "west": { "texture": "#redstone_antenna", "uv": [ 10, 0, 13, 3 ], "tintindex": 0 } - } - }, - { - "name": "Antenna TopFace", - "from": [ 2, 19, 1 ], - "to": [ 3, 20, 2 ], - "shade": false, - "faces": { - "up": { "texture": "#redstone_antenna", "uv": [ 11, 1, 12, 2 ], "tintindex": 0 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logisticians_table.json b/src/main/resources/assets/create/models/block/logisticians_table.json deleted file mode 100644 index 6a8636b72..000000000 --- a/src/main/resources/assets/create/models/block/logisticians_table.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "parent": "block/block", - "textures": { - "particle": "create:block/brass_casing_side", - "smooth_stone_slab_side": "minecraft:block/smooth_stone_slab_side", - "brass_casing_side": "create:block/brass_casing_side", - "brass_casing": "create:block/brass_casing", - "spruce_log": "minecraft:block/spruce_log" - }, - "display": { - "gui": { - "rotation": [ 30, 45, 0 ], - "translation": [ 0, -1.5, 0], - "scale":[ 0.625, 0.625, 0.625 ] - } - }, - "elements": [ - { - "name": "Cube", - "from": [ 4, 0, 4 ], - "to": [ 12, 2, 12 ], - "faces": { - "north": { "texture": "#smooth_stone_slab_side", "uv": [ 3, 14, 11, 16 ] }, - "east": { "texture": "#smooth_stone_slab_side", "uv": [ 8, 0, 16, 2 ] }, - "south": { "texture": "#smooth_stone_slab_side", "uv": [ 3, 0, 11, 2 ] }, - "west": { "texture": "#smooth_stone_slab_side", "uv": [ 16, 0, 8, 2 ] }, - "up": { "texture": "#smooth_stone_slab_side", "uv": [ 4, 0, 12, 8 ], "rotation": 180 }, - "down": { "texture": "#smooth_stone_slab_side", "uv": [ 4, 0, 12, 8 ] } - } - }, - { - "name": "Cube", - "from": [ 5, 2, 5 ], - "to": [ 11, 15, 11 ], - "faces": { - "north": { "texture": "#spruce_log", "uv": [ 4, 1, 10, 15 ] }, - "east": { "texture": "#spruce_log", "uv": [ 6, 2, 12, 15 ] }, - "south": { "texture": "#spruce_log", "uv": [ 7, 1, 14, 14 ] }, - "west": { "texture": "#spruce_log", "uv": [ 4, 1, 10, 14 ] } - } - }, - { - "name": "Top", - "from": [ 0, 12, 0 ], - "to": [ 16, 16, 13 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 22.5 }, - "faces": { - "north": { "texture": "#brass_casing_side", "uv": [ 0, 10, 16, 14 ] }, - "east": { "texture": "#brass_casing_side", "uv": [ 12, 3, 16, 16 ], "rotation": 90 }, - "south": { "texture": "#brass_casing", "uv": [ 0, 0, 16, 4 ] }, - "west": { "texture": "#brass_casing_side", "uv": [ 0, 3, 4, 16 ], "rotation": 270 }, - "up": { "texture": "#brass_casing_side", "uv": [ 0, 3, 16, 16 ] }, - "down": { "texture": "#brass_casing_side", "uv": [ 0, 3, 16, 16 ], "rotation": 180 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/logisticians_table_indicator.json b/src/main/resources/assets/create/models/block/logisticians_table_indicator.json deleted file mode 100644 index 3de946897..000000000 --- a/src/main/resources/assets/create/models/block/logisticians_table_indicator.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "particle": "create:block/brass_casing_side", - "smooth_stone_slab_side": "minecraft:block/smooth_stone_slab_side", - "logistical_controller": "create:block/logistical_controller" - }, - "elements": [ - { - "name": "Cube", - "from": [ 4.75, 3, 4.75 ], - "to": [ 11.25, 5, 11.25 ], - "shade": false, - "faces": { - "north": { "texture": "#logistical_controller", "uv": [ 13, 3, 15, 10 ], "rotation": 270 }, - "east": { "texture": "#logistical_controller", "uv": [ 13, 3, 15, 10 ], "rotation": 90 }, - "south": { "texture": "#logistical_controller", "uv": [ 13, 3, 15, 10 ], "rotation": 90 }, - "west": { "texture": "#logistical_controller", "uv": [ 13, 3, 15, 10 ], "rotation": 90 }, - "up": { "texture": "#smooth_stone_slab_side", "uv": [ 4, 9, 10, 15 ], "rotation": 180 }, - "down": { "texture": "#smooth_stone_slab_side", "uv": [ 4, 1, 10, 7 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crafter/arrow.json b/src/main/resources/assets/create/models/block/mechanical_crafter/arrow.json similarity index 100% rename from src/main/resources/assets/create/models/block/crafter/arrow.json rename to src/main/resources/assets/create/models/block/mechanical_crafter/arrow.json diff --git a/src/main/resources/assets/create/models/block/crafter/belt.json b/src/main/resources/assets/create/models/block/mechanical_crafter/belt.json similarity index 100% rename from src/main/resources/assets/create/models/block/crafter/belt.json rename to src/main/resources/assets/create/models/block/mechanical_crafter/belt.json diff --git a/src/main/resources/assets/create/models/block/crafter/belt_animated.json b/src/main/resources/assets/create/models/block/mechanical_crafter/belt_animated.json similarity index 100% rename from src/main/resources/assets/create/models/block/crafter/belt_animated.json rename to src/main/resources/assets/create/models/block/mechanical_crafter/belt_animated.json diff --git a/src/main/resources/assets/create/models/block/mechanical_crafter/block.json b/src/main/resources/assets/create/models/block/mechanical_crafter/block.json new file mode 100644 index 000000000..66e82001a --- /dev/null +++ b/src/main/resources/assets/create/models/block/mechanical_crafter/block.json @@ -0,0 +1,132 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "3": "create:block/crafter_thingies", + "4": "create:block/crafter_side", + "5": "create:block/brass_casing", + "6": "create:block/crafter_top", + "7": "create:block/crafter_topunderside", + "particle": "create:block/brass_casing" + }, + "elements": [ + { + "name": "Top", + "from": [0, 0, 0], + "to": [16, 16, 6], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "east": {"uv": [0, 0, 16, 6], "rotation": 90, "texture": "#4"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#7"}, + "west": {"uv": [16, 0, 0, 6], "rotation": 270, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 6], "texture": "#4"}, + "down": {"uv": [0, 0, 16, 6], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "Bottom", + "from": [0, 0, 10], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#5"}, + "east": {"uv": [0, 10, 16, 16], "rotation": 90, "texture": "#4"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "west": {"uv": [16, 10, 0, 16], "rotation": 270, "texture": "#4"}, + "up": {"uv": [0, 10, 16, 16], "texture": "#4"}, + "down": {"uv": [0, 10, 16, 16], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "Side1", + "from": [0, 15.9, 6], + "to": [16, 16, 10], + "faces": { + "up": {"uv": [0, 6, 16, 10], "texture": "#4"}, + "down": {"uv": [0, 6, 16, 10], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "Side2", + "from": [0, 0, 6], + "to": [16, 0.1, 10], + "faces": { + "up": {"uv": [0, 6, 16, 10], "texture": "#4"}, + "down": {"uv": [0, 6, 16, 10], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "Side3", + "from": [15.9, 0, 6], + "to": [16, 16, 10], + "faces": { + "east": {"uv": [0, 6, 16, 10], "rotation": 90, "texture": "#4"}, + "west": {"uv": [0, 6, 16, 10], "rotation": 270, "texture": "#4"} + } + }, + { + "name": "Side4", + "from": [0, 0, 6], + "to": [0.1, 16, 10], + "faces": { + "east": {"uv": [0, 6, 16, 10], "rotation": 90, "texture": "#4"}, + "west": {"uv": [16, 6, 0, 10], "rotation": 270, "texture": "#4"} + } + }, + { + "name": "valve_case", + "from": [4, 4, -1], + "to": [12, 5, 0], + "faces": { + "north": {"uv": [2, 4, 3, 12], "rotation": 270, "texture": "#5"}, + "east": {"uv": [8, 2, 9, 3], "rotation": 90, "texture": "#5"}, + "west": {"uv": [7, 2, 8, 3], "rotation": 270, "texture": "#5"}, + "up": {"uv": [4, 2, 12, 3], "texture": "#5"}, + "down": {"uv": [4, 2, 12, 3], "rotation": 180, "texture": "#5"} + } + }, + { + "name": "valve_case", + "from": [4, 11, -1], + "to": [12, 12, 0], + "faces": { + "north": {"uv": [2, 4, 3, 12], "rotation": 270, "texture": "#5"}, + "east": {"uv": [8, 2, 9, 3], "rotation": 90, "texture": "#5"}, + "west": {"uv": [7, 2, 8, 3], "rotation": 270, "texture": "#5"}, + "up": {"uv": [4, 2, 12, 3], "texture": "#5"}, + "down": {"uv": [4, 2, 12, 3], "rotation": 180, "texture": "#5"} + } + }, + { + "name": "valve_case", + "from": [11, 5, -1], + "to": [12, 11, 0], + "faces": { + "north": {"uv": [5, 2, 11, 3], "rotation": 270, "texture": "#5"}, + "east": {"uv": [6, 2, 12, 3], "rotation": 90, "texture": "#5"}, + "west": {"uv": [5, 2, 11, 3], "rotation": 270, "texture": "#5"}, + "up": {"uv": [2, 4, 3, 5], "texture": "#5"}, + "down": {"uv": [2, 4, 3, 5], "rotation": 180, "texture": "#5"} + } + }, + { + "name": "valve_case", + "from": [4, 5, -1], + "to": [5, 11, 0], + "faces": { + "north": {"uv": [5, 2, 11, 3], "rotation": 270, "texture": "#5"}, + "east": {"uv": [6, 2, 12, 3], "rotation": 90, "texture": "#5"}, + "west": {"uv": [5, 2, 11, 3], "rotation": 270, "texture": "#5"}, + "up": {"uv": [2, 4, 3, 5], "texture": "#5"}, + "down": {"uv": [2, 4, 3, 5], "rotation": 180, "texture": "#5"} + } + }, + { + "name": "opening", + "from": [5, 5, -0.5], + "to": [11, 11, 0.5], + "faces": { + "north": {"uv": [6, 0, 12, 6], "rotation": 270, "texture": "#3"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/crafter/item.json b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json similarity index 100% rename from src/main/resources/assets/create/models/block/crafter/item.json rename to src/main/resources/assets/create/models/block/mechanical_crafter/item.json diff --git a/src/main/resources/assets/create/models/block/crafter/lid.json b/src/main/resources/assets/create/models/block/mechanical_crafter/lid.json similarity index 100% rename from src/main/resources/assets/create/models/block/crafter/lid.json rename to src/main/resources/assets/create/models/block/mechanical_crafter/lid.json diff --git a/src/main/resources/assets/create/models/block/mixer_base.json b/src/main/resources/assets/create/models/block/mechanical_mixer/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/mixer_base.json rename to src/main/resources/assets/create/models/block/mechanical_mixer/block.json diff --git a/src/main/resources/assets/create/models/block/mixer_head.json b/src/main/resources/assets/create/models/block/mechanical_mixer/head.json similarity index 100% rename from src/main/resources/assets/create/models/block/mixer_head.json rename to src/main/resources/assets/create/models/block/mechanical_mixer/head.json diff --git a/src/main/resources/assets/create/models/item/mechanical_mixer.json b/src/main/resources/assets/create/models/block/mechanical_mixer/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/mechanical_mixer.json rename to src/main/resources/assets/create/models/block/mechanical_mixer/item.json diff --git a/src/main/resources/assets/create/models/block/mixer_pole.json b/src/main/resources/assets/create/models/block/mechanical_mixer/pole.json similarity index 100% rename from src/main/resources/assets/create/models/block/mixer_pole.json rename to src/main/resources/assets/create/models/block/mechanical_mixer/pole.json diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension.json b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension.json rename to src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_piston/base_with_extension_rotated.json rename to src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/base.json b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_piston/base.json rename to src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/base_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_piston/base_rotated.json rename to src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json diff --git a/src/main/resources/assets/create/models/block/mechanical_piston.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_piston.json rename to src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_piston/rotated.json rename to src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json diff --git a/src/main/resources/assets/create/models/block/mechanical_piston_head.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/head.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_piston_head.json rename to src/main/resources/assets/create/models/block/mechanical_piston/normal/head.json diff --git a/src/main/resources/assets/create/models/item/mechanical_piston.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/mechanical_piston.json rename to src/main/resources/assets/create/models/block/mechanical_piston/normal/item.json diff --git a/src/main/resources/assets/create/models/block/mechanical_piston_sticky.json b/src/main/resources/assets/create/models/block/mechanical_piston/sticky/block.json similarity index 53% rename from src/main/resources/assets/create/models/block/mechanical_piston_sticky.json rename to src/main/resources/assets/create/models/block/mechanical_piston/sticky/block.json index cde8f1d76..c7d8146f9 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston_sticky.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/sticky/block.json @@ -1,5 +1,5 @@ { - "parent": "create:block/mechanical_piston", + "parent": "create:block/mechanical_piston/normal/block", "textures": { "5": "block/piston_top_sticky" } diff --git a/src/main/resources/assets/create/models/item/sticky_mechanical_piston.json b/src/main/resources/assets/create/models/block/mechanical_piston/sticky/block_rotated.json similarity index 50% rename from src/main/resources/assets/create/models/item/sticky_mechanical_piston.json rename to src/main/resources/assets/create/models/block/mechanical_piston/sticky/block_rotated.json index fe98bca55..fae548960 100644 --- a/src/main/resources/assets/create/models/item/sticky_mechanical_piston.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/sticky/block_rotated.json @@ -1,5 +1,5 @@ { - "parent": "create:item/mechanical_piston", + "parent": "create:block/mechanical_piston/normal/block_rotated", "textures": { "5": "block/piston_top_sticky" } diff --git a/src/main/resources/assets/create/models/block/mechanical_piston_head_sticky.json b/src/main/resources/assets/create/models/block/mechanical_piston/sticky/head.json similarity index 65% rename from src/main/resources/assets/create/models/block/mechanical_piston_head_sticky.json rename to src/main/resources/assets/create/models/block/mechanical_piston/sticky/head.json index 40f7500c2..1424b4476 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston_head_sticky.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/sticky/head.json @@ -1,5 +1,5 @@ { - "parent": "create:block/mechanical_piston_head", + "parent": "create:block/mechanical_piston/normal/head", "textures": { "particle": "block/piston_top_sticky", "1": "block/piston_top_sticky" diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/rotated_sticky.json b/src/main/resources/assets/create/models/block/mechanical_piston/sticky/item.json similarity index 54% rename from src/main/resources/assets/create/models/block/mechanical_piston/rotated_sticky.json rename to src/main/resources/assets/create/models/block/mechanical_piston/sticky/item.json index d23a7cbb3..8ce8a71f0 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/rotated_sticky.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/sticky/item.json @@ -1,5 +1,5 @@ { - "parent": "create:block/mechanical_piston/rotated", + "parent": "create:block/mechanical_piston/normal/item", "textures": { "5": "block/piston_top_sticky" } diff --git a/src/main/resources/assets/create/models/block/mechanical_press_base.json b/src/main/resources/assets/create/models/block/mechanical_press/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_press_base.json rename to src/main/resources/assets/create/models/block/mechanical_press/block.json diff --git a/src/main/resources/assets/create/models/block/mechanical_press_head.json b/src/main/resources/assets/create/models/block/mechanical_press/head.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_press_head.json rename to src/main/resources/assets/create/models/block/mechanical_press/head.json diff --git a/src/main/resources/assets/create/models/item/mechanical_press.json b/src/main/resources/assets/create/models/block/mechanical_press/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/mechanical_press.json rename to src/main/resources/assets/create/models/block/mechanical_press/item.json diff --git a/src/main/resources/assets/create/models/block/millstone/casing.json b/src/main/resources/assets/create/models/block/millstone/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/millstone/casing.json rename to src/main/resources/assets/create/models/block/millstone/block.json diff --git a/src/main/resources/assets/create/models/block/nozzle/block.json b/src/main/resources/assets/create/models/block/nozzle/block.json index 51e5870cd..4e7d9ddb4 100644 --- a/src/main/resources/assets/create/models/block/nozzle/block.json +++ b/src/main/resources/assets/create/models/block/nozzle/block.json @@ -3,47 +3,34 @@ "parent": "block/block", "textures": { "3": "create:block/net", - "back": "create:block/gearbox", - "particle": "create:block/net" + "particle": "create:block/net", + "back": "create:block/gearbox" }, "elements": [ { "name": "body", - "from": [2, 2, 2], - "to": [14, 14, 16], + "from": [2, 0, 2], + "to": [14, 14, 14], "faces": { - "north": {"uv": [0, 2, 12, 14], "texture": "#3"}, - "east": {"uv": [2, 2, 16, 14], "texture": "#3"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#3"}, - "west": {"uv": [0, 2, 14, 14], "rotation": 180, "texture": "#3"}, - "up": {"uv": [0, 2, 14, 14], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 2, 14, 14], "rotation": 90, "texture": "#3"} + "north": {"uv": [0, 2, 14, 14], "rotation": 270, "texture": "#3"}, + "east": {"uv": [2, 2, 16, 14], "rotation": 270, "texture": "#3"}, + "south": {"uv": [0, 2, 14, 14], "rotation": 270, "texture": "#3"}, + "west": {"uv": [0, 2, 14, 14], "rotation": 270, "texture": "#3"}, + "up": {"uv": [0, 2, 12, 14], "rotation": 180, "texture": "#3"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#3"} } }, { "name": "body", - "from": [4, 4, 4], - "to": [12, 12, 16], + "from": [4, 0, 4], + "to": [12, 12, 12], "faces": { - "north": {"uv": [0, 2, 8, 10], "texture": "#3"}, - "east": {"uv": [2, 2, 14, 10], "texture": "#3"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#3"}, - "west": {"uv": [1, 2, 13, 10], "texture": "#3"}, - "up": {"uv": [0, 2, 12, 10], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 2, 12, 10], "rotation": 90, "texture": "#3"} - } - }, - { - "name": "rim", - "from": [1, 1, 1], - "to": [15, 3, 3], - "faces": { - "north": {"uv": [1, 13, 15, 15], "texture": "#back"}, - "east": {"uv": [0, 1, 2, 3], "texture": "#back"}, - "south": {"uv": [1, 13, 15, 15], "texture": "#back"}, - "west": {"uv": [14, 13, 16, 15], "texture": "#back"}, - "up": {"uv": [1, 2, 15, 4], "texture": "#back"}, - "down": {"uv": [1, 0, 15, 2], "texture": "#back"} + "north": {"uv": [0, 2, 12, 10], "rotation": 270, "texture": "#3"}, + "east": {"uv": [2, 2, 14, 10], "rotation": 270, "texture": "#3"}, + "south": {"uv": [0, 2, 12, 10], "rotation": 270, "texture": "#3"}, + "west": {"uv": [1, 2, 13, 10], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 2, 8, 10], "rotation": 180, "texture": "#3"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#3"} } }, { @@ -51,34 +38,47 @@ "from": [1, 13, 1], "to": [15, 15, 3], "faces": { - "north": {"uv": [1, 15, 15, 13], "texture": "#back"}, - "east": {"uv": [0, 3, 2, 1], "texture": "#back"}, - "south": {"uv": [1, 15, 15, 13], "texture": "#back"}, - "west": {"uv": [14, 15, 16, 13], "texture": "#back"}, - "up": {"uv": [1, 2, 15, 0], "texture": "#back"}, - "down": {"uv": [1, 4, 15, 2], "texture": "#back"} + "north": {"uv": [1, 0, 15, 2], "rotation": 180, "texture": "#back"}, + "east": {"uv": [0, 1, 2, 3], "rotation": 270, "texture": "#back"}, + "south": {"uv": [1, 2, 15, 4], "texture": "#back"}, + "west": {"uv": [14, 13, 16, 15], "rotation": 90, "texture": "#back"}, + "up": {"uv": [1, 13, 15, 15], "rotation": 180, "texture": "#back"}, + "down": {"uv": [1, 13, 15, 15], "texture": "#back"} } }, { "name": "rim", - "from": [13, 3, 1], - "to": [15, 13, 3], + "from": [1, 13, 13], + "to": [15, 15, 15], "faces": { - "north": {"uv": [1, 3, 3, 13], "texture": "#back"}, - "east": {"uv": [0, 3, 2, 13], "texture": "#back"}, - "south": {"uv": [13, 3, 15, 13], "texture": "#back"}, - "west": {"uv": [2, 3, 4, 13], "texture": "#back"} + "north": {"uv": [1, 4, 15, 2], "rotation": 180, "texture": "#back"}, + "east": {"uv": [0, 3, 2, 1], "rotation": 270, "texture": "#back"}, + "south": {"uv": [1, 2, 15, 0], "texture": "#back"}, + "west": {"uv": [14, 15, 16, 13], "rotation": 90, "texture": "#back"}, + "up": {"uv": [1, 15, 15, 13], "rotation": 180, "texture": "#back"}, + "down": {"uv": [1, 15, 15, 13], "texture": "#back"} } }, { "name": "rim", - "from": [1, 3, 1], - "to": [3, 13, 3], + "from": [13, 13, 3], + "to": [15, 15, 13], "faces": { - "north": {"uv": [3, 3, 1, 13], "texture": "#back"}, - "east": {"uv": [4, 3, 2, 13], "texture": "#back"}, - "south": {"uv": [15, 3, 13, 13], "texture": "#back"}, - "west": {"uv": [2, 3, 0, 13], "texture": "#back"} + "east": {"uv": [0, 3, 2, 13], "rotation": 270, "texture": "#back"}, + "west": {"uv": [2, 3, 4, 13], "rotation": 90, "texture": "#back"}, + "up": {"uv": [1, 3, 3, 13], "rotation": 180, "texture": "#back"}, + "down": {"uv": [13, 3, 15, 13], "texture": "#back"} + } + }, + { + "name": "rim", + "from": [1, 13, 3], + "to": [3, 15, 13], + "faces": { + "east": {"uv": [4, 3, 2, 13], "rotation": 270, "texture": "#back"}, + "west": {"uv": [2, 3, 0, 13], "rotation": 90, "texture": "#back"}, + "up": {"uv": [3, 3, 1, 13], "rotation": 180, "texture": "#back"}, + "down": {"uv": [15, 3, 13, 13], "texture": "#back"} } } ], diff --git a/src/main/resources/assets/create/models/block/package_funnel.json b/src/main/resources/assets/create/models/block/package_funnel.json deleted file mode 100644 index 3815f0eed..000000000 --- a/src/main/resources/assets/create/models/block/package_funnel.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "3": "block/dark_oak_log_top", - "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" - }, - "elements": [ - { - "name": "Cube", - "from": [1, 1, -1], - "to": [15, 2, 3], - "faces": { - "north": {"uv": [1, 14, 15, 15], "texture": "#3"}, - "east": {"uv": [0, 12, 1, 16], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 13, 14, 14], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [0, 12, 1, 16], "rotation": 90, "texture": "#belt_funnel"}, - "up": {"uv": [0, 12, 14, 16], "rotation": 180, "texture": "#belt_funnel"}, - "down": {"uv": [0, 12, 14, 16], "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [1, 14, -1], - "to": [15, 15, 3], - "faces": { - "north": {"uv": [1, 1, 15, 2], "texture": "#3"}, - "east": {"uv": [13, 12, 14, 16], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 0, 14, 1], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [13, 12, 14, 16], "rotation": 90, "texture": "#belt_funnel"}, - "up": {"uv": [0, 12, 14, 16], "rotation": 180, "texture": "#belt_funnel"}, - "down": {"uv": [0, 12, 14, 16], "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [1, 2, -1], - "to": [2, 14, 3], - "faces": { - "north": {"uv": [14, 2, 15, 14], "texture": "#3"}, - "east": {"uv": [1, 12, 13, 16], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [0, 1, 1, 13], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [1, 12, 13, 16], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Cube", - "from": [14, 2, -1], - "to": [15, 14, 3], - "faces": { - "north": {"uv": [1, 2, 2, 14], "texture": "#3"}, - "east": {"uv": [1, 12, 13, 16], "rotation": 270, "texture": "#belt_funnel"}, - "south": {"uv": [13, 1, 14, 13], "texture": "#package_funnel_horizontal"}, - "west": {"uv": [1, 12, 13, 16], "rotation": 90, "texture": "#belt_funnel"} - } - }, - { - "name": "Inner", - "from": [2, 2, -1], - "to": [14, 14, 2], - "faces": { - "north": {"uv": [2, 2, 14, 14], "texture": "#brass_casing"}, - "south": {"uv": [1, 1, 13, 13], "texture": "#package_funnel_horizontal"} - } - } - ], - "display": { - "ground": { - "translation": [0, 3, 2], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 45, 0], - "translation": [2.6, -1, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 0, -7], - "scale": [0.625, 0.625, 0.625] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/package_funnel_vertical.json b/src/main/resources/assets/create/models/block/package_funnel_vertical.json deleted file mode 100644 index d5e2b791b..000000000 --- a/src/main/resources/assets/create/models/block/package_funnel_vertical.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "create:block/package_funnel", - "textures": { - "particle": "create:block/package_funnel_vertical", - "package_funnel_horizontal": "create:block/package_funnel_vertical" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/pole.json b/src/main/resources/assets/create/models/block/piston_extension_pole.json similarity index 100% rename from src/main/resources/assets/create/models/block/mechanical_piston/pole.json rename to src/main/resources/assets/create/models/block/piston_extension_pole.json diff --git a/src/main/resources/assets/create/models/block/plough.json b/src/main/resources/assets/create/models/block/plough.json index 9c678684d..bdbde566a 100644 --- a/src/main/resources/assets/create/models/block/plough.json +++ b/src/main/resources/assets/create/models/block/plough.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { "1": "block/anvil", "particle": "create:block/andesite_casing_short", @@ -8,106 +9,79 @@ "elements": [ { "name": "Core", - "from": [0, 2, 0], - "to": [16, 14, 2.9], + "from": [0, 2, 13.1], + "to": [16, 14, 16], "faces": { "north": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, - "east": {"uv": [2, 0, 14, 3], "rotation": 270, "texture": "#andesite_casing_short"}, + "east": {"uv": [2, 0, 14, 3], "rotation": 90, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, - "west": {"uv": [2, 0, 14, 3], "rotation": 90, "texture": "#andesite_casing_short"}, - "up": {"uv": [0, 0, 16, 2.9], "rotation": 180, "texture": "#andesite_casing_short"}, - "down": {"uv": [0, 0, 16, 2.9], "texture": "#andesite_casing_short"} + "west": {"uv": [2, 0, 14, 3], "rotation": 270, "texture": "#andesite_casing_short"}, + "up": {"uv": [0, 0, 16, 2.9], "texture": "#andesite_casing_short"}, + "down": {"uv": [0, 0, 16, 2.9], "rotation": 180, "texture": "#andesite_casing_short"} } }, { "name": "Attachment", - "from": [0.1, 4, 6], - "to": [2, 7, 15], - "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 10, 3]}, + "from": [14, 4, 1], + "to": [15.9, 7, 10], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 10, 13]}, "faces": { - "north": {"uv": [0, 0, 1.9, 3], "texture": "#andesite_casing_short"}, + "north": {"uv": [0.1, 8, 2, 11], "texture": "#andesite_casing_short"}, "east": {"uv": [0, 0, 9, 3], "texture": "#andesite_casing_short"}, - "south": {"uv": [0.1, 8, 2, 11], "texture": "#andesite_casing_short"}, + "south": {"uv": [0, 0, 1.9, 3], "texture": "#andesite_casing_short"}, "west": {"uv": [0, 0, 9, 3], "texture": "#andesite_casing_short"}, - "up": {"uv": [0, 4, 1.9, 13], "texture": "#andesite_casing_short"}, - "down": {"uv": [0, 4, 1.9, 13], "texture": "#andesite_casing_short"} + "up": {"uv": [0, 4, 1.9, 13], "rotation": 180, "texture": "#andesite_casing_short"}, + "down": {"uv": [0, 4, 1.9, 13], "rotation": 180, "texture": "#andesite_casing_short"} } }, { "name": "Attachment", - "from": [2.1, 5, 5], - "to": [14, 6, 17], - "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 10, 3]}, + "from": [2, 5, -1], + "to": [13.9, 6, 11], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 10, 13]}, "faces": { - "north": {"uv": [0, 0, 11.9, 1], "texture": "#andesite_casing_short"}, + "north": {"uv": [2, 15, 13.9, 16], "texture": "#1"}, "east": {"uv": [0, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [2, 15, 13.9, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 11.9, 1], "texture": "#andesite_casing_short"}, "west": {"uv": [0, 0, 12, 1], "texture": "#1"}, - "up": {"uv": [2, 2, 13.9, 14], "texture": "#1"}, - "down": {"uv": [2, 4, 13.9, 16], "texture": "#1"} + "up": {"uv": [2, 2, 13.9, 14], "rotation": 180, "texture": "#1"}, + "down": {"uv": [2, 4, 13.9, 16], "rotation": 180, "texture": "#1"} } }, { "name": "Attachment", - "from": [14, 4, 6], - "to": [15.9, 7, 15], - "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 10, 3]}, + "from": [0.1, 4, 1], + "to": [2, 7, 10], + "rotation": {"angle": -22.5, "axis": "x", "origin": [16, 10, 13]}, "faces": { - "north": {"uv": [0, 0, 1.9, 3], "texture": "#andesite_casing_short"}, + "north": {"uv": [14, 8, 15.9, 11], "texture": "#andesite_casing_short"}, "east": {"uv": [0, 0, 9, 3], "texture": "#andesite_casing_short"}, - "south": {"uv": [14, 8, 15.9, 11], "texture": "#andesite_casing_short"}, + "south": {"uv": [0, 0, 1.9, 3], "texture": "#andesite_casing_short"}, "west": {"uv": [0, 0, 9, 3], "texture": "#andesite_casing_short"}, - "up": {"uv": [14, 4, 15.9, 13], "texture": "#andesite_casing_short"}, - "down": {"uv": [14, 4, 15.9, 13], "texture": "#andesite_casing_short"} + "up": {"uv": [14, 4, 15.9, 13], "rotation": 180, "texture": "#andesite_casing_short"}, + "down": {"uv": [14, 4, 15.9, 13], "rotation": 180, "texture": "#andesite_casing_short"} } }, { "name": "Attachment", - "from": [0, 4, 2.9], - "to": [16, 7, 6], - "rotation": {"angle": 0, "axis": "x", "origin": [0, 10, 2]}, + "from": [0, 4, 10], + "to": [16, 7, 13.1], + "rotation": {"angle": 0, "axis": "x", "origin": [16, 10, 14]}, "faces": { "north": {"uv": [0, 0, 16, 3], "texture": "#andesite_casing_short"}, "east": {"uv": [0, 0, 3.1, 3], "texture": "#andesite_casing_short"}, "south": {"uv": [0, 0, 16, 3], "texture": "#andesite_casing_short"}, "west": {"uv": [0, 0, 3.1, 3], "texture": "#andesite_casing_short"}, - "up": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#andesite_casing_short"}, - "down": {"uv": [0, 0, 16, 3], "texture": "#andesite_casing_short"} + "up": {"uv": [0, 0, 16, 3], "texture": "#andesite_casing_short"}, + "down": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#andesite_casing_short"} } } ], "display": { - "thirdperson_righthand": { - "rotation": [75, -135, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, -135, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, -135, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, "gui": { - "rotation": [30, 45, 0], + "rotation": [30, -135, 0], "translation": [1, 0, 0], "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 0, -4], - "scale": [0.5, 0.5, 0.5] } } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/pulley/casing.json b/src/main/resources/assets/create/models/block/rope_pulley/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/pulley/casing.json rename to src/main/resources/assets/create/models/block/rope_pulley/block.json diff --git a/src/main/resources/assets/create/models/block/pulley/item.json b/src/main/resources/assets/create/models/block/rope_pulley/item.json similarity index 100% rename from src/main/resources/assets/create/models/block/pulley/item.json rename to src/main/resources/assets/create/models/block/rope_pulley/item.json diff --git a/src/main/resources/assets/create/models/block/pulley/magnet.json b/src/main/resources/assets/create/models/block/rope_pulley/pulley_magnet.json similarity index 100% rename from src/main/resources/assets/create/models/block/pulley/magnet.json rename to src/main/resources/assets/create/models/block/rope_pulley/pulley_magnet.json diff --git a/src/main/resources/assets/create/models/block/pulley/rope.json b/src/main/resources/assets/create/models/block/rope_pulley/rope.json similarity index 100% rename from src/main/resources/assets/create/models/block/pulley/rope.json rename to src/main/resources/assets/create/models/block/rope_pulley/rope.json diff --git a/src/main/resources/assets/create/models/block/pulley/rope_coil.json b/src/main/resources/assets/create/models/block/rope_pulley/rope_coil.json similarity index 100% rename from src/main/resources/assets/create/models/block/pulley/rope_coil.json rename to src/main/resources/assets/create/models/block/rope_pulley/rope_coil.json diff --git a/src/main/resources/assets/create/models/block/pulley/rope_half.json b/src/main/resources/assets/create/models/block/rope_pulley/rope_half.json similarity index 100% rename from src/main/resources/assets/create/models/block/pulley/rope_half.json rename to src/main/resources/assets/create/models/block/rope_pulley/rope_half.json diff --git a/src/main/resources/assets/create/models/block/pulley/rope_half_magnet.json b/src/main/resources/assets/create/models/block/rope_pulley/rope_half_magnet.json similarity index 100% rename from src/main/resources/assets/create/models/block/pulley/rope_half_magnet.json rename to src/main/resources/assets/create/models/block/rope_pulley/rope_half_magnet.json diff --git a/src/main/resources/assets/create/models/block/rotation_chassis_base.json b/src/main/resources/assets/create/models/block/rotation_chassis/base.json similarity index 71% rename from src/main/resources/assets/create/models/block/rotation_chassis_base.json rename to src/main/resources/assets/create/models/block/rotation_chassis/base.json index cb3ee690f..23b6edb58 100644 --- a/src/main/resources/assets/create/models/block/rotation_chassis_base.json +++ b/src/main/resources/assets/create/models/block/rotation_chassis/base.json @@ -1,8 +1,7 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", "textures": { "particle": "create:block/rotation_chassis_side", - "rotation_chassis_top": "create:block/rotation_chassis_top" + "rotation_chassis_top": "create:block/rotation_chassis_end" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/rotation_chassis/side_x.json b/src/main/resources/assets/create/models/block/rotation_chassis/side_x.json new file mode 100644 index 000000000..5ce7b8783 --- /dev/null +++ b/src/main/resources/assets/create/models/block/rotation_chassis/side_x.json @@ -0,0 +1,15 @@ +{ + "textures": { + "0": "#side" + }, + "elements": [ + { + "name": "Cube", + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "up": { "texture": "#0", "uv": [ 0, 0, 16, 16 ], "rotation": 90 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_chassis/side_y.json b/src/main/resources/assets/create/models/block/rotation_chassis/side_y.json new file mode 100644 index 000000000..4ec145cf1 --- /dev/null +++ b/src/main/resources/assets/create/models/block/rotation_chassis/side_y.json @@ -0,0 +1,15 @@ +{ + "textures": { + "0": "#side" + }, + "elements": [ + { + "name": "Cube", + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "south": { "texture": "#0", "uv": [ 0, 0, 16, 16 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_chassis/side_z.json b/src/main/resources/assets/create/models/block/rotation_chassis/side_z.json new file mode 100644 index 000000000..088387347 --- /dev/null +++ b/src/main/resources/assets/create/models/block/rotation_chassis/side_z.json @@ -0,0 +1,15 @@ +{ + "textures": { + "0": "#side" + }, + "elements": [ + { + "name": "Cube", + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "east": { "texture": "#0", "uv": [ 0, 0, 16, 16 ], "rotation": 270 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_chassis_side_x.json b/src/main/resources/assets/create/models/block/rotation_chassis_side_x.json deleted file mode 100644 index c427f4e21..000000000 --- a/src/main/resources/assets/create/models/block/rotation_chassis_side_x.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "rotation_chassis_side": "create:block/rotation_chassis_side" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "texture": "#rotation_chassis_side", "uv": [ 0, 0, 16, 16 ], "rotation": 90 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_chassis_side_x_sticky.json b/src/main/resources/assets/create/models/block/rotation_chassis_side_x_sticky.json deleted file mode 100644 index 86f40dbed..000000000 --- a/src/main/resources/assets/create/models/block/rotation_chassis_side_x_sticky.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/rotation_chassis_side_x", - "textures": { - "rotation_chassis_side": "create:block/rotation_chassis_side_sticky" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_chassis_side_y.json b/src/main/resources/assets/create/models/block/rotation_chassis_side_y.json deleted file mode 100644 index 7f6677b78..000000000 --- a/src/main/resources/assets/create/models/block/rotation_chassis_side_y.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "rotation_chassis_side": "create:block/rotation_chassis_side" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "south": { "texture": "#rotation_chassis_side", "uv": [ 0, 0, 16, 16 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_chassis_side_y_sticky.json b/src/main/resources/assets/create/models/block/rotation_chassis_side_y_sticky.json deleted file mode 100644 index d4a4f68ce..000000000 --- a/src/main/resources/assets/create/models/block/rotation_chassis_side_y_sticky.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/rotation_chassis_side_y", - "textures": { - "rotation_chassis_side": "create:block/rotation_chassis_side_sticky" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_chassis_side_z.json b/src/main/resources/assets/create/models/block/rotation_chassis_side_z.json deleted file mode 100644 index ae1800c80..000000000 --- a/src/main/resources/assets/create/models/block/rotation_chassis_side_z.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "rotation_chassis_side": "create:block/rotation_chassis_side" - }, - "elements": [ - { - "name": "Cube", - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "east": { "texture": "#rotation_chassis_side", "uv": [ 0, 0, 16, 16 ], "rotation": 270 } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_chassis_side_z_sticky.json b/src/main/resources/assets/create/models/block/rotation_chassis_side_z_sticky.json deleted file mode 100644 index 917d6e787..000000000 --- a/src/main/resources/assets/create/models/block/rotation_chassis_side_z_sticky.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "create:block/rotation_chassis_side_z", - "textures": { - "rotation_chassis_side": "create:block/rotation_chassis_side_sticky" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json similarity index 100% rename from src/main/resources/assets/create/models/block/rotation_speed_controller.json rename to src/main/resources/assets/create/models/block/rotation_speed_controller/block.json diff --git a/src/main/resources/assets/create/models/item/rotation_speed_controller.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/rotation_speed_controller.json rename to src/main/resources/assets/create/models/block/rotation_speed_controller/item.json diff --git a/src/main/resources/assets/create/models/block/saw_horizontal.json b/src/main/resources/assets/create/models/block/saw/horizontal.json similarity index 100% rename from src/main/resources/assets/create/models/block/saw_horizontal.json rename to src/main/resources/assets/create/models/block/saw/horizontal.json diff --git a/src/main/resources/assets/create/models/block/saw_horizontal_inactive.json b/src/main/resources/assets/create/models/block/saw/horizontal_inactive.json similarity index 65% rename from src/main/resources/assets/create/models/block/saw_horizontal_inactive.json rename to src/main/resources/assets/create/models/block/saw/horizontal_inactive.json index 22466a8b8..e64e68879 100644 --- a/src/main/resources/assets/create/models/block/saw_horizontal_inactive.json +++ b/src/main/resources/assets/create/models/block/saw/horizontal_inactive.json @@ -1,5 +1,5 @@ { - "parent": "create:block/saw_horizontal", + "parent": "create:block/saw/horizontal", "textures": { "stonecutter_saw": "create:block/static_saw" } diff --git a/src/main/resources/assets/create/models/block/saw.json b/src/main/resources/assets/create/models/block/saw/vertical.json similarity index 100% rename from src/main/resources/assets/create/models/block/saw.json rename to src/main/resources/assets/create/models/block/saw/vertical.json diff --git a/src/main/resources/assets/create/models/block/saw_inactive.json b/src/main/resources/assets/create/models/block/saw/vertical_inactive.json similarity index 66% rename from src/main/resources/assets/create/models/block/saw_inactive.json rename to src/main/resources/assets/create/models/block/saw/vertical_inactive.json index 6faac8d79..82fe18247 100644 --- a/src/main/resources/assets/create/models/block/saw_inactive.json +++ b/src/main/resources/assets/create/models/block/saw/vertical_inactive.json @@ -1,5 +1,5 @@ { - "parent": "create:block/saw", + "parent": "create:block/saw/vertical", "textures": { "stonecutter_saw": "create:block/static_saw" } diff --git a/src/main/resources/assets/create/models/item/sequenced_gearshift.json b/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json similarity index 100% rename from src/main/resources/assets/create/models/item/sequenced_gearshift.json rename to src/main/resources/assets/create/models/block/sequenced_gearshift/item.json diff --git a/src/main/resources/assets/create/models/block/translation_chassis/alt.json b/src/main/resources/assets/create/models/block/translation_chassis/alt.json deleted file mode 100644 index 04896f3fe..000000000 --- a/src/main/resources/assets/create/models/block/translation_chassis/alt.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/translation_chassis_top", - "top": "create:block/translation_chassis_top", - "side": "create:block/translation_chassis_side_alt" - } -} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/alt_both_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/alt_both_sticky.json deleted file mode 100644 index 2b4591a7e..000000000 --- a/src/main/resources/assets/create/models/block/translation_chassis/alt_both_sticky.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/translation_chassis_top_sticky", - "top": "create:block/translation_chassis_top_sticky", - "side": "create:block/translation_chassis_side_alt" - } -} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/alt_bottom_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/alt_bottom_sticky.json deleted file mode 100644 index 133e30bdd..000000000 --- a/src/main/resources/assets/create/models/block/translation_chassis/alt_bottom_sticky.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/translation_chassis_top_sticky", - "top": "create:block/translation_chassis_top", - "side": "create:block/translation_chassis_side_alt" - } -} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/alt_top_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/alt_top_sticky.json deleted file mode 100644 index bf694a51c..000000000 --- a/src/main/resources/assets/create/models/block/translation_chassis/alt_top_sticky.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "top": "create:block/translation_chassis_top_sticky", - "bottom": "create:block/translation_chassis_top", - "side": "create:block/translation_chassis_side_alt" - } -} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/regular.json b/src/main/resources/assets/create/models/block/translation_chassis/regular.json deleted file mode 100644 index 23c7defcf..000000000 --- a/src/main/resources/assets/create/models/block/translation_chassis/regular.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/translation_chassis_top", - "top": "create:block/translation_chassis_top", - "side": "create:block/translation_chassis_side" - } -} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/regular_both_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/regular_both_sticky.json deleted file mode 100644 index a2f302279..000000000 --- a/src/main/resources/assets/create/models/block/translation_chassis/regular_both_sticky.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/translation_chassis_top_sticky", - "top": "create:block/translation_chassis_top_sticky", - "side": "create:block/translation_chassis_side" - } -} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/regular_bottom_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/regular_bottom_sticky.json deleted file mode 100644 index a2792d24b..000000000 --- a/src/main/resources/assets/create/models/block/translation_chassis/regular_bottom_sticky.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/translation_chassis_top_sticky", - "top": "create:block/translation_chassis_top", - "side": "create:block/translation_chassis_side" - } -} diff --git a/src/main/resources/assets/create/models/block/translation_chassis/regular_top_sticky.json b/src/main/resources/assets/create/models/block/translation_chassis/regular_top_sticky.json deleted file mode 100644 index b68ef5675..000000000 --- a/src/main/resources/assets/create/models/block/translation_chassis/regular_top_sticky.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "top": "create:block/translation_chassis_top_sticky", - "bottom": "create:block/translation_chassis_top", - "side": "create:block/translation_chassis_side" - } -} diff --git a/src/main/resources/assets/create/models/block/zinc_block.json b/src/main/resources/assets/create/models/block/zinc_block.json deleted file mode 100644 index 07e62b1b3..000000000 --- a/src/main/resources/assets/create/models/block/zinc_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/zinc_block" - } -} diff --git a/src/main/resources/assets/create/models/block/zinc_ore.json b/src/main/resources/assets/create/models/block/zinc_ore.json deleted file mode 100644 index 0a48dffb3..000000000 --- a/src/main/resources/assets/create/models/block/zinc_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "create:block/zinc_ore" - } -} diff --git a/src/main/resources/assets/create/models/item/andesite_casing.json b/src/main/resources/assets/create/models/item/andesite_casing.json deleted file mode 100644 index 027388fcc..000000000 --- a/src/main/resources/assets/create/models/item/andesite_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/andesite_casing" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/basin.json b/src/main/resources/assets/create/models/item/basin.json deleted file mode 100644 index b86f02dfb..000000000 --- a/src/main/resources/assets/create/models/item/basin.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/basin" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/brass_casing.json b/src/main/resources/assets/create/models/item/brass_casing.json deleted file mode 100644 index 96559a7f5..000000000 --- a/src/main/resources/assets/create/models/item/brass_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/brass_casing" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/cart_assembler.json b/src/main/resources/assets/create/models/item/cart_assembler.json deleted file mode 100644 index 83c159da8..000000000 --- a/src/main/resources/assets/create/models/item/cart_assembler.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/cart_assembler" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/clockwork_bearing.json b/src/main/resources/assets/create/models/item/clockwork_bearing.json deleted file mode 100644 index 5dfaa81ab..000000000 --- a/src/main/resources/assets/create/models/item/clockwork_bearing.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "create:item/mechanical_bearing", - "textures": { - "particle": "create:block/clockwork_bearing_side", - "bearing_top": "create:block/bearing_top", - "gearbox": "create:block/brass_gearbox", - "bearing_side": "create:block/clockwork_bearing_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/copper_casing.json b/src/main/resources/assets/create/models/item/copper_casing.json deleted file mode 100644 index 956bb3a8d..000000000 --- a/src/main/resources/assets/create/models/item/copper_casing.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/copper_casing" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/crushing_wheel.json b/src/main/resources/assets/create/models/item/crushing_wheel.json deleted file mode 100644 index ae75bb8ad..000000000 --- a/src/main/resources/assets/create/models/item/crushing_wheel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "create:block/crushing_wheel", - "display": { - "fixed": { - "rotation": [ 90, 0, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.5, 0.5, 0.5 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/cuckoo_clock.json b/src/main/resources/assets/create/models/item/cuckoo_clock.json deleted file mode 100644 index 11a49772e..000000000 --- a/src/main/resources/assets/create/models/item/cuckoo_clock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/cuckoo_clock/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/deployer.json b/src/main/resources/assets/create/models/item/deployer.json deleted file mode 100644 index 1ce8b3352..000000000 --- a/src/main/resources/assets/create/models/item/deployer.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/deployer/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/flywheel.json b/src/main/resources/assets/create/models/item/flywheel.json deleted file mode 100644 index 00e1610e7..000000000 --- a/src/main/resources/assets/create/models/item/flywheel.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/flywheel/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/furnace_engine.json b/src/main/resources/assets/create/models/item/furnace_engine.json deleted file mode 100644 index f7e497ca3..000000000 --- a/src/main/resources/assets/create/models/item/furnace_engine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/furnace_engine/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/hand_crank.json b/src/main/resources/assets/create/models/item/hand_crank.json deleted file mode 100644 index 84bea1d4a..000000000 --- a/src/main/resources/assets/create/models/item/hand_crank.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/hand_crank/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/mechanical_crafter.json b/src/main/resources/assets/create/models/item/mechanical_crafter.json deleted file mode 100644 index a377f5824..000000000 --- a/src/main/resources/assets/create/models/item/mechanical_crafter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/crafter/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/mechanical_saw.json b/src/main/resources/assets/create/models/item/mechanical_saw.json deleted file mode 100644 index 82d9a4215..000000000 --- a/src/main/resources/assets/create/models/item/mechanical_saw.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "gearbox_top": "create:block/gearbox_top", - "gearbox": "create:block/gearbox", - "stonecutter_saw": "minecraft:block/stonecutter_saw", - "andesite_casing_short": "create:block/andesite_casing_short", - "mechanical_saw_top": "create:block/mechanical_saw_top" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#gearbox_top", "uv": [ 0, 14, 16, 16 ] }, - "east": { "texture": "#andesite_casing_short", "uv": [ 0, 14, 16, 16 ] }, - "south": { "texture": "#gearbox_top", "uv": [ 0, 14, 16, 16 ] }, - "west": { "texture": "#andesite_casing_short", "uv": [ 0, 14, 16, 16 ] }, - "up": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Inner", - "from": [ 2, 2, 1 ], - "to": [ 14, 12, 15 ], - "faces": { - "north": { "texture": "#gearbox", "uv": [ 2, 4, 14, 14 ] }, - "south": { "texture": "#gearbox", "uv": [ 2, 4, 14, 14 ] }, - "up": { "texture": "#mechanical_saw_top", "uv": [ 2, 1, 14, 15 ] }, - "down": { "texture": "#gearbox", "uv": [ 0, 0, 12, 14 ] } - } - }, - { - "name": "Side", - "from": [ 0, 2, 0 ], - "to": [ 2, 12, 16 ], - "faces": { - "north": { "texture": "#gearbox_top", "uv": [ 14, 0, 16, 10 ] }, - "east": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 10 ] }, - "south": { "texture": "#gearbox_top", "uv": [ 0, 0, 2, 10 ] }, - "west": { "texture": "#andesite_casing_short", "uv": [ 0, 4, 16, 14 ] }, - "up": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 2 ], "rotation": 270 } - } - }, - { - "name": "Side2", - "from": [ 14, 2, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "north": { "texture": "#gearbox_top", "uv": [ 0, 0, 2, 10 ] }, - "east": { "texture": "#andesite_casing_short", "uv": [ 0, 4, 16, 14 ] }, - "south": { "texture": "#gearbox_top", "uv": [ 14, 0, 16, 10 ] }, - "west": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 10 ] }, - "up": { "texture": "#gearbox_top", "uv": [ 0, 14, 16, 16 ], "rotation": 270 } - } - }, - { - "name": "Saw", - "from": [ 0, 11, 8 ], - "to": [ 16, 19, 8 ], - "faces": { - "north": { "texture": "#stonecutter_saw", "uv": [ 0, 8, 16, 16 ] }, - "south": { "texture": "#stonecutter_saw", "uv": [ 0, 8, 16, 16 ] } - } - }, - { - "name": "Top", - "from": [ 0, 12, 3 ], - "to": [ 16, 13, 13 ], - "faces": { - "north": { "texture": "#mechanical_saw_top", "uv": [ 0, 12, 16, 13 ] }, - "east": { "texture": "#mechanical_saw_top", "uv": [ 0, 3, 1, 13 ], "rotation": 90 }, - "south": { "texture": "#mechanical_saw_top", "uv": [ 0, 3, 16, 4 ] }, - "west": { "texture": "#mechanical_saw_top", "uv": [ 15, 3, 16, 13 ], "rotation": 270 }, - "up": { "texture": "#mechanical_saw_top", "uv": [ 0, 3, 16, 13 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/millstone.json b/src/main/resources/assets/create/models/item/millstone.json deleted file mode 100644 index 971e3a7a4..000000000 --- a/src/main/resources/assets/create/models/item/millstone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/millstone/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/mossy_gabbro_bricks.json b/src/main/resources/assets/create/models/item/mossy_gabbro_bricks.json deleted file mode 100644 index dcd654723..000000000 --- a/src/main/resources/assets/create/models/item/mossy_gabbro_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/palettes/mossy_gabbro_bricks" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/mysterious_cuckoo_clock.json b/src/main/resources/assets/create/models/item/mysterious_cuckoo_clock.json deleted file mode 100644 index 11a49772e..000000000 --- a/src/main/resources/assets/create/models/item/mysterious_cuckoo_clock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/cuckoo_clock/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/nozzle.json b/src/main/resources/assets/create/models/item/nozzle.json deleted file mode 100644 index 208e9e6c9..000000000 --- a/src/main/resources/assets/create/models/item/nozzle.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/nozzle/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/paved_gabbro_bricks.json b/src/main/resources/assets/create/models/item/paved_gabbro_bricks.json deleted file mode 100644 index 290bf09b1..000000000 --- a/src/main/resources/assets/create/models/item/paved_gabbro_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/palettes/paved_gabbro_bricks" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/paved_gabbro_bricks_slab.json b/src/main/resources/assets/create/models/item/paved_gabbro_bricks_slab.json deleted file mode 100644 index 39d7d3f22..000000000 --- a/src/main/resources/assets/create/models/item/paved_gabbro_bricks_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/palettes/paved_gabbro_bricks_slab" -} diff --git a/src/main/resources/assets/create/models/item/piston_pole.json b/src/main/resources/assets/create/models/item/piston_pole.json deleted file mode 100644 index f31ccddd3..000000000 --- a/src/main/resources/assets/create/models/item/piston_pole.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/mechanical_piston/pole" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/plough.json b/src/main/resources/assets/create/models/item/plough.json deleted file mode 100644 index 241430659..000000000 --- a/src/main/resources/assets/create/models/item/plough.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/plough" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/portable_storage_interface.json b/src/main/resources/assets/create/models/item/portable_storage_interface.json deleted file mode 100644 index b2d60596c..000000000 --- a/src/main/resources/assets/create/models/item/portable_storage_interface.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/portable_storage_interface" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/rope_pulley.json b/src/main/resources/assets/create/models/item/rope_pulley.json deleted file mode 100644 index 9842abe5f..000000000 --- a/src/main/resources/assets/create/models/item/rope_pulley.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/pulley/item" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/rotation_chassis.json b/src/main/resources/assets/create/models/item/rotation_chassis.json deleted file mode 100644 index 768e670ed..000000000 --- a/src/main/resources/assets/create/models/item/rotation_chassis.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "create:block/rotation_chassis_top", - "top": "create:block/rotation_chassis_top", - "side": "create:block/rotation_chassis_side" - } -} diff --git a/src/main/resources/assets/create/models/item/saw.json b/src/main/resources/assets/create/models/item/saw.json deleted file mode 100644 index ae9a74ff3..000000000 --- a/src/main/resources/assets/create/models/item/saw.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/saw_horizontal" -} diff --git a/src/main/resources/assets/create/models/item/slightly_mossy_gabbro_bricks.json b/src/main/resources/assets/create/models/item/slightly_mossy_gabbro_bricks.json deleted file mode 100644 index b7d67f9d9..000000000 --- a/src/main/resources/assets/create/models/item/slightly_mossy_gabbro_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/palettes/slightly_mossy_gabbro_bricks" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/speed_gauge.json b/src/main/resources/assets/create/models/item/speed_gauge.json deleted file mode 100644 index c7a1c8ad3..000000000 --- a/src/main/resources/assets/create/models/item/speed_gauge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/gauge/item_speed" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/stress_gauge.json b/src/main/resources/assets/create/models/item/stress_gauge.json deleted file mode 100644 index 6aeecf9d1..000000000 --- a/src/main/resources/assets/create/models/item/stress_gauge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/gauge/item_stress" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/translation_chassis.json b/src/main/resources/assets/create/models/item/translation_chassis.json deleted file mode 100644 index 12043aef2..000000000 --- a/src/main/resources/assets/create/models/item/translation_chassis.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/translation_chassis/regular" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/translation_chassis_secondary.json b/src/main/resources/assets/create/models/item/translation_chassis_secondary.json deleted file mode 100644 index 46c11db07..000000000 --- a/src/main/resources/assets/create/models/item/translation_chassis_secondary.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/translation_chassis/alt" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/turntable.json b/src/main/resources/assets/create/models/item/turntable.json deleted file mode 100644 index 6a20ae7a2..000000000 --- a/src/main/resources/assets/create/models/item/turntable.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/turntable" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/bearing_side.png b/src/main/resources/assets/create/textures/block/bearing_side.png deleted file mode 100644 index c9bd01598..000000000 Binary files a/src/main/resources/assets/create/textures/block/bearing_side.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/bearing_top.png b/src/main/resources/assets/create/textures/block/bearing_top.png index 9177285df..3579810bd 100644 Binary files a/src/main/resources/assets/create/textures/block/bearing_top.png and b/src/main/resources/assets/create/textures/block/bearing_top.png differ diff --git a/src/main/resources/assets/create/textures/block/clockwork_bearing_side.png b/src/main/resources/assets/create/textures/block/clockwork_bearing_side.png index 2b245c55a..abb92596d 100644 Binary files a/src/main/resources/assets/create/textures/block/clockwork_bearing_side.png and b/src/main/resources/assets/create/textures/block/clockwork_bearing_side.png differ diff --git a/src/main/resources/assets/create/textures/block/logistical_crafter.png b/src/main/resources/assets/create/textures/block/logistical_crafter.png deleted file mode 100644 index f8185b97e..000000000 Binary files a/src/main/resources/assets/create/textures/block/logistical_crafter.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png b/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png new file mode 100644 index 000000000..d582fd288 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/mechanical_bearing_side.png differ diff --git a/src/main/resources/assets/create/textures/block/rotation_chassis_top.png b/src/main/resources/assets/create/textures/block/rotation_chassis_end.png similarity index 100% rename from src/main/resources/assets/create/textures/block/rotation_chassis_top.png rename to src/main/resources/assets/create/textures/block/rotation_chassis_end.png diff --git a/src/main/resources/assets/create/textures/block/translation_chassis_top.png b/src/main/resources/assets/create/textures/block/translation_chassis_end.png similarity index 100% rename from src/main/resources/assets/create/textures/block/translation_chassis_top.png rename to src/main/resources/assets/create/textures/block/translation_chassis_end.png diff --git a/src/main/resources/assets/create/textures/block/translation_chassis_top_connected.png b/src/main/resources/assets/create/textures/block/translation_chassis_end_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/translation_chassis_top_connected.png rename to src/main/resources/assets/create/textures/block/translation_chassis_end_connected.png diff --git a/src/main/resources/assets/create/textures/block/translation_chassis_top_sticky.png b/src/main/resources/assets/create/textures/block/translation_chassis_end_sticky.png similarity index 100% rename from src/main/resources/assets/create/textures/block/translation_chassis_top_sticky.png rename to src/main/resources/assets/create/textures/block/translation_chassis_end_sticky.png diff --git a/src/main/resources/assets/create/textures/block/translation_chassis_top_sticky_connected.png b/src/main/resources/assets/create/textures/block/translation_chassis_end_sticky_connected.png similarity index 100% rename from src/main/resources/assets/create/textures/block/translation_chassis_top_sticky_connected.png rename to src/main/resources/assets/create/textures/block/translation_chassis_end_sticky_connected.png diff --git a/src/main/resources/assets/create/textures/block/translation_chassis_side_alt.png b/src/main/resources/assets/create/textures/block/translation_chassis_secondary_side.png similarity index 100% rename from src/main/resources/assets/create/textures/block/translation_chassis_side_alt.png rename to src/main/resources/assets/create/textures/block/translation_chassis_secondary_side.png diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json index d7efb91b9..b814e8d7b 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/mechanical_piston.json @@ -16,7 +16,7 @@ "item": "create:andesite_casing" }, "I": { - "item": "create:piston_pole" + "item": "create:piston_extension_pole" } }, "result": { diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_extension_pole.json similarity index 87% rename from src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_extension_pole.json index 6d7e759fc..dbecfd229 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_pole.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/piston_extension_pole.json @@ -14,7 +14,7 @@ } }, "result": { - "item": "create:piston_pole", + "item": "create:piston_extension_pole", "count": 8 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speedometer.json similarity index 91% rename from src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json rename to src/main/resources/data/create/recipes/crafting_shaped/contraptions/speedometer.json index 6dce14f00..f1c1e222b 100644 --- a/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speed_gauge.json +++ b/src/main/resources/data/create/recipes/crafting_shaped/contraptions/speedometer.json @@ -16,7 +16,7 @@ } }, "result": { - "item": "create:speed_gauge", + "item": "create:speedometer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json b/src/main/resources/data/create/recipes/crafting_shapeless/speedometer.json similarity index 59% rename from src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json rename to src/main/resources/data/create/recipes/crafting_shapeless/speedometer.json index b92f1a845..0187e538d 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/stress_gauge.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/speedometer.json @@ -2,11 +2,11 @@ "type": "crafting_shapeless", "ingredients": [ { - "item": "create:speed_gauge" + "item": "create:stressometer" } ], "result": { - "item": "create:stress_gauge", + "item": "create:speedometer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json b/src/main/resources/data/create/recipes/crafting_shapeless/stressometer.json similarity index 59% rename from src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json rename to src/main/resources/data/create/recipes/crafting_shapeless/stressometer.json index bcd34872d..83746416f 100644 --- a/src/main/resources/data/create/recipes/crafting_shapeless/speed_gauge.json +++ b/src/main/resources/data/create/recipes/crafting_shapeless/stressometer.json @@ -2,11 +2,11 @@ "type": "crafting_shapeless", "ingredients": [ { - "item": "create:stress_gauge" + "item": "create:speedometer" } ], "result": { - "item": "create:speed_gauge", + "item": "create:stressometer", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores.json b/src/main/resources/data/forge/tags/blocks/ores.json deleted file mode 100644 index 66c5d81f6..000000000 --- a/src/main/resources/data/forge/tags/blocks/ores.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ores/copper", - "#forge:ores/zinc" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/copper.json b/src/main/resources/data/forge/tags/blocks/ores/copper.json deleted file mode 100644 index 4b386dbe0..000000000 --- a/src/main/resources/data/forge/tags/blocks/ores/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/zinc.json b/src/main/resources/data/forge/tags/blocks/ores/zinc.json deleted file mode 100644 index 9389dcb95..000000000 --- a/src/main/resources/data/forge/tags/blocks/ores/zinc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:zinc_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/stone.json b/src/main/resources/data/forge/tags/blocks/stone.json deleted file mode 100644 index a891eebb6..000000000 --- a/src/main/resources/data/forge/tags/blocks/stone.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - "create:limestone", - "create:polished_limestone", - "create:weathered_limestone", - "create:polished_weathered_limestone", - "create:gabbro", - "create:polished_gabbro", - "create:dolomite", - "create:polished_dolomite", - "create:scoria", - "create:polished_scoria" - - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks.json b/src/main/resources/data/forge/tags/blocks/storage_blocks.json deleted file mode 100644 index 40e9b037b..000000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:storage_blocks/copper", - "#forge:storage_blocks/zinc", - "#forge:storage_blocks/brass" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/brass.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/brass.json deleted file mode 100644 index 1628821d5..000000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/brass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:brass_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/copper.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/copper.json deleted file mode 100644 index 0b5561d1f..000000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/zinc.json b/src/main/resources/data/forge/tags/blocks/storage_blocks/zinc.json deleted file mode 100644 index c4e4a73b8..000000000 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/zinc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:zinc_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots.json b/src/main/resources/data/forge/tags/items/ingots.json deleted file mode 100644 index a39dc5b72..000000000 --- a/src/main/resources/data/forge/tags/items/ingots.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ingots/brass", - "#forge:ingots/copper", - "#forge:ingots/zinc" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/brass.json b/src/main/resources/data/forge/tags/items/ingots/brass.json deleted file mode 100644 index feebc4293..000000000 --- a/src/main/resources/data/forge/tags/items/ingots/brass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:brass_ingot" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/copper.json b/src/main/resources/data/forge/tags/items/ingots/copper.json deleted file mode 100644 index 2617d2aeb..000000000 --- a/src/main/resources/data/forge/tags/items/ingots/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_ingot" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/zinc.json b/src/main/resources/data/forge/tags/items/ingots/zinc.json deleted file mode 100644 index 401a1ea1d..000000000 --- a/src/main/resources/data/forge/tags/items/ingots/zinc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:zinc_ingot" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/nuggets.json b/src/main/resources/data/forge/tags/items/nuggets.json deleted file mode 100644 index f7f1b2aff..000000000 --- a/src/main/resources/data/forge/tags/items/nuggets.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:nuggets/brass", - "#forge:nuggets/copper", - "#forge:nuggets/zinc" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/nuggets/brass.json b/src/main/resources/data/forge/tags/items/nuggets/brass.json deleted file mode 100644 index 3b9add6b0..000000000 --- a/src/main/resources/data/forge/tags/items/nuggets/brass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:brass_nugget" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/nuggets/copper.json b/src/main/resources/data/forge/tags/items/nuggets/copper.json deleted file mode 100644 index 555bdee2c..000000000 --- a/src/main/resources/data/forge/tags/items/nuggets/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_nugget" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/nuggets/zinc.json b/src/main/resources/data/forge/tags/items/nuggets/zinc.json deleted file mode 100644 index 55913868b..000000000 --- a/src/main/resources/data/forge/tags/items/nuggets/zinc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:zinc_nugget" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores.json b/src/main/resources/data/forge/tags/items/ores.json deleted file mode 100644 index 66c5d81f6..000000000 --- a/src/main/resources/data/forge/tags/items/ores.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ores/copper", - "#forge:ores/zinc" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/copper.json b/src/main/resources/data/forge/tags/items/ores/copper.json deleted file mode 100644 index 4b386dbe0..000000000 --- a/src/main/resources/data/forge/tags/items/ores/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/zinc.json b/src/main/resources/data/forge/tags/items/ores/zinc.json deleted file mode 100644 index 9389dcb95..000000000 --- a/src/main/resources/data/forge/tags/items/ores/zinc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:zinc_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates.json b/src/main/resources/data/forge/tags/items/plates.json deleted file mode 100644 index 5a5e32ba0..000000000 --- a/src/main/resources/data/forge/tags/items/plates.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:plates/brass", - "#forge:plates/copper", - "#forge:plates/iron", - "#forge:plates/gold" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates/brass.json b/src/main/resources/data/forge/tags/items/plates/brass.json deleted file mode 100644 index c4b2191c7..000000000 --- a/src/main/resources/data/forge/tags/items/plates/brass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:brass_sheet" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates/copper.json b/src/main/resources/data/forge/tags/items/plates/copper.json deleted file mode 100644 index 71079712b..000000000 --- a/src/main/resources/data/forge/tags/items/plates/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_sheet" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates/gold.json b/src/main/resources/data/forge/tags/items/plates/gold.json deleted file mode 100644 index ba9349551..000000000 --- a/src/main/resources/data/forge/tags/items/plates/gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:gold_sheet" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates/iron.json b/src/main/resources/data/forge/tags/items/plates/iron.json deleted file mode 100644 index cfbf11632..000000000 --- a/src/main/resources/data/forge/tags/items/plates/iron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:iron_sheet" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/stone.json b/src/main/resources/data/forge/tags/items/stone.json deleted file mode 100644 index a891eebb6..000000000 --- a/src/main/resources/data/forge/tags/items/stone.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - "create:limestone", - "create:polished_limestone", - "create:weathered_limestone", - "create:polished_weathered_limestone", - "create:gabbro", - "create:polished_gabbro", - "create:dolomite", - "create:polished_dolomite", - "create:scoria", - "create:polished_scoria" - - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/main/resources/data/forge/tags/items/storage_blocks.json deleted file mode 100644 index 40e9b037b..000000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:storage_blocks/copper", - "#forge:storage_blocks/zinc", - "#forge:storage_blocks/brass" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/brass.json b/src/main/resources/data/forge/tags/items/storage_blocks/brass.json deleted file mode 100644 index 1628821d5..000000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/brass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:brass_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/copper.json b/src/main/resources/data/forge/tags/items/storage_blocks/copper.json deleted file mode 100644 index 0b5561d1f..000000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/zinc.json b/src/main/resources/data/forge/tags/items/storage_blocks/zinc.json deleted file mode 100644 index c4e4a73b8..000000000 --- a/src/main/resources/data/forge/tags/items/storage_blocks/zinc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:zinc_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/rails.json b/src/main/resources/data/minecraft/tags/blocks/rails.json deleted file mode 100644 index 50ede31ea..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/rails.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:cart_assembler" - ] -} \ No newline at end of file