diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index 5de1023a..516ee5dd 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-10-26T18:09:05.509139 Create: The Factory Must Grow's lang merger -0f5cd120ca268ffe432572316ab12b645b413989 assets/tfmg/lang/en_us.json +// 1.19.2 2023-10-26T22:51:36.2504125 Create: The Factory Must Grow's lang merger +3640a34be4ad81c84851611b91c9dbb8652b9e26 assets/tfmg/lang/en_us.json diff --git a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a index 91b03779..86ff4847 100644 --- a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a +++ b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a @@ -1,8 +1,10 @@ -// 1.19.2 2023-10-26T18:09:05.5141389 Registrate Provider for tfmg [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2023-10-26T22:51:36.2574132 Registrate Provider for tfmg [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] e982a263b6af75821042107fdeff7bd809436d08 assets/tfmg/blockstates/air_intake.json +e7f63aadfc892e337d9f87b5e50af8b1c7e4103f assets/tfmg/blockstates/aluminum_bars.json b7f5146505c40c08cdea7ad01fa99048b7ac5451 assets/tfmg/blockstates/aluminum_block.json 98d61dd3ba8781c570e7e823354201039eca602b assets/tfmg/blockstates/aluminum_fluid_valve.json a17662e331f24c3a81cbdd64f67b631645efb9f6 assets/tfmg/blockstates/aluminum_flywheel.json +67d5edbef648081d5078d7800589d90f822545fc assets/tfmg/blockstates/aluminum_ladder.json ce5205eea3a9d14fa3cf96d1a8d6d3f7a3bf3065 assets/tfmg/blockstates/aluminum_mechanical_pump.json 7f626af589ff636c28860aca25c8d3649e719e04 assets/tfmg/blockstates/aluminum_pipe.json 5449c09617ce761c2e3bb5711f5979e9bfabbd7d assets/tfmg/blockstates/aluminum_scaffolding.json @@ -147,6 +149,11 @@ de9db40aec6d8dfe1afc222cd136df66a5ea0ff4 assets/tfmg/blockstates/polished_cut_ba 0e498253d6e9cc8085dba93440b5531d6f4e6d3f assets/tfmg/blockstates/purple_concrete_slab.json cd0efffbfec34f486ff8754fe101d549ecb89b4f assets/tfmg/blockstates/purple_concrete_stairs.json aa93dabc5a9694f94d2a91e6b4060eccfa108a0c assets/tfmg/blockstates/purple_concrete_wall.json +b96efc46401770e0661dc36466ff6b233232e7f5 assets/tfmg/blockstates/rebar_concrete.json +3b3a7878b3ec23aa69ce1eb9672f1ace6d864e38 assets/tfmg/blockstates/rebar_concrete_slab.json +7689b7e22e5b489746a58d9ee5c5c969367c279a assets/tfmg/blockstates/rebar_concrete_stairs.json +3be9647758f9e99c20c13e6851d1c884b1a16553 assets/tfmg/blockstates/rebar_concrete_wall.json +808403dd82b486da74e314f96149ee25267b13af assets/tfmg/blockstates/rebar_formwork_block.json 1e0f2dfa4b2f4af1ecb1da3f1294920ad0cbf16b assets/tfmg/blockstates/red_caution_block.json fd0cfd9937dcf920b376da7a1075747610368b42 assets/tfmg/blockstates/red_concrete.json c56002be5068f20200930306f8bd8d70df304ea0 assets/tfmg/blockstates/red_concrete_slab.json @@ -156,6 +163,7 @@ c56002be5068f20200930306f8bd8d70df304ea0 assets/tfmg/blockstates/red_concrete_sl bf9dcbeabbd8d9da8dcd1cd9d42c3fce6509e7e6 assets/tfmg/blockstates/small_bauxite_brick_slab.json e80f4610e3272a4edfb47572aff71f1db3d283d7 assets/tfmg/blockstates/small_bauxite_brick_stairs.json a2eed7173d7f528d0f068c5fa9ea358f61ef1436 assets/tfmg/blockstates/small_bauxite_brick_wall.json +6e94961a0fb21276b1654a0b7033fb761a1035a0 assets/tfmg/blockstates/steel_bars.json e6983072149d1a9a2f4d39e4e1feac599ff7413e assets/tfmg/blockstates/steel_block.json df44115876045e6f863de2f8be6a9166b336a2f1 assets/tfmg/blockstates/steel_casing.json d5dfa13540bc12cb5b1d0eb29702242ad757a5da assets/tfmg/blockstates/steel_distillation_controller.json @@ -164,6 +172,7 @@ f1763cd1ea42da0645e17ecc9e0c1a1b02502be1 assets/tfmg/blockstates/steel_distillat 72bfce2a2795dfe461beed7c3a074e328de14d96 assets/tfmg/blockstates/steel_fluid_tank.json e29906d296994a13fefc2beb22f7693e1027dd1b assets/tfmg/blockstates/steel_fluid_valve.json 894e5f144506049efe96bcfb07302c569c31a631 assets/tfmg/blockstates/steel_flywheel.json +2e78051bfa9dfb4520047264778787c6d25b7490 assets/tfmg/blockstates/steel_ladder.json 6041673298a81819601e832e560771d21ddd01e9 assets/tfmg/blockstates/steel_mechanical_pump.json 2305048c06767d728d10242e152f25911c1489fd assets/tfmg/blockstates/steel_pipe.json 458c9abec2a978607ba751741bdf5e90b952c8f2 assets/tfmg/blockstates/steel_scaffolding.json @@ -181,9 +190,12 @@ a91a739eb2fe9a2d24c409d2be93501503f87090 assets/tfmg/blockstates/white_concrete_ 98c9aa212e82100d7fc47354760940cc946594d4 assets/tfmg/blockstates/yellow_concrete_slab.json a1988ec6a98f23cad8321b46345fbf1c5fd20489 assets/tfmg/blockstates/yellow_concrete_stairs.json c58fa20c091e5ecddfb7164cba45538a8f911431 assets/tfmg/blockstates/yellow_concrete_wall.json -bc1a013d8959af8c19c49b31be384d03db5098af assets/tfmg/lang/en_ud.json -d802a432b8c67eb5e0a871f940c6c19b3fa92526 assets/tfmg/lang/en_us.json +8910f7cd1b74825adfce5279357f33706b67601c assets/tfmg/lang/en_ud.json +a084c6512874b3c3f2de726a1d98dcdadcf455a9 assets/tfmg/lang/en_us.json 9e6a6b62f5e7528c4e4d4f72f3510edcd8f0c078 assets/tfmg/models/block/aluminum_block.json +da469bf3233944085f07d4ef437827061e408838 assets/tfmg/models/block/aluminum_cap.json +4344f14c42bb7a9f90120b5f75927015c0edc3bc assets/tfmg/models/block/aluminum_cap_alt.json +f8e1f1798fa66b8a3a3c4f5a7abb2158947ef937 assets/tfmg/models/block/aluminum_ladder.json 2d08bfe6f5ad5e2629348febc1287318c28e7fa8 assets/tfmg/models/block/aluminum_pipe/d_x.json 7dfa77ec84ce2ce2f30ea25fbe983491ee7ee9ff assets/tfmg/models/block/aluminum_pipe/d_y.json 22c82f6577d7f43714bbd1469e8874f266d11165 assets/tfmg/models/block/aluminum_pipe/d_z.json @@ -214,8 +226,12 @@ d419a0e009c7e6fda74d5440b8aa1883ea9ae0bf assets/tfmg/models/block/aluminum_pipe/ dcb1ee2a2a687e65714562682a988e5476abcc0c assets/tfmg/models/block/aluminum_pipe/u_x.json 2767b9675ff0123303e8d55cb35b78ffe7c2f48d assets/tfmg/models/block/aluminum_pipe/u_y.json 853f6ccff4dd4f1e91ca32cc99b3f9b940964d67 assets/tfmg/models/block/aluminum_pipe/u_z.json +6ee204f3769086a0a7c2006a33896c0a7f82e707 assets/tfmg/models/block/aluminum_post.json +3bf978d8d9e47db561cd6e5a19594fa5eb247767 assets/tfmg/models/block/aluminum_post_ends.json 860b3a4440036a6fa7b5fd3cf35a4c781c886af5 assets/tfmg/models/block/aluminum_scaffolding.json 5dbb161df0abb21ffb49f22f067c656c39f4bbb3 assets/tfmg/models/block/aluminum_scaffolding_horizontal.json +113f288893b346e3908550b7ab8756cc13b245ed assets/tfmg/models/block/aluminum_side.json +7c833851ff1ce26558f61eaab98230ebda56f94d assets/tfmg/models/block/aluminum_side_alt.json 5a4c785e8d8394ccd125732c0017459648574c4e assets/tfmg/models/block/bauxite_natural_0.json 4ace0da00498fcbb9ddfdf321767b40b095c8778 assets/tfmg/models/block/bauxite_natural_1.json 3d19a151c9691f26b22050d0556e85420dd07ecd assets/tfmg/models/block/bauxite_natural_2.json @@ -504,6 +520,15 @@ ed75898bcabca38c33cf3b5f4cdf542ad8f43823 assets/tfmg/models/block/purple_concret 7bcab3a84f3216ad78782f41ea03b1294fa66e18 assets/tfmg/models/block/purple_concrete_wall_post.json 53fec6bdb6dfe8b9a75efc0e6e58560c8b616231 assets/tfmg/models/block/purple_concrete_wall_side.json dc6efe4ecdf11fdabd48bd635343571341e0c7a1 assets/tfmg/models/block/purple_concrete_wall_side_tall.json +252dbef72a2bce4a5dcd00014577d626f68631a6 assets/tfmg/models/block/rebar_concrete.json +0d87e5ecb5177cb64c1660099b2cc92dfec3024b assets/tfmg/models/block/rebar_concrete_bottom.json +0797790188731b89384ab9fe360f368e117b3a78 assets/tfmg/models/block/rebar_concrete_stairs.json +d1ab2179541a2d7430c5284883a4fae282abb3ad assets/tfmg/models/block/rebar_concrete_stairs_inner.json +5d664ba30ebfe8bdfaf159cfa4bb6f58ff931166 assets/tfmg/models/block/rebar_concrete_stairs_outer.json +2089c23338f9bfe7aa95bf1a7fbcfd0f5708c05b assets/tfmg/models/block/rebar_concrete_top.json +520be60f6e4bba929e819ff47e269d264b20efe6 assets/tfmg/models/block/rebar_concrete_wall_post.json +c87141c3138508680d3427c74c9961a247dcbe4a assets/tfmg/models/block/rebar_concrete_wall_side.json +c2d6ad061cc51729136bb89c5708280f9f031f83 assets/tfmg/models/block/rebar_concrete_wall_side_tall.json 8f43594e905019a412c42a91a5428019a1f8b566 assets/tfmg/models/block/red_caution_block.json 1a7e3178749d61380189e5d2e82a449a7af955e9 assets/tfmg/models/block/red_concrete.json e31bd8cef2a057dd918c9d7f5324585b317391ab assets/tfmg/models/block/red_concrete_bottom.json @@ -524,9 +549,12 @@ d29800a63ca2717e056798cf8bb29bf55d29a07c assets/tfmg/models/block/small_bauxite_ 7f4bdf3f4059dc1cda60557d59f5440addd26547 assets/tfmg/models/block/small_bauxite_brick_stairs_inner.json a07354a238bd4d5aadee6e60e1d61fcffde43f5b assets/tfmg/models/block/small_bauxite_brick_stairs_outer.json 0ceb30eaff16a495c9a165ca16c925cbff836755 assets/tfmg/models/block/steel_block.json +bf29a468e4816a6238c142286ef55d1ca8c6d099 assets/tfmg/models/block/steel_cap.json +e83ff0c23ac346f471257c2b082688793eeeed8c assets/tfmg/models/block/steel_cap_alt.json 465b1fed10d06090e5e8d19457f9fa48fe890bb4 assets/tfmg/models/block/steel_casing.json 8ec65bf20fa41bb1b246b4a60feed65c48befb2f assets/tfmg/models/block/steel_distillation_controller.json 2a5a4724f942aab7296062cdaa5259c4a7904e1a assets/tfmg/models/block/steel_distillation_output.json +93e9dc75614de03258c154ca604737856f9eb569 assets/tfmg/models/block/steel_ladder.json 0c4fcf6e901d8eba56ba67999fcf0801534779d6 assets/tfmg/models/block/steel_pipe/d_x.json 6060082caaef1e6e6fc72606d6a74e64aaeb27ac assets/tfmg/models/block/steel_pipe/d_y.json dc62a6a3de9e73e7341481df09951a7ec3caf944 assets/tfmg/models/block/steel_pipe/d_z.json @@ -557,9 +585,13 @@ d34e5efd71420623baab6ff86cbb9a68abcb343d assets/tfmg/models/block/steel_pipe/ud_ 68d79052c90cbfad2c4730673395b5f58ad73293 assets/tfmg/models/block/steel_pipe/u_x.json e583e8755126d362e21057464e2f12af3f32ba25 assets/tfmg/models/block/steel_pipe/u_y.json 56b3110e7a55c08302e27d5b7f32f7b7b9cd60a0 assets/tfmg/models/block/steel_pipe/u_z.json +7e8d91d0f9c247d9c8909f98497a3c71180fea9e assets/tfmg/models/block/steel_post.json +547d1739a3221c39bf8a856e27901e25877f9918 assets/tfmg/models/block/steel_post_ends.json f8c535c59e85b8af0c8701596cd08b72ca38036f assets/tfmg/models/block/steel_scaffolding.json aad5b54daf86c0aa5e100475de443cd2c3234020 assets/tfmg/models/block/steel_scaffolding_horizontal.json c7b153dff2ba1a88f02e950cc8d28d61bd68b1df assets/tfmg/models/block/steel_sheetmetal.json +761696519471a65d0e973626503b30c2951e1168 assets/tfmg/models/block/steel_side.json +b99f7af6743a7b9d45f6c41b98d7be73dfa48529 assets/tfmg/models/block/steel_side_alt.json af77b90a54211755c652dd770dfe1a2045232a07 assets/tfmg/models/block/white_concrete.json f023d118727ff33523c213a89a28c8bc79d64268 assets/tfmg/models/block/white_concrete_bottom.json af1962e1b6b34e9b5447b99d22b2c44d8e3bdb01 assets/tfmg/models/block/white_concrete_stairs.json @@ -579,10 +611,12 @@ fea28ae2dbee700a4219f227bf6a87502b31cb05 assets/tfmg/models/block/yellow_concret 0a642864362409bfc889345a8a4605c111b326c6 assets/tfmg/models/block/yellow_concrete_wall_side.json 099f4b7adf652892d7ec572c6f9e38053089c097 assets/tfmg/models/block/yellow_concrete_wall_side_tall.json 500ce6e858f96a48d1871fe4c02404faa2ccac29 assets/tfmg/models/item/air_intake.json +f5f0b056cb26ccb089e8f6fea940e268c059aa72 assets/tfmg/models/item/aluminum_bars.json 714173e054b787915b8cebfb50deb61b28dba5a3 assets/tfmg/models/item/aluminum_block.json 20b601339c356f8103e98437e762bf48f96e02b5 assets/tfmg/models/item/aluminum_fluid_valve.json 5c1c14519742d92c3a6f00e4d70516222868be79 assets/tfmg/models/item/aluminum_flywheel.json f685ca653c8e197986b1ac8f43297989816d39d2 assets/tfmg/models/item/aluminum_ingot.json +b10879f41ab3fd52edc0d1cbbadfe1704614563a assets/tfmg/models/item/aluminum_ladder.json ecab250699b802a1358dccdabaca2181520324ec assets/tfmg/models/item/aluminum_mechanical_pump.json 76e794a58d8956b3a61faf5b403f9834952270c3 assets/tfmg/models/item/aluminum_pipe.json 5ee0c86ca83156e30da61d6f42e0a8a29833e845 assets/tfmg/models/item/aluminum_scaffolding.json @@ -723,6 +757,11 @@ a6da50f604abf3b381b447c494a217cdac2a9b65 assets/tfmg/models/item/pumpjack_base.j fcc22d0322de977957e8353c7b9108e79fdca094 assets/tfmg/models/item/purple_concrete_stairs.json 3e797f9092ecfb4472a44c35e31c22528548930e assets/tfmg/models/item/purple_concrete_wall.json 3cfdbac1c06b4e75416fcd24a93616d98f59d6e3 assets/tfmg/models/item/quad_potato_cannon.json +94dd27526967032c1ab4f94d19ad24a60a03c278 assets/tfmg/models/item/rebar_concrete.json +e3b67501716b8e2dd5b4043c95a55e08e10c3322 assets/tfmg/models/item/rebar_concrete_slab.json +f34c9b5f7396d6250df8956178a83f0a55c7c119 assets/tfmg/models/item/rebar_concrete_stairs.json +160651c3b71d4f04183cf35fdf42a1be748f2488 assets/tfmg/models/item/rebar_concrete_wall.json +0d706ad9468cb7bc1afaae08d469203e32708daf assets/tfmg/models/item/rebar_formwork_block.json c6dc84119d26bd41d755fe884ef9b4c59863f43a assets/tfmg/models/item/red_caution_block.json 779a4b7ec8fbe631fca0047390f817002ee85a90 assets/tfmg/models/item/red_concrete.json 246ed9eeac9898bc2e495e82f650a989797a8804 assets/tfmg/models/item/red_concrete_slab.json @@ -733,6 +772,7 @@ c00f7c5c7d05936bbe6a3069116c5adba5c60acf assets/tfmg/models/item/small_bauxite_b f1fffad853ccb4173ba63efaf89ce0bf112915a8 assets/tfmg/models/item/small_bauxite_brick_slab.json a1149d3ee5596f2c1038b225b0086ae1601da82c assets/tfmg/models/item/small_bauxite_brick_stairs.json 0f3f7918e41afa95cc14bc6641a7beaf36c27621 assets/tfmg/models/item/small_bauxite_brick_wall.json +5858abf66f833c30155b0a4997c70da3dbd92c79 assets/tfmg/models/item/steel_bars.json 57bf86df814741f846feb8be4a10afe633f51721 assets/tfmg/models/item/steel_block.json d34ca92f5288cbb5cecee06f046a072763b2926c assets/tfmg/models/item/steel_casing.json ec731aefdbbbaca3a4dac8ac2d6bd2d0aa6ebef5 assets/tfmg/models/item/steel_distillation_controller.json @@ -742,6 +782,7 @@ ec731aefdbbbaca3a4dac8ac2d6bd2d0aa6ebef5 assets/tfmg/models/item/steel_distillat 57bc28274df7d54eaa3fa1991481c6339f9e2247 assets/tfmg/models/item/steel_fluid_valve.json fa25fce00275dd2abdfe47ccf041c590bf558b8c assets/tfmg/models/item/steel_flywheel.json 61e64ad93db0bd29dec2221633c4552f37026784 assets/tfmg/models/item/steel_ingot.json +c986ff3f4535131aa6cb406a4db89eab5cb9ba8e assets/tfmg/models/item/steel_ladder.json 4cea5b158cc0789fcdc8808250b993160bc62268 assets/tfmg/models/item/steel_mechanical_pump.json 4fb5ba811196a402c750a379145aa0a14471ddc3 assets/tfmg/models/item/steel_pipe.json ee8c3438bbd74eaaa5d0423695365d2a5b1c4bb1 assets/tfmg/models/item/steel_scaffolding.json @@ -762,12 +803,15 @@ ece959a56af46e02f993c12fe921dc1660019686 assets/tfmg/models/item/yellow_concrete 78c30e30b8cd20f404ead48c4e99a56dee2de5fd assets/tfmg/models/item/yellow_concrete_wall.json f189171410564631c6074593da126b8d13fe9f8b assets/tfmg/models/item/zinc_grenade.json 2b45163d462fba0e86bb1ac8fc299509fbe1e58d data/create/tags/blocks/casing.json +7ccd4f3b039657a327db874b0e323c849f5379af data/create/tags/blocks/fan_transparent.json 9a8aad958d152f0e92d5797d13337a3970e35ec5 data/create/tags/blocks/safe_nbt.json +7ccd4f3b039657a327db874b0e323c849f5379af data/create/tags/blocks/wrench_pickup.json 2b45163d462fba0e86bb1ac8fc299509fbe1e58d data/create/tags/items/casing.json 1fdd0efd4d4b48c3d5989a7c43e53a6d1c2adc2b data/create/tags/items/contraption_controlled.json 78cf234c1c82452667e84ff2eb4664b829dbc7e0 data/create/tags/items/create_ingots.json f0989952061266a02499103c1dcd9f2d7da131f5 data/forge/tags/blocks/concrete.json 70a8aa765e47c316b6ce830cec9913edc0173d7b data/forge/tags/blocks/factory_floor.json +ec0bfe5dc43ffc30aeec49a1171fab05e6344514 data/forge/tags/blocks/rebar_concrete.json 9961f58b367dd938ccecef35bb79a2e5eed85e44 data/forge/tags/blocks/storage_blocks.json 5f36040d029001793eb338e1a8c5d95b9abcc9b3 data/forge/tags/blocks/storage_blocks/aluminum.json 7c5615c56bb169570a061f052ebb1f5115760c16 data/forge/tags/blocks/storage_blocks/cast_iron.json @@ -784,31 +828,37 @@ f1cc6d710a5e49ab33dbaceea796f0c0b589c82b data/forge/tags/items/dusts/coal_coke.j 70e609465aa949ff4acc873fb19d4afc07f79aa1 data/forge/tags/items/ingots/aluminum.json 2da28c9441f79389929080f6f31da841bbee19e7 data/forge/tags/items/ingots/cast_iron.json db02fa414c4049eef32e5270451417518bbcec4b data/forge/tags/items/ingots/steel.json +ec0bfe5dc43ffc30aeec49a1171fab05e6344514 data/forge/tags/items/rebar_concrete.json 9961f58b367dd938ccecef35bb79a2e5eed85e44 data/forge/tags/items/storage_blocks.json 5f36040d029001793eb338e1a8c5d95b9abcc9b3 data/forge/tags/items/storage_blocks/aluminum.json 7c5615c56bb169570a061f052ebb1f5115760c16 data/forge/tags/items/storage_blocks/cast_iron.json 37b1c9c3ae722d8110db48015993ede3e194c0a0 data/forge/tags/items/storage_blocks/steel.json 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/azalea_root_replaceable.json 4efbb6259aa76172dcaafcc57aadf290d505d424 data/minecraft/tags/blocks/beacon_base_blocks.json -3a4ceed949ec74d1a36430d7e1d08807abf22db5 data/minecraft/tags/blocks/climbable.json +9f3c742419de5acc4e6376ce431afe21d3a22e49 data/minecraft/tags/blocks/climbable.json 1fdd0efd4d4b48c3d5989a7c43e53a6d1c2adc2b data/minecraft/tags/blocks/doors.json 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/dripstone_replaceable_blocks.json 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/lush_ground_replaceable.json -65470261e209618644e4812cd4f0ead413008234 data/minecraft/tags/blocks/mineable/axe.json -5bd4cec588ebd24e93c2a0d278cb4ea592aee014 data/minecraft/tags/blocks/mineable/pickaxe.json +78dd479c02a4d74f7f2e94a49b5f69c7c44e0a22 data/minecraft/tags/blocks/mineable/axe.json +d5635a0e318b09e2f5d9c5b7fe70f250e9ed5b23 data/minecraft/tags/blocks/mineable/pickaxe.json 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/moss_replaceable.json +308629590ea6d2511f33b1f6f145273d6d8512a1 data/minecraft/tags/blocks/needs_diamond_tool.json 4faa86094bcb398aac8f593c4f344c7dfe91b179 data/minecraft/tags/blocks/needs_iron_tool.json -8b459e049c46ec8b8fa68be12daaade6114e5acb data/minecraft/tags/blocks/needs_stone_tool.json +50009287611dd20dd887f9b0ce926773267658d6 data/minecraft/tags/blocks/needs_stone_tool.json 193c8b45d804216ca5fe2035fa8dfc4567303500 data/minecraft/tags/blocks/slabs.json -921a73a3708f842acbba5b89aa5cd3be5ca2cda8 data/minecraft/tags/blocks/stairs.json -9507572dc6b3e1bc63373df441c3e525b4ff5781 data/minecraft/tags/blocks/walls.json +64778c41570f87475b2f624f752895b50e5e2338 data/minecraft/tags/blocks/stairs.json +88468ee922e1c005103e5f0a10c855a8b36afe53 data/minecraft/tags/blocks/walls.json 1fdd0efd4d4b48c3d5989a7c43e53a6d1c2adc2b data/minecraft/tags/blocks/wooden_doors.json 1fdd0efd4d4b48c3d5989a7c43e53a6d1c2adc2b data/minecraft/tags/items/doors.json 193c8b45d804216ca5fe2035fa8dfc4567303500 data/minecraft/tags/items/slabs.json e02820ff93a8835947837b6b7e4f75b90a365ffb data/minecraft/tags/items/stairs.json 0472af44cb3c69aa62ace428304592aacc443045 data/minecraft/tags/items/walls.json 1fdd0efd4d4b48c3d5989a7c43e53a6d1c2adc2b data/quark/tags/blocks/non_double_door.json +c934bb07e441bc9614a1e0af96b69066b455acca data/tfmg/advancements/recipes/tfmg.base/aluminum_bars_from_ingots_aluminum_stonecutting.json +07270d924ff75865a1663d9d58d30866daf0fa75 data/tfmg/advancements/recipes/tfmg.base/aluminum_ladder_from_ingots_aluminum_stonecutting.json 2863e25dd9f10adaa767251eb488c5756c00b75b data/tfmg/advancements/recipes/tfmg.base/aluminum_scaffolding_from_ingots_steel_stonecutting.json +7f81bebdbee6b3707108941b4c48c3b1755c3c80 data/tfmg/advancements/recipes/tfmg.base/steel_bars_from_ingots_steel_stonecutting.json +da6203bc624eb2f8d81058e7a2811c45afe9f43b data/tfmg/advancements/recipes/tfmg.base/steel_ladder_from_ingots_steel_stonecutting.json c572a2e966fd88e61d82d83f2a17f739d4f98b89 data/tfmg/advancements/recipes/tfmg.base/steel_scaffolding_from_ingots_steel_stonecutting.json 7796b85e86a28b753b90089a522eca12c5722e5e data/tfmg/advancements/recipes/tfmg.building/bauxite_from_stone_types_bauxite_stonecutting.json 179e5950865e8114ff5cbe443dedf44e6c1d5342 data/tfmg/advancements/recipes/tfmg.building/bauxite_pillar_from_stone_types_bauxite_stonecutting.json @@ -846,9 +896,11 @@ d152c8826235944ea57ff042dcd0bd19e13a7c29 data/tfmg/advancements/recipes/tfmg.bui 5fdcb4254dd2c1e8cd2651777746354e71dfc0a8 data/tfmg/advancements/recipes/tfmg.building/small_bauxite_brick_wall.json 57365f0ab8f3026cc2d5ea959bab5fc2af0d0838 data/tfmg/advancements/recipes/tfmg.building/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json d0368a0d34b9b4635e1114f16b2708871230d98a data/tfmg/loot_tables/blocks/air_intake.json +af7910788c20c8ce874e080395f6e4415e93250d data/tfmg/loot_tables/blocks/aluminum_bars.json a4b393a2526bd10fa38095ac80769f913f139889 data/tfmg/loot_tables/blocks/aluminum_block.json 0ddb37097b4d6d820cc4d21d9ba710b1850a82d1 data/tfmg/loot_tables/blocks/aluminum_fluid_valve.json 316b461484cac9a6fc54b5643a6b17c1c690012a data/tfmg/loot_tables/blocks/aluminum_flywheel.json +2fda3996bc55443f6024e080e2c847e0e415b9f3 data/tfmg/loot_tables/blocks/aluminum_ladder.json 04121f87f8b58addd014fc1bd2534afceaa634aa data/tfmg/loot_tables/blocks/aluminum_mechanical_pump.json d46246b8c76b469ec180a6322bb3a579b2e7e1e1 data/tfmg/loot_tables/blocks/aluminum_pipe.json fcac46a9fc0ed03c5f13b22ca53a546309663a7b data/tfmg/loot_tables/blocks/aluminum_scaffolding.json @@ -980,6 +1032,11 @@ a7b1c84c642fca2ff1bc807a4a7ffc3523412960 data/tfmg/loot_tables/blocks/purple_con 2aed66c7d2d875f76b0b1ba71ed3aaa88fd3a624 data/tfmg/loot_tables/blocks/purple_concrete_slab.json c4398538bd49663659fd2a503fc6e524495abc90 data/tfmg/loot_tables/blocks/purple_concrete_stairs.json c49fc371a79027e6d13ac15b08b5ba5c680c6448 data/tfmg/loot_tables/blocks/purple_concrete_wall.json +322d85ef8f56aad532d60ac4ff9fb788305281b4 data/tfmg/loot_tables/blocks/rebar_concrete.json +01370f670e392ae9aa5a93a35c808650659ac066 data/tfmg/loot_tables/blocks/rebar_concrete_slab.json +74fca2fc8535eef9be852ee4d5c0c028d5b43a9b data/tfmg/loot_tables/blocks/rebar_concrete_stairs.json +7b8a02cddcc27882f2dd3c04cdc2277cbeee01f0 data/tfmg/loot_tables/blocks/rebar_concrete_wall.json +e24ff422a6054f7c4ee5eb71b36cc183dbd46a7c data/tfmg/loot_tables/blocks/rebar_formwork_block.json 38d800701ecf7e2efd0dcfba077c25d0bf892401 data/tfmg/loot_tables/blocks/red_caution_block.json e19ba049e8388d728b6e2e8faee1321f221a7401 data/tfmg/loot_tables/blocks/red_concrete.json 98550bd835e5bcd93cada2cd11929283012ef98d data/tfmg/loot_tables/blocks/red_concrete_slab.json @@ -989,6 +1046,7 @@ a16309a5204c34addc1b1188d88bee22115686b8 data/tfmg/loot_tables/blocks/red_concre 211d6ba8f5576975698ad91ebdf5feb36f618ac7 data/tfmg/loot_tables/blocks/small_bauxite_brick_slab.json b43d1fa7a2ac0534ab2867dec787d97f205f4a8d data/tfmg/loot_tables/blocks/small_bauxite_brick_stairs.json 47af1defc5e03a0806d8afd5f119fab420aa1da8 data/tfmg/loot_tables/blocks/small_bauxite_brick_wall.json +cd894212448d934dc97d10c52a60e4b0d43b696f data/tfmg/loot_tables/blocks/steel_bars.json 01298989d0fe79936cdfa1e6cc07fd05f143ae09 data/tfmg/loot_tables/blocks/steel_block.json 62cd229b00eb2c95187d1b7b8e968aa26e54c412 data/tfmg/loot_tables/blocks/steel_casing.json d0dfd69e4ebbcd28a2f0666bb3f3713a0bfa9863 data/tfmg/loot_tables/blocks/steel_distillation_controller.json @@ -997,6 +1055,7 @@ b0adec80b5b6c3226bd6d7044556351244474cd4 data/tfmg/loot_tables/blocks/steel_door da3aa200dc67d6a7bfbb0bb9e988a325fed4c670 data/tfmg/loot_tables/blocks/steel_fluid_tank.json 7b78ebb7567c8b6b88a334761fbb702d17e5b337 data/tfmg/loot_tables/blocks/steel_fluid_valve.json bb2ab81523590ae0175cb5cf3d441b3b02580633 data/tfmg/loot_tables/blocks/steel_flywheel.json +149a923b828e0ad98edbd0b088ab2010bd52bffd data/tfmg/loot_tables/blocks/steel_ladder.json 216c23070392c7c085c111a0a220ae46ba8f9491 data/tfmg/loot_tables/blocks/steel_mechanical_pump.json 1622328d319fc3c71269b0f9f1aef43a77132f3a data/tfmg/loot_tables/blocks/steel_pipe.json 2a1680bc24d4b185f762c80f09e5bf322e15e0ac data/tfmg/loot_tables/blocks/steel_scaffolding.json @@ -1014,6 +1073,8 @@ b470766d902449f7a8e68ac549e249b0661e862d data/tfmg/loot_tables/blocks/turbine_en 31840bf3e10c8fa241880b9571f98c8ce8855d8d data/tfmg/loot_tables/blocks/yellow_concrete_slab.json 46c00f185eecfc41645e5c9485cea8150c0838ff data/tfmg/loot_tables/blocks/yellow_concrete_stairs.json 46943b7a6b76dd913a48f9fd4d2bcf3aa4dce968 data/tfmg/loot_tables/blocks/yellow_concrete_wall.json +08d522d3e54ea086bcfd64e9b789c27bc91c2bfe data/tfmg/recipes/aluminum_bars_from_ingots_aluminum_stonecutting.json +cf5d26b3a7dc9d7453e959d04c33b1366eb866c9 data/tfmg/recipes/aluminum_ladder_from_ingots_aluminum_stonecutting.json ed8d2b5f820615aad40e69ab14680f685c6b8b6c data/tfmg/recipes/aluminum_scaffolding_from_ingots_steel_stonecutting.json fe8fbd529304f28f4aeb1017956f288f6e6bbe1c data/tfmg/recipes/bauxite_from_stone_types_bauxite_stonecutting.json 9bddb0ff48b335428001ae0526e41ab6d09da1c3 data/tfmg/recipes/bauxite_pillar_from_stone_types_bauxite_stonecutting.json @@ -1050,5 +1111,7 @@ fe29195b7a25d02945a2c1fd37571f330b34baa6 data/tfmg/recipes/polished_cut_bauxite_ 968863d8afacbdea430384bb8fb0e38fbd6577f4 data/tfmg/recipes/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json 109f06446bf190cd5e4f65a1e48381d589a73c22 data/tfmg/recipes/small_bauxite_brick_wall.json 0a6421d9c9bdeb2faa18c6658097c681191aa760 data/tfmg/recipes/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json +c7e505deac40793fdace9d4c077a270eb0c60dcb data/tfmg/recipes/steel_bars_from_ingots_steel_stonecutting.json +dabc391815eb424043a4138e9b6e6ed27f42f988 data/tfmg/recipes/steel_ladder_from_ingots_steel_stonecutting.json bb9c2e0df90c9b7f7c0b69390b2cbcc7fd08523a data/tfmg/recipes/steel_scaffolding_from_ingots_steel_stonecutting.json 1b01f27da52b48305c3efbba7d07ecd82d90d2f1 data/tfmg/tags/items/stone_types/bauxite.json diff --git a/src/generated/resources/assets/tfmg/blockstates/aluminum_bars.json b/src/generated/resources/assets/tfmg/blockstates/aluminum_bars.json new file mode 100644 index 00000000..4c3802f8 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/aluminum_bars.json @@ -0,0 +1,100 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/aluminum_post_ends" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_post" + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_cap" + }, + "when": { + "east": "false", + "north": "true", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_cap", + "y": 90 + }, + "when": { + "east": "true", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_cap_alt" + }, + "when": { + "east": "false", + "north": "false", + "south": "true", + "west": "false" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_cap_alt", + "y": 90 + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "true" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "tfmg:block/aluminum_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/aluminum_ladder.json b/src/generated/resources/assets/tfmg/blockstates/aluminum_ladder.json new file mode 100644 index 00000000..5f1f1c6d --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/aluminum_ladder.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=east,waterlogged=false": { + "model": "tfmg:block/aluminum_ladder", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "tfmg:block/aluminum_ladder", + "y": 90 + }, + "facing=north,waterlogged=false": { + "model": "tfmg:block/aluminum_ladder" + }, + "facing=north,waterlogged=true": { + "model": "tfmg:block/aluminum_ladder" + }, + "facing=south,waterlogged=false": { + "model": "tfmg:block/aluminum_ladder", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "tfmg:block/aluminum_ladder", + "y": 180 + }, + "facing=west,waterlogged=false": { + "model": "tfmg:block/aluminum_ladder", + "y": 270 + }, + "facing=west,waterlogged=true": { + "model": "tfmg:block/aluminum_ladder", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/rebar_concrete.json b/src/generated/resources/assets/tfmg/blockstates/rebar_concrete.json new file mode 100644 index 00000000..27d5e95a --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/rebar_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/rebar_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_slab.json new file mode 100644 index 00000000..966a69b1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/rebar_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/rebar_concrete" + }, + "type=top": { + "model": "tfmg:block/rebar_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_stairs.json new file mode 100644 index 00000000..1c68cbb3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/rebar_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/rebar_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/rebar_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/rebar_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/rebar_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/rebar_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/rebar_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/rebar_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/rebar_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/rebar_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/rebar_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/rebar_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/rebar_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/rebar_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_wall.json new file mode 100644 index 00000000..6a53dae4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/rebar_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/rebar_concrete_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/rebar_formwork_block.json b/src/generated/resources/assets/tfmg/blockstates/rebar_formwork_block.json new file mode 100644 index 00000000..07b76e8e --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/rebar_formwork_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/rebar_formwork_block/block_base" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/steel_bars.json b/src/generated/resources/assets/tfmg/blockstates/steel_bars.json new file mode 100644 index 00000000..a9bc86cd --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/steel_bars.json @@ -0,0 +1,100 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/steel_post_ends" + } + }, + { + "apply": { + "model": "tfmg:block/steel_post" + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "tfmg:block/steel_cap" + }, + "when": { + "east": "false", + "north": "true", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "tfmg:block/steel_cap", + "y": 90 + }, + "when": { + "east": "true", + "north": "false", + "south": "false", + "west": "false" + } + }, + { + "apply": { + "model": "tfmg:block/steel_cap_alt" + }, + "when": { + "east": "false", + "north": "false", + "south": "true", + "west": "false" + } + }, + { + "apply": { + "model": "tfmg:block/steel_cap_alt", + "y": 90 + }, + "when": { + "east": "false", + "north": "false", + "south": "false", + "west": "true" + } + }, + { + "apply": { + "model": "tfmg:block/steel_side" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "tfmg:block/steel_side", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "tfmg:block/steel_side_alt" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "tfmg:block/steel_side_alt", + "y": 90 + }, + "when": { + "west": "true" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/steel_ladder.json b/src/generated/resources/assets/tfmg/blockstates/steel_ladder.json new file mode 100644 index 00000000..88614e34 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/steel_ladder.json @@ -0,0 +1,34 @@ +{ + "variants": { + "facing=east,waterlogged=false": { + "model": "tfmg:block/steel_ladder", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "tfmg:block/steel_ladder", + "y": 90 + }, + "facing=north,waterlogged=false": { + "model": "tfmg:block/steel_ladder" + }, + "facing=north,waterlogged=true": { + "model": "tfmg:block/steel_ladder" + }, + "facing=south,waterlogged=false": { + "model": "tfmg:block/steel_ladder", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "tfmg:block/steel_ladder", + "y": 180 + }, + "facing=west,waterlogged=false": { + "model": "tfmg:block/steel_ladder", + "y": 270 + }, + "facing=west,waterlogged=true": { + "model": "tfmg:block/steel_ladder", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/lang/en_ud.json b/src/generated/resources/assets/tfmg/lang/en_ud.json index 39c3145b..b5b537b2 100644 --- a/src/generated/resources/assets/tfmg/lang/en_ud.json +++ b/src/generated/resources/assets/tfmg/lang/en_ud.json @@ -1,8 +1,10 @@ { "block.tfmg.air_intake": "ǝʞɐʇuI ɹıⱯ", + "block.tfmg.aluminum_bars": "sɹɐᗺ ɯnuıɯnןⱯ", "block.tfmg.aluminum_block": "ɯnuıɯnןⱯ ɟo ʞɔoןᗺ", "block.tfmg.aluminum_fluid_valve": "ǝʌןɐΛ pınןℲ ɯnuıɯnןⱯ", "block.tfmg.aluminum_flywheel": "ןǝǝɥʍʎןℲ ɯnuıɯnןⱯ", + "block.tfmg.aluminum_ladder": "ɹǝppɐꞀ ɯnuıɯnןⱯ", "block.tfmg.aluminum_mechanical_pump": "dɯnԀ ןɐɔıuɐɥɔǝW ɯnuıɯnןⱯ", "block.tfmg.aluminum_pipe": "ǝdıԀ ɯnuıɯnןⱯ", "block.tfmg.aluminum_scaffolding": "buıpןoɟɟɐɔS ɯnuıɯnןⱯ", @@ -147,6 +149,11 @@ "block.tfmg.purple_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝןdɹnԀ", "block.tfmg.purple_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝןdɹnԀ", "block.tfmg.purple_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝןdɹnԀ", + "block.tfmg.rebar_concrete": "ǝʇǝɹɔuoƆ ɹɐqǝᴚ", + "block.tfmg.rebar_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ɹɐqǝᴚ", + "block.tfmg.rebar_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ɹɐqǝᴚ", + "block.tfmg.rebar_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ɹɐqǝᴚ", + "block.tfmg.rebar_formwork_block": "ʞɔoןᗺ ʞɹoʍɯɹoℲ ɹɐqǝᴚ", "block.tfmg.red_caution_block": "ʞɔoןᗺ uoıʇnɐƆ pǝᴚ", "block.tfmg.red_concrete": "ǝʇǝɹɔuoƆ pǝᴚ", "block.tfmg.red_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ pǝᴚ", @@ -156,6 +163,7 @@ "block.tfmg.small_bauxite_brick_stairs": "sɹıɐʇS ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", "block.tfmg.small_bauxite_brick_wall": "ןןɐM ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", "block.tfmg.small_bauxite_bricks": "sʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", + "block.tfmg.steel_bars": "sɹɐᗺ ןǝǝʇS", "block.tfmg.steel_block": "ןǝǝʇS ɟo ʞɔoןᗺ", "block.tfmg.steel_casing": "buısɐƆ ןǝǝʇS", "block.tfmg.steel_distillation_controller": "ɹǝןןoɹʇuoƆ uoıʇɐןןıʇsıᗡ ןǝǝʇS", @@ -164,6 +172,7 @@ "block.tfmg.steel_fluid_tank": "ʞuɐ⟘ pınןℲ ןǝǝʇS", "block.tfmg.steel_fluid_valve": "ǝʌןɐΛ pınןℲ ןǝǝʇS", "block.tfmg.steel_flywheel": "ןǝǝɥʍʎןℲ ןǝǝʇS", + "block.tfmg.steel_ladder": "ɹǝppɐꞀ ןǝǝʇS", "block.tfmg.steel_mechanical_pump": "dɯnԀ ןɐɔıuɐɥɔǝW ןǝǝʇS", "block.tfmg.steel_pipe": "ǝdıԀ ןǝǝʇS", "block.tfmg.steel_scaffolding": "buıpןoɟɟɐɔS ןǝǝʇS", diff --git a/src/generated/resources/assets/tfmg/lang/en_us.json b/src/generated/resources/assets/tfmg/lang/en_us.json index df40a475..aebef5dc 100644 --- a/src/generated/resources/assets/tfmg/lang/en_us.json +++ b/src/generated/resources/assets/tfmg/lang/en_us.json @@ -3,9 +3,11 @@ "_": "->------------------------] Game Elements [------------------------<-", "block.tfmg.air_intake": "Air Intake", + "block.tfmg.aluminum_bars": "Aluminum Bars", "block.tfmg.aluminum_block": "Block of Aluminum", "block.tfmg.aluminum_fluid_valve": "Aluminum Fluid Valve", "block.tfmg.aluminum_flywheel": "Aluminum Flywheel", + "block.tfmg.aluminum_ladder": "Aluminum Ladder", "block.tfmg.aluminum_mechanical_pump": "Aluminum Mechanical Pump", "block.tfmg.aluminum_pipe": "Aluminum Pipe", "block.tfmg.aluminum_scaffolding": "Aluminum Scaffolding", @@ -150,6 +152,11 @@ "block.tfmg.purple_concrete_slab": "Purple Concrete Slab", "block.tfmg.purple_concrete_stairs": "Purple Concrete Stairs", "block.tfmg.purple_concrete_wall": "Purple Concrete Wall", + "block.tfmg.rebar_concrete": "Rebar Concrete", + "block.tfmg.rebar_concrete_slab": "Rebar Concrete Slab", + "block.tfmg.rebar_concrete_stairs": "Rebar Concrete Stairs", + "block.tfmg.rebar_concrete_wall": "Rebar Concrete Wall", + "block.tfmg.rebar_formwork_block": "Rebar Formwork Block", "block.tfmg.red_caution_block": "Red Caution Block", "block.tfmg.red_concrete": "Red Concrete", "block.tfmg.red_concrete_slab": "Red Concrete Slab", @@ -159,6 +166,7 @@ "block.tfmg.small_bauxite_brick_stairs": "Small Bauxite Brick Stairs", "block.tfmg.small_bauxite_brick_wall": "Small Bauxite Brick Wall", "block.tfmg.small_bauxite_bricks": "Small Bauxite Bricks", + "block.tfmg.steel_bars": "Steel Bars", "block.tfmg.steel_block": "Block of Steel", "block.tfmg.steel_casing": "Steel Casing", "block.tfmg.steel_distillation_controller": "Steel Distillation Controller", @@ -167,6 +175,7 @@ "block.tfmg.steel_fluid_tank": "Steel Fluid Tank", "block.tfmg.steel_fluid_valve": "Steel Fluid Valve", "block.tfmg.steel_flywheel": "Steel Flywheel", + "block.tfmg.steel_ladder": "Steel Ladder", "block.tfmg.steel_mechanical_pump": "Steel Mechanical Pump", "block.tfmg.steel_pipe": "Steel Pipe", "block.tfmg.steel_scaffolding": "Steel Scaffolding", @@ -238,45 +247,6 @@ "item.tfmg.thermite_grenade": "Thermite Grenade", "item.tfmg.zinc_grenade": "Zinc Grenade", - "itemGroup.tfmg.base": "Create: The Factory Must Grow", - "itemGroup.tfmg.building": "Create: TFMG's Building Blocks", - - "create.goggles.misc.number": "%1$s", - "create.goggles.misc.percent_symbol": "%", - "create.goggles.misc.dot_one": ".", - "create.goggles.misc.dot_two": "..", - "create.goggles.misc.dot_three": "...", - "create.goggles.misc.storage_info": "Storage Info:", - "create.goggles.fluid_in_tank": "Fluid In Tank:", - "create.goggles.surface_scanner.no_rotation": "No Rotation Provided", - "create.goggles.surface_scanner.no_deposit": "No Deposit Found", - "create.goggles.surface_scanner.deposit_found": "Found Deposit", - "create.goggles.surface_scanner.distance": "Distance: %1$s Blocks", - "create.goggles.surface_scanner.scanning_surface": "Scanning Surface", - "create.goggles.distillation_tower.status": "Distillation Tower Info:", - "create.goggles.distillation_tower.tank_not_found": "Steel Fluid Tank Not Found", - "create.goggles.distillation_tower.not_tall_enough": "Distillation Tower is Not Tall Enough", - "create.goggles.distillation_tower.level": "Distillation Tower Level: %1$s", - "create.goggles.distillation_tower.found_outputs": "Found Outputs: %1$s", - "create.goggles.distillation_tower.no_outputs": "No Output Blocks Found", - "create.goggles.blast_furnace.stats": "Blast Furnace:", - "create.goggles.blast_furnace.size_stats": "Size Stats:", - "create.goggles.blast_furnace.fuel_amount": "Fuel Amount: %1$s", - "create.goggles.blast_furnace.item_count": "Item Count: %1$s", - "create.goggles.blast_furnace.height": "Height: %1$s", - "create.goggles.blast_furnace.status.off": "Status: Idle", - "create.goggles.blast_furnace.status.running": "Status: Running", - "create.goggles.blast_furnace.diameter.one": "Diameter: 1", - "create.goggles.blast_furnace.diameter.two": "Diameter: 2", - "create.goggles.blast_furnace.invalid": "Blast Furnace is Not Built Correctly", - "create.goggles.coke_oven.status": "Coke Oven:", - "create.goggles.coke_oven.fluid_amount_output": "Fluid Amount In Internal Tank: %1$s mb", - "create.goggles.coke_oven.fluid_amount_exhaust": "Carbon Dioxide: %1$s mb", - "create.goggles.coke_oven.item_count": "Item Count In Internal Storage: %1$s", - "create.goggles.coke_oven.invalid": "Coke Oven Invalid", - "create.goggles.coke_oven.tank_full": "One of Internal Tanks Is Full", - "create.goggles.coke_oven.progress": "Progress: %1$s", - "_": "->------------------------] UI & Messages [------------------------<-", diff --git a/src/generated/resources/assets/tfmg/models/block/aluminum_cap.json b/src/generated/resources/assets/tfmg/models/block/aluminum_cap.json new file mode 100644 index 00000000..af48e5f7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/aluminum_cap.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/cap", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/aluminum_cap_alt.json b/src/generated/resources/assets/tfmg/models/block/aluminum_cap_alt.json new file mode 100644 index 00000000..9c3cc867 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/aluminum_cap_alt.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/cap_alt", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/aluminum_ladder.json b/src/generated/resources/assets/tfmg/models/block/aluminum_ladder.json new file mode 100644 index 00000000..b7f38764 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/aluminum_ladder.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/ladder", + "textures": { + "0": "tfmg:block/ladder_aluminum_hoop", + "1": "tfmg:block/ladder_aluminum", + "particle": "tfmg:block/ladder_aluminum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/aluminum_post.json b/src/generated/resources/assets/tfmg/models/block/aluminum_post.json new file mode 100644 index 00000000..3205721e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/aluminum_post.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/post", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/aluminum_post_ends.json b/src/generated/resources/assets/tfmg/models/block/aluminum_post_ends.json new file mode 100644 index 00000000..0a78d522 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/aluminum_post_ends.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/post_ends", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/aluminum_side.json b/src/generated/resources/assets/tfmg/models/block/aluminum_side.json new file mode 100644 index 00000000..5f2887b7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/aluminum_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/side", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/aluminum_side_alt.json b/src/generated/resources/assets/tfmg/models/block/aluminum_side_alt.json new file mode 100644 index 00000000..1b7fc892 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/aluminum_side_alt.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/side_alt", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete.json new file mode 100644 index 00000000..2fa166c1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_bottom.json new file mode 100644 index 00000000..abc44710 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/rebar_concrete", + "side": "tfmg:block/rebar_concrete", + "top": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs.json new file mode 100644 index 00000000..8151b3fd --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/rebar_concrete", + "side": "tfmg:block/rebar_concrete", + "top": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs_inner.json new file mode 100644 index 00000000..6ef1c102 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/rebar_concrete", + "side": "tfmg:block/rebar_concrete", + "top": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs_outer.json new file mode 100644 index 00000000..01930655 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/rebar_concrete", + "side": "tfmg:block/rebar_concrete", + "top": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_top.json new file mode 100644 index 00000000..c5f49e6c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/rebar_concrete", + "side": "tfmg:block/rebar_concrete", + "top": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_post.json new file mode 100644 index 00000000..c70fbe5c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_side.json new file mode 100644 index 00000000..c2226918 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_side_tall.json new file mode 100644 index 00000000..8ee82ed9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/rebar_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/steel_cap.json b/src/generated/resources/assets/tfmg/models/block/steel_cap.json new file mode 100644 index 00000000..0bcbe922 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/steel_cap.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/cap", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge", + "particle": "tfmg:block/bars/steel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/steel_cap_alt.json b/src/generated/resources/assets/tfmg/models/block/steel_cap_alt.json new file mode 100644 index 00000000..c7c3aae5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/steel_cap_alt.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/cap_alt", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge", + "particle": "tfmg:block/bars/steel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/steel_ladder.json b/src/generated/resources/assets/tfmg/models/block/steel_ladder.json new file mode 100644 index 00000000..68af6e7e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/steel_ladder.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/ladder", + "textures": { + "0": "tfmg:block/ladder_steel_hoop", + "1": "tfmg:block/ladder_steel", + "particle": "tfmg:block/ladder_steel" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/steel_post.json b/src/generated/resources/assets/tfmg/models/block/steel_post.json new file mode 100644 index 00000000..d8938b14 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/steel_post.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/post", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge", + "particle": "tfmg:block/bars/steel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/steel_post_ends.json b/src/generated/resources/assets/tfmg/models/block/steel_post_ends.json new file mode 100644 index 00000000..5fa100c6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/steel_post_ends.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/post_ends", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge", + "particle": "tfmg:block/bars/steel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/steel_side.json b/src/generated/resources/assets/tfmg/models/block/steel_side.json new file mode 100644 index 00000000..85947209 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/steel_side.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/side", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge", + "particle": "tfmg:block/bars/steel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/steel_side_alt.json b/src/generated/resources/assets/tfmg/models/block/steel_side_alt.json new file mode 100644 index 00000000..462b925f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/steel_side_alt.json @@ -0,0 +1,8 @@ +{ + "parent": "tfmg:block/bars/side_alt", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge", + "particle": "tfmg:block/bars/steel_bars" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/aluminum_bars.json b/src/generated/resources/assets/tfmg/models/item/aluminum_bars.json new file mode 100644 index 00000000..8236a710 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/aluminum_bars.json @@ -0,0 +1,7 @@ +{ + "parent": "tfmg:item/bars", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/aluminum_ladder.json b/src/generated/resources/assets/tfmg/models/item/aluminum_ladder.json new file mode 100644 index 00000000..a3b61cf4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/aluminum_ladder.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:block/ladder_aluminum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/rebar_concrete.json b/src/generated/resources/assets/tfmg/models/item/rebar_concrete.json new file mode 100644 index 00000000..6719be4b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/rebar_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/rebar_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/rebar_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/rebar_concrete_slab.json new file mode 100644 index 00000000..bb2a0969 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/rebar_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/rebar_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/rebar_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/rebar_concrete_stairs.json new file mode 100644 index 00000000..9f8084dc --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/rebar_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/rebar_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/rebar_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/rebar_concrete_wall.json new file mode 100644 index 00000000..e56646bd --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/rebar_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/rebar_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/rebar_formwork_block.json b/src/generated/resources/assets/tfmg/models/item/rebar_formwork_block.json new file mode 100644 index 00000000..ba7f7ddb --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/rebar_formwork_block.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/rebar_formwork_block/block_base" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/steel_bars.json b/src/generated/resources/assets/tfmg/models/item/steel_bars.json new file mode 100644 index 00000000..31be2e79 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/steel_bars.json @@ -0,0 +1,7 @@ +{ + "parent": "tfmg:item/bars", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/steel_ladder.json b/src/generated/resources/assets/tfmg/models/item/steel_ladder.json new file mode 100644 index 00000000..e73bca6a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/steel_ladder.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:block/ladder_steel" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/fan_transparent.json b/src/generated/resources/data/create/tags/blocks/fan_transparent.json new file mode 100644 index 00000000..d31cbb54 --- /dev/null +++ b/src/generated/resources/data/create/tags/blocks/fan_transparent.json @@ -0,0 +1,6 @@ +{ + "values": [ + "tfmg:steel_bars", + "tfmg:aluminum_bars" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/blocks/wrench_pickup.json b/src/generated/resources/data/create/tags/blocks/wrench_pickup.json new file mode 100644 index 00000000..d31cbb54 --- /dev/null +++ b/src/generated/resources/data/create/tags/blocks/wrench_pickup.json @@ -0,0 +1,6 @@ +{ + "values": [ + "tfmg:steel_bars", + "tfmg:aluminum_bars" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/rebar_concrete.json b/src/generated/resources/data/forge/tags/blocks/rebar_concrete.json new file mode 100644 index 00000000..699037cf --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/rebar_concrete.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:rebar_concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/rebar_concrete.json b/src/generated/resources/data/forge/tags/items/rebar_concrete.json new file mode 100644 index 00000000..699037cf --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/rebar_concrete.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:rebar_concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/climbable.json b/src/generated/resources/data/minecraft/tags/blocks/climbable.json index bfab543d..f743c808 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/climbable.json +++ b/src/generated/resources/data/minecraft/tags/blocks/climbable.json @@ -1,6 +1,8 @@ { "values": [ "tfmg:steel_scaffolding", - "tfmg:aluminum_scaffolding" + "tfmg:aluminum_scaffolding", + "tfmg:steel_ladder", + "tfmg:aluminum_ladder" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index d493dc7d..dc8ffe95 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -6,6 +6,7 @@ "tfmg:aluminum_flywheel", "tfmg:cast_iron_flywheel", "tfmg:formwork_block", + "tfmg:rebar_formwork_block", "tfmg:cast_iron_distillation_output", "tfmg:steel_distillation_output", "tfmg:machine_input", diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index c4eeaca1..87a509fb 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -11,6 +11,10 @@ "tfmg:red_caution_block", "tfmg:steel_scaffolding", "tfmg:aluminum_scaffolding", + "tfmg:steel_bars", + "tfmg:aluminum_bars", + "tfmg:steel_ladder", + "tfmg:aluminum_ladder", "tfmg:steel_flywheel", "tfmg:aluminum_flywheel", "tfmg:cast_iron_flywheel", @@ -142,6 +146,10 @@ "tfmg:concrete_stairs", "tfmg:concrete", "tfmg:concrete_slab", + "tfmg:rebar_concrete_wall", + "tfmg:rebar_concrete_stairs", + "tfmg:rebar_concrete", + "tfmg:rebar_concrete_slab", "tfmg:bauxite", "tfmg:cut_bauxite", "tfmg:cut_bauxite_stairs", diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json new file mode 100644 index 00000000..417a7a16 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -0,0 +1,7 @@ +{ + "values": [ + "tfmg:rebar_concrete_wall", + "tfmg:rebar_concrete_stairs", + "tfmg:rebar_concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json index 047a9ec2..22724188 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -71,6 +71,7 @@ "tfmg:concrete_wall", "tfmg:concrete_stairs", "tfmg:concrete", - "tfmg:concrete_slab" + "tfmg:concrete_slab", + "tfmg:rebar_concrete_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json index a9b2a700..fe7a6b5f 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -18,6 +18,7 @@ "tfmg:purple_concrete_stairs", "tfmg:orange_concrete_stairs", "tfmg:concrete_stairs", + "tfmg:rebar_concrete_stairs", "tfmg:cut_bauxite_stairs", "tfmg:polished_cut_bauxite_stairs", "tfmg:cut_bauxite_brick_stairs", diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json index 4a0aee05..4b119b32 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/walls.json +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -36,6 +36,8 @@ "tfmg:orange_concrete_slab", "tfmg:concrete_wall", "tfmg:concrete_slab", + "tfmg:rebar_concrete_wall", + "tfmg:rebar_concrete_slab", "tfmg:cut_bauxite_wall", "tfmg:polished_cut_bauxite_wall", "tfmg:cut_bauxite_brick_wall", diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/aluminum_bars_from_ingots_aluminum_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/aluminum_bars_from_ingots_aluminum_stonecutting.json new file mode 100644 index 00000000..2382469e --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/aluminum_bars_from_ingots_aluminum_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingots_aluminum": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/aluminum" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:aluminum_bars_from_ingots_aluminum_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingots_aluminum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:aluminum_bars_from_ingots_aluminum_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/aluminum_ladder_from_ingots_aluminum_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/aluminum_ladder_from_ingots_aluminum_stonecutting.json new file mode 100644 index 00000000..0e10967a --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/aluminum_ladder_from_ingots_aluminum_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingots_aluminum": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/aluminum" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:aluminum_ladder_from_ingots_aluminum_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingots_aluminum", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:aluminum_ladder_from_ingots_aluminum_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/steel_bars_from_ingots_steel_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/steel_bars_from_ingots_steel_stonecutting.json new file mode 100644 index 00000000..e6380a9d --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/steel_bars_from_ingots_steel_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingots_steel": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:steel_bars_from_ingots_steel_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingots_steel", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:steel_bars_from_ingots_steel_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/steel_ladder_from_ingots_steel_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/steel_ladder_from_ingots_steel_stonecutting.json new file mode 100644 index 00000000..fcbd3030 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/steel_ladder_from_ingots_steel_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingots_steel": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:steel_ladder_from_ingots_steel_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingots_steel", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:steel_ladder_from_ingots_steel_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/aluminum_bars.json b/src/generated/resources/data/tfmg/loot_tables/blocks/aluminum_bars.json new file mode 100644 index 00000000..f18b59ac --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/aluminum_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:aluminum_bars" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/aluminum_ladder.json b/src/generated/resources/data/tfmg/loot_tables/blocks/aluminum_ladder.json new file mode 100644 index 00000000..33e961d4 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/aluminum_ladder.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:aluminum_ladder" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete.json new file mode 100644 index 00000000..2f007fd2 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:rebar_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_slab.json new file mode 100644 index 00000000..079a39b8 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_slab.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:rebar_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_stairs.json new file mode 100644 index 00000000..6f637d03 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:rebar_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_wall.json new file mode 100644 index 00000000..30084f4b --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_concrete_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:rebar_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_formwork_block.json b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_formwork_block.json new file mode 100644 index 00000000..fc7af434 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/rebar_formwork_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:rebar_formwork_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/steel_bars.json b/src/generated/resources/data/tfmg/loot_tables/blocks/steel_bars.json new file mode 100644 index 00000000..8c8c1ac0 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/steel_bars.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:steel_bars" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/steel_ladder.json b/src/generated/resources/data/tfmg/loot_tables/blocks/steel_ladder.json new file mode 100644 index 00000000..bda06eb5 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/steel_ladder.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:steel_ladder" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/aluminum_bars_from_ingots_aluminum_stonecutting.json b/src/generated/resources/data/tfmg/recipes/aluminum_bars_from_ingots_aluminum_stonecutting.json new file mode 100644 index 00000000..b8eff38d --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/aluminum_bars_from_ingots_aluminum_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 4, + "ingredient": { + "tag": "forge:ingots/aluminum" + }, + "result": "tfmg:aluminum_bars" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/aluminum_ladder_from_ingots_aluminum_stonecutting.json b/src/generated/resources/data/tfmg/recipes/aluminum_ladder_from_ingots_aluminum_stonecutting.json new file mode 100644 index 00000000..645a947c --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/aluminum_ladder_from_ingots_aluminum_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "tag": "forge:ingots/aluminum" + }, + "result": "tfmg:aluminum_ladder" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/steel_bars_from_ingots_steel_stonecutting.json b/src/generated/resources/data/tfmg/recipes/steel_bars_from_ingots_steel_stonecutting.json new file mode 100644 index 00000000..ea392d65 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/steel_bars_from_ingots_steel_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 4, + "ingredient": { + "tag": "forge:ingots/steel" + }, + "result": "tfmg:steel_bars" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/steel_ladder_from_ingots_steel_stonecutting.json b/src/generated/resources/data/tfmg/recipes/steel_ladder_from_ingots_steel_stonecutting.json new file mode 100644 index 00000000..77e65acd --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/steel_ladder_from_ingots_steel_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "tag": "forge:ingots/steel" + }, + "result": "tfmg:steel_ladder" +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGMetalBarsGen.java b/src/main/java/com/drmangotea/tfmg/base/TFMGMetalBarsGen.java new file mode 100644 index 00000000..d05db77f --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGMetalBarsGen.java @@ -0,0 +1,145 @@ +package com.drmangotea.tfmg.base; + +import com.drmangotea.tfmg.CreateTFMG; +import com.simibubi.create.AllTags.AllBlockTags; +import com.simibubi.create.Create; +import com.simibubi.create.foundation.data.TagGen; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import com.tterrag.registrate.util.DataIngredient; +import com.tterrag.registrate.util.entry.BlockEntry; +import com.tterrag.registrate.util.nullness.NonNullBiConsumer; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.IronBarsBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.MaterialColor; +import net.minecraftforge.client.model.generators.ModelFile; + +import java.util.function.Supplier; + +import static com.simibubi.create.Create.REGISTRATE; +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.*; + +public class TFMGMetalBarsGen { + + public static

NonNullBiConsumer, RegistrateBlockstateProvider> barsBlockState( + String name, boolean specialEdge) { + return (c, p) -> { + + ModelFile post_ends = barsSubModel(p, name, "post_ends", specialEdge); + ModelFile post = barsSubModel(p, name, "post", specialEdge); + ModelFile cap = barsSubModel(p, name, "cap", specialEdge); + ModelFile cap_alt = barsSubModel(p, name, "cap_alt", specialEdge); + ModelFile side = barsSubModel(p, name, "side", specialEdge); + ModelFile side_alt = barsSubModel(p, name, "side_alt", specialEdge); + + p.getMultipartBuilder(c.get()) + .part() + .modelFile(post_ends) + .addModel() + .end() + .part() + .modelFile(post) + .addModel() + .condition(NORTH, false) + .condition(EAST, false) + .condition(SOUTH, false) + .condition(WEST, false) + .end() + .part() + .modelFile(cap) + .addModel() + .condition(NORTH, true) + .condition(EAST, false) + .condition(SOUTH, false) + .condition(WEST, false) + .end() + .part() + .modelFile(cap) + .rotationY(90) + .addModel() + .condition(NORTH, false) + .condition(EAST, true) + .condition(SOUTH, false) + .condition(WEST, false) + .end() + .part() + .modelFile(cap_alt) + .addModel() + .condition(NORTH, false) + .condition(EAST, false) + .condition(SOUTH, true) + .condition(WEST, false) + .end() + .part() + .modelFile(cap_alt) + .rotationY(90) + .addModel() + .condition(NORTH, false) + .condition(EAST, false) + .condition(SOUTH, false) + .condition(WEST, true) + .end() + .part() + .modelFile(side) + .addModel() + .condition(NORTH, true) + .end() + .part() + .modelFile(side) + .rotationY(90) + .addModel() + .condition(EAST, true) + .end() + .part() + .modelFile(side_alt) + .addModel() + .condition(SOUTH, true) + .end() + .part() + .modelFile(side_alt) + .rotationY(90) + .addModel() + .condition(WEST, true) + .end(); + }; + } + + private static ModelFile barsSubModel(RegistrateBlockstateProvider p, String name, String suffix, + boolean specialEdge) { + ResourceLocation barsTexture = p.modLoc("block/bars/" + name + "_bars"); + ResourceLocation edgeTexture = specialEdge ? p.modLoc("block/bars/" + name + "_bars_edge") : barsTexture; + return p.models() + .withExistingParent(name + "_" + suffix, p.modLoc("block/bars/" + suffix)) + .texture("bars", barsTexture) + .texture("particle", barsTexture) + .texture("edge", edgeTexture); + } + @SuppressWarnings("removal") + public static BlockEntry createBars(String name, boolean specialEdge, + Supplier ingredient, MaterialColor color) { + return CreateTFMG.REGISTRATE.block(name + "_bars", IronBarsBlock::new) + .addLayer(() -> RenderType::cutoutMipped) + .initialProperties(() -> Blocks.IRON_BARS) + .properties(p -> p.sound(SoundType.COPPER) + .color(color)) + .tag(AllBlockTags.WRENCH_PICKUP.tag) + .tag(AllBlockTags.FAN_TRANSPARENT.tag) + .transform(TagGen.pickaxeOnly()) + .blockstate(barsBlockState(name, specialEdge)) + .item() + .model((c, p) -> { + ResourceLocation barsTexture = p.modLoc("block/bars/" + name + "_bars"); + p.withExistingParent(c.getName(), CreateTFMG.asResource("item/bars")) + .texture("bars", barsTexture) + .texture("edge", specialEdge ? p.modLoc("block/bars/" + name + "_bars_edge") : barsTexture); + }) + .recipe((c, p) -> p.stonecutting(ingredient.get(), c::get, 4)) + .build() + .register(); + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/rebar/RebarFormWorkBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/rebar/RebarFormWorkBlock.java new file mode 100644 index 00000000..c612b55b --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/rebar/RebarFormWorkBlock.java @@ -0,0 +1,23 @@ +package com.drmangotea.tfmg.blocks.concrete.formwork.rebar; + +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.content.equipment.wrench.IWrenchable; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public class RebarFormWorkBlock extends Block implements IWrenchable, IBE { + public RebarFormWorkBlock(Properties p_49795_) { + super(p_49795_); + } + + @Override + public Class getBlockEntityClass() { + return RebarFormWorkBlockEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.REBAR_FORMWORK.get(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/rebar/RebarFormWorkBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/rebar/RebarFormWorkBlockEntity.java new file mode 100644 index 00000000..2ee818e0 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/rebar/RebarFormWorkBlockEntity.java @@ -0,0 +1,218 @@ +package com.drmangotea.tfmg.blocks.concrete.formwork.rebar; + +import com.drmangotea.tfmg.blocks.concrete.formwork.FormWorkBlockEntity; +import com.drmangotea.tfmg.blocks.machines.TFMGMachineBlockEntity; +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.jozufozu.flywheel.core.GameStateRegistry; +import com.simibubi.create.foundation.fluid.SmartFluidTank; +import com.simibubi.create.foundation.utility.animation.LerpedFloat; +import net.minecraft.commands.arguments.blocks.BlockStateArgument; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.templates.FluidTank; + +public class RebarFormWorkBlockEntity extends FormWorkBlockEntity { + + + + + + public RebarFormWorkBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + + } + + + @Override + public void tick() { + + + + if(tankInventory.getFluidAmount()==tankInventory.getCapacity()){ + if(timer==-1) { + timer = 180 * 24; + }else { + + timer--; + + if(timer==0){ + level.setBlock(getBlockPos(), TFMGBlocks.REBAR_CONCRETE.getDefaultState() ,3); + } + } + + + } else + timer = -1; + + + super.tick(); + fluidLevel.chase(tankInventory.getFluidAmount(), 0.3f, LerpedFloat.Chaser.EXP); + fluidLevel.tickChaser(); + + BlockEntity blockEntityBelow = level.getBlockEntity(this.getBlockPos().below()); + BlockEntity blockEntityNorth = level.getBlockEntity(this.getBlockPos().north()); + BlockEntity blockEntityWest = level.getBlockEntity(this.getBlockPos().west()); + BlockEntity blockEntityEast = level.getBlockEntity(this.getBlockPos().east()); + BlockEntity blockEntitySouth = level.getBlockEntity(this.getBlockPos().south()); + + + bottom = !(blockEntityBelow instanceof RebarFormWorkBlockEntity); + east = !(blockEntityEast instanceof RebarFormWorkBlockEntity); + west = !(blockEntityWest instanceof RebarFormWorkBlockEntity); + north = !(blockEntityNorth instanceof RebarFormWorkBlockEntity); + south = !(blockEntitySouth instanceof RebarFormWorkBlockEntity); + for (int x = 0; x < 30; x++) { + for (int i = 0; i < 5; i++) { + BlockEntity CheckedBE = null; + + if (i == 0) { + CheckedBE = level.getBlockEntity(this.getBlockPos().below()); + } + if (i == 1) { + CheckedBE = level.getBlockEntity(this.getBlockPos().east()); + } + if (i == 2) { + CheckedBE = level.getBlockEntity(this.getBlockPos().west()); + } + if (i == 3) { + CheckedBE = level.getBlockEntity(this.getBlockPos().north()); + } + if (i == 4) { + CheckedBE = level.getBlockEntity(this.getBlockPos().south()); + } + + if (CheckedBE instanceof RebarFormWorkBlockEntity) { + if(((RebarFormWorkBlockEntity) CheckedBE).tankInventory.getFluidAmount()>this.tankInventory.getFluidAmount()&&i!=0) + continue; + + FluidTank checkedTank = ((RebarFormWorkBlockEntity) CheckedBE).tankInventory; + if (checkedTank.getFluidAmount() < 1000) { + if(checkedTank.getFluidAmount()>=995&&tankInventory.getFluidAmount()>0){ + checkedTank.setFluid(new FluidStack(TFMGFluids.LIQUID_CONCRETE.getSource(), checkedTank.getFluidAmount()+1)); + //tankInventory.drain(1, IFluidHandler.FluidAction.EXECUTE); + // continue; + } + + int reducedAmount = tankInventory.getFluidAmount() / 8; + + if (tankInventory.getFluidAmount() != 0) + reducedAmount = 1; + int newFluidAmount = checkedTank.getFluidAmount() + reducedAmount; + + int toRemove = reducedAmount; + //if full + if (newFluidAmount > 1000) { + continue; + // int amountModifier = newFluidAmount - 1000; + // newFluidAmount -= amountModifier; + // toRemove = reducedAmount - amountModifier; + } + // + checkedTank.setFluid(new FluidStack(TFMGFluids.LIQUID_CONCRETE.getSource(), newFluidAmount)); + tankInventory.drain(1, IFluidHandler.FluidAction.EXECUTE); + + } + } + } + } + + +/* + BlockPos below = this.getBlockPos().below(); + + BlockPos west = this.getBlockPos().west(); + BlockPos east = this.getBlockPos().east(); + BlockPos north = this.getBlockPos().north(); + BlockPos south = this.getBlockPos().south(); + + if(level.getBlockEntity(below) instanceof FormWorkBlockEntity){ + bottom = false; + }else bottom = true; + if(level.getBlockEntity(west) instanceof FormWorkBlockEntity){ + bottom = false; + }else bottom = true; + if(level.getBlockEntity(east) instanceof FormWorkBlockEntity){ + bottom = false; + }else bottom = true; + if(level.getBlockEntity(north) instanceof FormWorkBlockEntity){ + bottom = false; + }else bottom = true; + if(level.getBlockEntity(south) instanceof FormWorkBlockEntity){ + bottom = false; + }else bottom = true; + + + */ +} + + + protected void onFluidStackChanged(FluidStack newFluidStack) { + if (!hasLevel()) + return; + + + + if (!level.isClientSide) { + setChanged(); + sendData(); + } + + + } + public float getFillState() { + return (float) tankInventory.getFluidAmount() / tankInventory.getCapacity(); + } + + @Override + protected void read(CompoundTag compound, boolean clientPacket) { + super.read(compound, clientPacket); + + timer = compound.getInt("Timer"); + + bottom = compound.getBoolean("Bottom"); + + east = compound.getBoolean("East"); + west = compound.getBoolean("West"); + north = compound.getBoolean("North"); + south = compound.getBoolean("South"); + tankInventory.readFromNBT(compound.getCompound("TankContent")); + + + + } + + @Override + public void write(CompoundTag compound, boolean clientPacket) { + super.write(compound, clientPacket); + + + compound.putInt("Timer", timer); + + compound.putBoolean("Bottom", bottom); + + compound.putBoolean("East", east); + compound.putBoolean("West", west); + compound.putBoolean("North", north); + compound.putBoolean("South", south); + compound.put("TankContent", tankInventory.writeToNBT(new CompoundTag())); + + + + } + + + public LerpedFloat getFluidLevel() { + return fluidLevel; + } + + + + +} diff --git a/src/main/java/com/drmangotea/tfmg/mixins/FluidPropagatorMixin.java b/src/main/java/com/drmangotea/tfmg/mixins/FluidPropagatorMixin.java index c73a646a..c1f7c611 100644 --- a/src/main/java/com/drmangotea/tfmg/mixins/FluidPropagatorMixin.java +++ b/src/main/java/com/drmangotea/tfmg/mixins/FluidPropagatorMixin.java @@ -84,7 +84,12 @@ public class FluidPropagatorMixin { if (tileEntity instanceof PumpBlockEntity) { if ( !TFMGBlocks.STEEL_MECHANICAL_PUMP.has(targetState)&& - !AllBlocks.MECHANICAL_PUMP.has(targetState) || targetState.getValue(PumpBlock.FACING) + !AllBlocks.MECHANICAL_PUMP.has(targetState)&& + !TFMGBlocks.BRASS_MECHANICAL_PUMP.has(targetState)&& + !TFMGBlocks.CAST_IRON_MECHANICAL_PUMP.has(targetState)&& + !TFMGBlocks.ALUMINUM_MECHANICAL_PUMP.has(targetState)&& + !TFMGBlocks.PLASTIC_MECHANICAL_PUMP.has(targetState) + || targetState.getValue(PumpBlock.FACING) .getAxis() != direction.getAxis()) continue; discoveredPumps.add(Pair.of((PumpBlockEntity) tileEntity, direction.getOpposite())); diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java index 3a29cc36..95688760 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java @@ -2,6 +2,7 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.blocks.concrete.formwork.FormWorkBlockEntity; import com.drmangotea.tfmg.blocks.concrete.formwork.FormWorkRenderer; +import com.drmangotea.tfmg.blocks.concrete.formwork.rebar.RebarFormWorkBlockEntity; import com.drmangotea.tfmg.blocks.decoration.doors.TFMGSlidingDoorBlockEntity; import com.drmangotea.tfmg.blocks.decoration.doors.TFMGSlidingDoorRenderer; import com.drmangotea.tfmg.blocks.decoration.flywheels.TFMGFlywheelBlockEntity; @@ -77,6 +78,12 @@ public class TFMGBlockEntities { .renderer(() -> FormWorkRenderer::new) .validBlocks(TFMGBlocks.FORMWORK_BLOCK) .register(); + + public static final BlockEntityEntry REBAR_FORMWORK = REGISTRATE + .blockEntity("rebar_formwork", RebarFormWorkBlockEntity::new) + .renderer(() -> FormWorkRenderer::new) + .validBlocks(TFMGBlocks.REBAR_FORMWORK_BLOCK) + .register(); public static final BlockEntityEntry OIL_DEPOSIT = REGISTRATE .blockEntity("oil_deposit", FluidDepositBlockEntity::new) // .validBlocks(TFMGBlocks.OIL_DEPOSIT) diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java index 937b0e52..4f9aa84e 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java @@ -1,10 +1,12 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.base.TFMGBuilderTransformers; +import com.drmangotea.tfmg.base.TFMGMetalBarsGen; import com.drmangotea.tfmg.base.TFMGSpriteShifts; import com.drmangotea.tfmg.base.TFMGVanillaBlockStates; import com.drmangotea.tfmg.blocks.concrete.formwork.FormWorkBlock; import com.drmangotea.tfmg.blocks.concrete.formwork.FormWorkGenerator; +import com.drmangotea.tfmg.blocks.concrete.formwork.rebar.RebarFormWorkBlock; import com.drmangotea.tfmg.blocks.decoration.TrussBlock; import com.drmangotea.tfmg.blocks.decoration.doors.TFMGSlidingDoorBlock; import com.drmangotea.tfmg.blocks.decoration.flywheels.TFMGFlywheelBlock; @@ -71,6 +73,8 @@ import com.drmangotea.tfmg.blocks.tanks.SteelTankItem; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.AllTags; +import com.simibubi.create.Create; +import com.simibubi.create.content.decoration.MetalLadderBlock; import com.simibubi.create.content.decoration.MetalScaffoldingBlock; import com.simibubi.create.content.decoration.encasing.CasingBlock; import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour; @@ -96,6 +100,7 @@ import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.common.Tags; +import net.minecraftforge.registries.RegistryObject; import static com.drmangotea.tfmg.CreateTFMG.REGISTRATE; @@ -220,6 +225,23 @@ public class TFMGBlocks { .register(); + public static final BlockEntry BRASS_BARS = TFMGMetalBarsGen.createBars("steel", true, + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/steel")), MaterialColor.TERRACOTTA_CYAN); + public static final BlockEntry COPPER_BARS = TFMGMetalBarsGen.createBars("aluminum", true, + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/aluminum")), MaterialColor.TERRACOTTA_WHITE); + + + public static final BlockEntry STEEL_LADDER = + REGISTRATE.block("steel_ladder", MetalLadderBlock::new) + .transform(BuilderTransformers.ladder("steel", + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/steel")), MaterialColor.TERRACOTTA_CYAN)) + .register(); + public static final BlockEntry ALUMINUM_LADDER = + REGISTRATE.block("aluminum_ladder", MetalLadderBlock::new) + .transform(BuilderTransformers.ladder("aluminum", + () -> DataIngredient.tag(AllTags.forgeItemTag("ingots/aluminum")), MaterialColor.TERRACOTTA_WHITE)) + .register(); + public static final BlockEntry STEEL_FLYWHEEL = REGISTRATE.block("steel_flywheel", TFMGFlywheelBlock::new) .initialProperties(SharedProperties::softMetal) @@ -253,8 +275,22 @@ public class TFMGBlocks { .register(); - public static final BlockEntry FACTORY_FLOOR = withVariants("factory_floor",Blocks.STONE, - MaterialColor.COLOR_GRAY,"Factory Floor",BlockTags.NEEDS_STONE_TOOL,SoundType.NETHERITE_BLOCK,false); + public static final BlockEntry FACTORY_FLOOR = withVariants("factory_floor",Blocks.STONE, + MaterialColor.COLOR_GRAY,"Factory Floor",BlockTags.NEEDS_STONE_TOOL,SoundType.NETHERITE_BLOCK,5,false); + + public static final BlockEntry FACTORY_FLOOR_SLAB = REGISTRATE.block("factory_floor_slab", SlabBlock::new) + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + .properties(p -> p.requiresCorrectToolForDrops()) + .properties(p -> p.strength(5,5)) + .transform(pickaxeOnly()) + .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, "factory_floor")) + .tag(BlockTags.NEEDS_STONE_TOOL) + .tag(BlockTags.WALLS) + .item() + .transform(customItemModel("factory_floor_bottom")) + .lang("Factory Floor Slab") + .register(); //-----------------------MACHINES---------------------------// public static final BlockEntry FORMWORK_BLOCK = @@ -269,6 +305,18 @@ public class TFMGBlocks { .build() .register(); + public static final BlockEntry REBAR_FORMWORK_BLOCK = + REGISTRATE.block("rebar_formwork_block", RebarFormWorkBlock::new) + .initialProperties(Material.WOOD) + .properties(p -> p.color(MaterialColor.WOOD)) + .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::noOcclusion) + .blockstate(new FormWorkGenerator()::generate) + .transform(axeOnly()) + .item() + .build() + .register(); + public static final BlockEntry EXHAUST = REGISTRATE.block("exhaust", ExhaustBlock::new) @@ -1182,6 +1230,26 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .register(); + + public static final BlockEntry REBAR_CONCRETE = withVariants("rebar_concrete",Blocks.STONE, + MaterialColor.COLOR_GRAY,"Rebar Concrete",BlockTags.NEEDS_DIAMOND_TOOL,SoundType.STONE,40,true); + + public static final BlockEntry REBAR_CONCRETE_SLAB = REGISTRATE.block("rebar_concrete_slab", SlabBlock::new) + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + .properties(p -> p.requiresCorrectToolForDrops()) + .properties(p -> p.strength(40,40)) + .transform(pickaxeOnly()) + .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, "rebar_concrete")) + .tag(BlockTags.NEEDS_STONE_TOOL) + .tag(BlockTags.WALLS) + .item() + .transform(customItemModel("rebar_concrete_bottom")) + .lang("Rebar Concrete Slab") + .register(); + + + public static BlockEntry generateConcrete(){ @@ -1316,14 +1384,19 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU } } - public static BlockEntry withVariants(String name, Block properties, MaterialColor color, - String displayName, TagKey toolRequired,SoundType sound, boolean wall){ + public static BlockEntry withVariants(String name, Block properties, MaterialColor color, + String displayName, TagKey toolRequired,SoundType sound,int strenght, boolean wall){ + + + + if(wall) REGISTRATE.block(name+"_wall", WallBlock::new) .initialProperties(() -> properties) .properties(p -> p.color(color)) .properties(p -> p.sound(sound)) + .properties(p -> p.strength(strenght,strenght)) .properties(p -> p.requiresCorrectToolForDrops()) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, name)) @@ -1339,6 +1412,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .initialProperties(() -> properties) .properties(p -> p.color(color)) .properties(p -> p.sound(sound)) + .properties(p -> p.strength(strenght,strenght)) .properties(p -> p.requiresCorrectToolForDrops()) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateStairBlockState(c, p, name)) @@ -1356,10 +1430,11 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU // - REGISTRATE.block(name, Block::new) + return REGISTRATE.block(name, Block::new) .initialProperties(() -> properties) .properties(p -> p.color(color)) .properties(p -> p.sound(sound)) + .properties(p -> p.strength(strenght,strenght)) .properties(p -> p.requiresCorrectToolForDrops()) .transform(pickaxeOnly()) .blockstate(simpleCubeAll(name)) @@ -1369,19 +1444,20 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .lang(displayName) .register(); - return REGISTRATE.block(name+"_slab", SlabBlock::new) - .initialProperties(() -> properties) - .properties(p -> p.color(color)) - .properties(p -> p.sound(sound)) - .properties(p -> p.requiresCorrectToolForDrops()) - .transform(pickaxeOnly()) - .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, name)) - .tag(toolRequired) - .tag(BlockTags.WALLS) - .item() - .transform(customItemModel(name+"_bottom")) - .lang(displayName+" Slab") - .register(); + //return REGISTRATE.block(name+"_slab", SlabBlock::new) + // .initialProperties(() -> properties) + // .properties(p -> p.color(color)) + // .properties(p -> p.sound(sound)) + // .properties(p -> p.strength(strenght,strenght)) + // .properties(p -> p.requiresCorrectToolForDrops()) + // .transform(pickaxeOnly()) + // .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, name)) + // .tag(toolRequired) + // .tag(BlockTags.WALLS) + // .item() + // .transform(customItemModel(name+"_bottom")) + // .lang(displayName+" Slab") + // .register(); } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGGuiTextures.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGGuiTextures.java index 09652423..4d166f36 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGGuiTextures.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGGuiTextures.java @@ -16,6 +16,8 @@ import net.minecraftforge.api.distmarker.OnlyIn; public enum TFMGGuiTextures implements ScreenElement { + + // JEI DISTILLATION_TOWER_TOP("distillation_tower", 0, 0, 44, 12), DISTILLATION_TOWER_MIDDLE("distillation_tower", 0, 12, 44, 24), diff --git a/src/main/resources/assets/tfmg/models/block/bars/cap.json b/src/main/resources/assets/tfmg/models/block/bars/cap.json new file mode 100644 index 00000000..aa1c0ee6 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/bars/cap.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/bars/cap", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/bars/cap_alt.json b/src/main/resources/assets/tfmg/models/block/bars/cap_alt.json new file mode 100644 index 00000000..473e5cbe --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/bars/cap_alt.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/bars/cap_alt", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/bars/post.json b/src/main/resources/assets/tfmg/models/block/bars/post.json new file mode 100644 index 00000000..d1aebdac --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/bars/post.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/bars/post", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge", + "particle": "tfmg:block/bars/steel_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/bars/post_ends.json b/src/main/resources/assets/tfmg/models/block/bars/post_ends.json new file mode 100644 index 00000000..3bab62d7 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/bars/post_ends.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/bars/post_ends", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge", + "particle": "tfmg:block/bars/steel_bars" + } +} diff --git a/src/main/resources/assets/tfmg/models/block/bars/side.json b/src/main/resources/assets/tfmg/models/block/bars/side.json new file mode 100644 index 00000000..dceeeb8d --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/bars/side.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/bars/side", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/bars/side_alt.json b/src/main/resources/assets/tfmg/models/block/bars/side_alt.json new file mode 100644 index 00000000..7a383cc5 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/bars/side_alt.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/bars/side_alt", + "textures": { + "bars": "tfmg:block/bars/aluminum_bars", + "edge": "tfmg:block/bars/aluminum_bars_edge", + "particle": "tfmg:block/bars/aluminum_bars" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/ladder.json b/src/main/resources/assets/tfmg/models/block/ladder.json new file mode 100644 index 00000000..be089e71 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/ladder.json @@ -0,0 +1,8 @@ +{ + "parent": "create:block/ladder", + "textures": { + "0": "tfmg:block/ladder_aluminum_hoop", + "1": "tfmg:block/ladder_aluminum", + "particle": "tfmg:block/ladder_aluminum" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_base.json b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_base.json new file mode 100644 index 00000000..ff3d988a --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_base.json @@ -0,0 +1,62 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "inside": "create:block/scaffold/brass_scaffold_inside", + "particle": "create:block/scaffold/brass_scaffold", + "side": "create:block/scaffold/brass_scaffold", + "top": "create:block/funnel/brass_funnel_frame" + }, + "elements": [ + { + "name": "outside_nocull", + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "down"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "down"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "down"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "down"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"} + } + }, + { + "name": "outside", + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"} + } + }, + { + "name": "inner_top", + "from": [0, 15.9, 0], + "to": [16, 16, 16], + "faces": { + "down": {"uv": [0, 0, 16, 16], "texture": "#top"} + } + }, + { + "name": "inside", + "from": [0.05, 0, 16], + "to": [15.95, 16, 0], + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "east"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "west"} + } + }, + { + "name": "inside", + "from": [0, 0, 15.95], + "to": [16, 16, 0.05], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "south"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "north"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_bottom.json b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_bottom.json new file mode 100644 index 00000000..c798dee0 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_bottom.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/formwork_bottom", + "particle": "tfmg:block/formwork_bottom" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_side.json b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_side.json new file mode 100644 index 00000000..fd17c855 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/block_side.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/formwork_side", + "particle": "tfmg:block/formwork_side" + }, + "elements": [ + { + "from": [0, 0, -0.1], + "to": [16, 16.001, 0.9], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/formwork_bottom.json b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/formwork_bottom.json new file mode 100644 index 00000000..34fc6fdf --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/formwork_bottom.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/formwork_bottom", + "particle": "tfmg:block/formwork_bottom" + }, + "elements": [ + { + "from": [1, 0, 1], + "to": [15, 1, 15], + "faces": { + "north": {"uv": [0, 0, 14, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 14, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 14, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 14, 1], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#0"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/item.json b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/item.json new file mode 100644 index 00000000..a3096241 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/rebar_formwork_block/item.json @@ -0,0 +1,75 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/block", + "textures": { + "0": "tfmg:block/formwork_bottom", + "1": "tfmg:block/formwork_side", + "particle": "tfmg:block/formwork_bottom" + }, + "elements": [ + { + "from": [1, 1, 0], + "to": [16, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 15, 15], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 15], "texture": "#1"}, + "south": {"uv": [0, 0, 15, 15], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 15], "texture": "#1"}, + "up": {"uv": [0, 0, 15, 1], "texture": "#1"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#1"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#1"}, + "east": {"uv": [0, 0, 15, 15], "texture": "#1"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#1"}, + "west": {"uv": [0, 0, 15, 15], "texture": "#1"}, + "up": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 0, 15, 1], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [0, 1, 15], + "to": [15, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 15, 15], "texture": "#1"}, + "east": {"uv": [0, 0, 1, 15], "texture": "#1"}, + "south": {"uv": [0, 0, 15, 15], "texture": "#1"}, + "west": {"uv": [0, 0, 1, 15], "texture": "#1"}, + "up": {"uv": [0, 0, 15, 1], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 15, 1], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [15, 1, 1], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 15], "texture": "#1"}, + "east": {"uv": [0, 0, 15, 15], "texture": "#1"}, + "south": {"uv": [0, 0, 1, 15], "texture": "#1"}, + "west": {"uv": [0, 0, 15, 15], "texture": "#1"}, + "up": {"uv": [0, 0, 15, 1], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 15, 1], "rotation": 270, "texture": "#1"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/item/bars.json b/src/main/resources/assets/tfmg/models/item/bars.json new file mode 100644 index 00000000..a440a5ff --- /dev/null +++ b/src/main/resources/assets/tfmg/models/item/bars.json @@ -0,0 +1,7 @@ +{ + "parent": "create:item/bars", + "textures": { + "bars": "tfmg:block/bars/steel_bars", + "edge": "tfmg:block/bars/steel_bars_edge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_large.png b/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_large.png index 5929e18a..d5126be0 100644 Binary files a/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_large.png and b/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_large.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_small.png b/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_small.png index ac1b41f4..69ee50fa 100644 Binary files a/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_small.png and b/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_small.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/inputs.png b/src/main/resources/assets/tfmg/textures/block/air_intake/inputs.png index 6b430912..4bad115f 100644 Binary files a/src/main/resources/assets/tfmg/textures/block/air_intake/inputs.png and b/src/main/resources/assets/tfmg/textures/block/air_intake/inputs.png differ