diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index a7e3143d..6029a912 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-10-08T21:01:08.3213175 Create: The Factory Must Grow's lang merger -57fee01fa3d508c93985417faba6daa1c69d4dd7 assets/tfmg/lang/en_us.json +// 1.19.2 2023-10-16T16:15:16.1881383 Create: The Factory Must Grow's lang merger +50ebb26e2e9e4e7530e4ed7aceae45e09ffa8da4 assets/tfmg/lang/en_us.json diff --git a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a index aaa173b5..77afab9f 100644 --- a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a +++ b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a @@ -1,8 +1,21 @@ -// 1.19.2 2023-10-08T21:01:08.324319 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-17T17:39:46.9437738 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 b7f5146505c40c08cdea7ad01fa99048b7ac5451 assets/tfmg/blockstates/aluminum_block.json 933485fa587fccc649b4cbe8f76f15e590cc8bb1 assets/tfmg/blockstates/bauxite.json 2b53ff8e880d35a42388584cb3ca896c55bfaf95 assets/tfmg/blockstates/bauxite_pillar.json +9fd862495ecdac9b5c8d877b8dc73f426e069e7a assets/tfmg/blockstates/black_concrete.json +8ba92d5ab6c3b455398347da622a9c4102856235 assets/tfmg/blockstates/black_concrete_slab.json +ce1d5c17404468a5f52510b5a2d5868ad488b8c6 assets/tfmg/blockstates/black_concrete_stairs.json +bd3ce9b5d0e4098be3c7e7f5125f09a4698ebdd9 assets/tfmg/blockstates/black_concrete_wall.json 83154b3fd031e4e10e1103d4befc800a82da4bbe assets/tfmg/blockstates/blast_furnace_output.json +225657c0b886b2cd04ca81d7d7f4120b9fe73116 assets/tfmg/blockstates/blue_concrete.json +2f24eb61881af9d78f4d5bafe7096e6af7d10081 assets/tfmg/blockstates/blue_concrete_slab.json +2f422c8f88ad82ac427acbaa1df89305be31842a assets/tfmg/blockstates/blue_concrete_stairs.json +4386040bc5ed4b2cc08920f5f58e9e9427b7c14d assets/tfmg/blockstates/blue_concrete_wall.json +b846b257ecd76322e904bd9c78a8b263a2799ad5 assets/tfmg/blockstates/brown_concrete.json +8b756fc85daef6d064edf3ea2b2e4c397e67c4a2 assets/tfmg/blockstates/brown_concrete_slab.json +99c8ea149db01211c82a02af3d738494694b2114 assets/tfmg/blockstates/brown_concrete_stairs.json +0ee9e3a46eaad9b1aa6eeaf1046044a7bf410af8 assets/tfmg/blockstates/brown_concrete_wall.json 06919cd6d4a6a91ca37c30aebbb68c51feab4f74 assets/tfmg/blockstates/casting_basin.json 5771fe31474df0e15c3a2756bac1b31a7d898868 assets/tfmg/blockstates/casting_spout.json 9ca537517fb8baeff3d4e4137c93aebd6b874c81 assets/tfmg/blockstates/cast_iron_block.json @@ -23,6 +36,10 @@ e11a6159da224e69f12e11a594c20bb2bd8c0e68 assets/tfmg/blockstates/cut_bauxite_bri 2a6fe47413aa549cd531ca1fb1d317da36745093 assets/tfmg/blockstates/cut_bauxite_slab.json 3803629d3a0fe11a30c7dedaf0ae8e396df4c994 assets/tfmg/blockstates/cut_bauxite_stairs.json 700d6569dd98adc6a3167c99295816453bf351b9 assets/tfmg/blockstates/cut_bauxite_wall.json +64b75bc836e79eb356f851d938a12d41dfdc07ee assets/tfmg/blockstates/cyan_concrete.json +984c1ff59cc54f09672efe0f51055fb15392a61c assets/tfmg/blockstates/cyan_concrete_slab.json +4e923ed720f7aa0de438889f8bf76f417b5b5987 assets/tfmg/blockstates/cyan_concrete_stairs.json +085577a70a50fcde799996e8b153a65735d778bc assets/tfmg/blockstates/cyan_concrete_wall.json 03983ce3de10310cd75b98f17c9161653b7034cd assets/tfmg/blockstates/diesel.json 13c8eae3dd74b79d0e43c31ff101111e0af058f1 assets/tfmg/blockstates/fireproof_bricks.json fe071d9f7c86c74e47390c35709f6c59b71bfa59 assets/tfmg/blockstates/fireproof_brick_reinforcement.json @@ -30,6 +47,14 @@ f16d1cf03e5053455ea485f7aa53a88206f61749 assets/tfmg/blockstates/formwork_block. e74acd9562e4b46295cf017d17f2662e20a7f5ea assets/tfmg/blockstates/fossilstone.json b0a3f4da5d9efdd01800c8b9738aee194565c6e7 assets/tfmg/blockstates/gasoline.json d23c28129bc7885986c65290071fb7a9cc5391d7 assets/tfmg/blockstates/glass_steel_pipe.json +def0068e1db5fa0b7924ae54e188347d0a3fb05d assets/tfmg/blockstates/gray_concrete.json +d908c98716ad379bc59cf562e6ddb576771e75c8 assets/tfmg/blockstates/gray_concrete_slab.json +3508f6b3948baa5d986b1f659c1157db4decf9b0 assets/tfmg/blockstates/gray_concrete_stairs.json +5ac047a09c73e971e452358720488b79eadf0039 assets/tfmg/blockstates/gray_concrete_wall.json +383c055f7b0ae0484ad4147e242691d4a5112c0f assets/tfmg/blockstates/green_concrete.json +408f9f2ea4bdd6992c2aac874bf28baa1aaeccec assets/tfmg/blockstates/green_concrete_slab.json +11143b636a70bf7515ed922ca23abb8231bda60a assets/tfmg/blockstates/green_concrete_stairs.json +dd06f00a75ab085ce616c9733525e5cf47482134 assets/tfmg/blockstates/green_concrete_wall.json 9753ec68aa5fe10f618000b453a242d5e685b7d7 assets/tfmg/blockstates/heavy_casing_door.json c7aa764cc11ee837deeed68c9c2d8567ea078f5c assets/tfmg/blockstates/heavy_machinery_casing.json dea24edfcb504c6c74560174a94bd7d3e5d58e76 assets/tfmg/blockstates/heavy_oil.json @@ -37,15 +62,39 @@ dea24edfcb504c6c74560174a94bd7d3e5d58e76 assets/tfmg/blockstates/heavy_oil.json 7199cbfa37e83fcedf8e99af48b05b283aef319f assets/tfmg/blockstates/kerosene.json a8f81ce72c3f074ffef304b238ae805f3b4ea763 assets/tfmg/blockstates/layered_bauxite.json 34b4665b1ad1f302cebf30a5b1694c47b7ec1b8a assets/tfmg/blockstates/lead_block.json +bb191e7540b3e1df63c93718eaa674c19b57abab assets/tfmg/blockstates/light_blue_concrete.json +39f77bb75137d03c34947908dfea0bb077132bbf assets/tfmg/blockstates/light_blue_concrete_slab.json +2e1bdcb35ec7fe5273d7f8e45e50fd5afd61069a assets/tfmg/blockstates/light_blue_concrete_stairs.json +5e3919e58450abab9fc346ab698ee58a4e7e26ee assets/tfmg/blockstates/light_blue_concrete_wall.json +8be7bfb02d65c9bfbeef21bf8e088452012236c4 assets/tfmg/blockstates/light_gray_concrete.json +9ed79792a8af71018827d9f80cada08f4da0f357 assets/tfmg/blockstates/light_gray_concrete_slab.json +febd7b6a8e7d3b3ea0f8dd3d8e8f798a19aefcc6 assets/tfmg/blockstates/light_gray_concrete_stairs.json +393912dacebcc0948b0faf9a610ce02d65317e44 assets/tfmg/blockstates/light_gray_concrete_wall.json +ddb241a1d67117bfc282c453fba15acd9950a7a2 assets/tfmg/blockstates/lime_concrete.json +a2c5689e6cbdd92500ec72802eaba2558bae42c8 assets/tfmg/blockstates/lime_concrete_slab.json +230a296449bdce273104fdfc83700c04b0089933 assets/tfmg/blockstates/lime_concrete_stairs.json +8667f73f37448b0c689a619818a15d617c513fe1 assets/tfmg/blockstates/lime_concrete_wall.json 55cba7d103b52b31f2deb59effcc01cfae6e2c05 assets/tfmg/blockstates/liquid_concrete.json d3ba2682652fd44337d1f82ec382df17611fabe1 assets/tfmg/blockstates/liquid_plastic.json 2dc4b1da2bee0275cbb13ef89003d56f62d4443d assets/tfmg/blockstates/lubrication_oil.json 6c819d5f63ca53146d069ba0d00b3e1b10391a68 assets/tfmg/blockstates/machine_input.json +6c88c9964466c642bee642ddf5949afd41decb19 assets/tfmg/blockstates/magenta_concrete.json +2052d36ce93141a6915bbf4f2e9ba485e241fef3 assets/tfmg/blockstates/magenta_concrete_slab.json +96217ee5e14df8d0f08552355e51716c973f7d18 assets/tfmg/blockstates/magenta_concrete_stairs.json +717037ad7e8a02c29c2b4411b65bc486778cbcab assets/tfmg/blockstates/magenta_concrete_wall.json 3dff9e1ec59415779195d2abfa9f07bc17b428a1 assets/tfmg/blockstates/molten_metal.json ebd6804b999acea36abbf07c2381ee6dee0d7a16 assets/tfmg/blockstates/napalm.json 0f33dc6b2a736164b17f416ce7d127c87bfb6441 assets/tfmg/blockstates/napalm_bomb.json 89f2902010903aad686571ef37c781b111147456 assets/tfmg/blockstates/naphtha.json 98a003d914c034d7fdc0e7da31c550cbc8d068f1 assets/tfmg/blockstates/oil_deposit.json +c37edaba2d6d474398cc5cd3f60390f03c0572c4 assets/tfmg/blockstates/orange_concrete.json +d8c66e9518950f5d7aef101f97bfd8373a3456d8 assets/tfmg/blockstates/orange_concrete_slab.json +38e46c8c441c090263b1b90fd8417b4e3ab14ec5 assets/tfmg/blockstates/orange_concrete_stairs.json +454996edc38bdada9d4d1dec3cdeaa17a902f9ec assets/tfmg/blockstates/orange_concrete_wall.json +2f05966de00d299ea5ca29f29c235468867e56a5 assets/tfmg/blockstates/pink_concrete.json +d0d006b1476b4be3a89cc22a56bae0779d6f2aad assets/tfmg/blockstates/pink_concrete_slab.json +d1c16a2637c3725b904a12cc036cd2d3de69f00b assets/tfmg/blockstates/pink_concrete_stairs.json +22ad562a75bcf2f7d320f601a18ce2747ee1ac5f assets/tfmg/blockstates/pink_concrete_wall.json de9db40aec6d8dfe1afc222cd136df66a5ea0ff4 assets/tfmg/blockstates/polished_cut_bauxite.json 666a8272c3b88cc95106ff6c517b39d5f405cd15 assets/tfmg/blockstates/polished_cut_bauxite_slab.json 09b0074325813fc7b3cc47d406127abd0cfff21a assets/tfmg/blockstates/polished_cut_bauxite_stairs.json @@ -53,6 +102,14 @@ de9db40aec6d8dfe1afc222cd136df66a5ea0ff4 assets/tfmg/blockstates/polished_cut_ba 59fb2e38fb27b009de937602af7fb6b93a882f52 assets/tfmg/blockstates/pumpjack_base.json 9c839b1cc9aa5450ca4bc3501a055a0b5f8b5eee assets/tfmg/blockstates/pumpjack_crank.json 48e6c14565bf2d1c3a33a6642ce17e76d99f200c assets/tfmg/blockstates/pumpjack_hammer_holder.json +9437d1ab6bdc0b61bb7eeda0b915413567ca2d5b assets/tfmg/blockstates/purple_concrete.json +0e498253d6e9cc8085dba93440b5531d6f4e6d3f assets/tfmg/blockstates/purple_concrete_slab.json +cd0efffbfec34f486ff8754fe101d549ecb89b4f assets/tfmg/blockstates/purple_concrete_stairs.json +aa93dabc5a9694f94d2a91e6b4060eccfa108a0c assets/tfmg/blockstates/purple_concrete_wall.json +fd0cfd9937dcf920b376da7a1075747610368b42 assets/tfmg/blockstates/red_concrete.json +c56002be5068f20200930306f8bd8d70df304ea0 assets/tfmg/blockstates/red_concrete_slab.json +84428de5f191b0d5ec7101ab1e6bda689f3a0fad assets/tfmg/blockstates/red_concrete_stairs.json +3b2c2ec57ef6ba5c13874541111b3c39b5e1bccd assets/tfmg/blockstates/red_concrete_wall.json 759968da877221c21f6979f6af6cf201a9a8c1b7 assets/tfmg/blockstates/small_bauxite_bricks.json bf9dcbeabbd8d9da8dcd1cd9d42c3fce6509e7e6 assets/tfmg/blockstates/small_bauxite_brick_slab.json e80f4610e3272a4edfb47572aff71f1db3d283d7 assets/tfmg/blockstates/small_bauxite_brick_stairs.json @@ -69,8 +126,16 @@ e29906d296994a13fefc2beb22f7693e1027dd1b assets/tfmg/blockstates/steel_fluid_val 71b4c68d8a02062252c4dfde41650b7667d8c0ca assets/tfmg/blockstates/steel_sheetmetal.json 47b56dad1f2715aae7430b5f9acb1d51a26cf562 assets/tfmg/blockstates/steel_smart_fluid_pipe.json 942bb86fa92b3c40fc535dccdd2e9f3b79a36d92 assets/tfmg/blockstates/surface_scanner.json -4ac8f2584be9abd987a4cd0516a5dc6cf08b5f58 assets/tfmg/lang/en_ud.json -5280ab5d23d323e2d440c1baf054e5d7f33f94ab assets/tfmg/lang/en_us.json +f0008a901bc09a81bfc3679eccf2e2eaea316a50 assets/tfmg/blockstates/white_concrete.json +624366f1e6f02b5cc0819f7d2f56920e5b8d0557 assets/tfmg/blockstates/white_concrete_slab.json +03716a2a69f857225836a910a861e0d3b41f177f assets/tfmg/blockstates/white_concrete_stairs.json +a91a739eb2fe9a2d24c409d2be93501503f87090 assets/tfmg/blockstates/white_concrete_wall.json +054af0b94f124941d9cf96c58f68a6114bd75977 assets/tfmg/blockstates/yellow_concrete.json +98c9aa212e82100d7fc47354760940cc946594d4 assets/tfmg/blockstates/yellow_concrete_slab.json +a1988ec6a98f23cad8321b46345fbf1c5fd20489 assets/tfmg/blockstates/yellow_concrete_stairs.json +c58fa20c091e5ecddfb7164cba45538a8f911431 assets/tfmg/blockstates/yellow_concrete_wall.json +ce0140677cad8c0d8a61061cee49b0853507d448 assets/tfmg/lang/en_ud.json +e2744c0c7ef4826407f7684fe7fa24466c45022f assets/tfmg/lang/en_us.json 9e6a6b62f5e7528c4e4d4f72f3510edcd8f0c078 assets/tfmg/models/block/aluminum_block.json 5a4c785e8d8394ccd125732c0017459648574c4e assets/tfmg/models/block/bauxite_natural_0.json 4ace0da00498fcbb9ddfdf321767b40b095c8778 assets/tfmg/models/block/bauxite_natural_1.json @@ -78,7 +143,34 @@ e29906d296994a13fefc2beb22f7693e1027dd1b assets/tfmg/blockstates/steel_fluid_val b43711f35915b71b15db638538a83a4ea46480dc assets/tfmg/models/block/bauxite_natural_3.json 920f96d4b648414ce8331e5a81e6b7ddbce7e225 assets/tfmg/models/block/bauxite_pillar.json cd5ade5f9a0b3b5e28b5d11a685408dd922dbe2d assets/tfmg/models/block/bauxite_pillar_horizontal.json +a49e844b9d3426719506ab72c82be94106dd9729 assets/tfmg/models/block/black_concrete.json +a80c6501d7ab88523499266c9b2aae9ada15e33f assets/tfmg/models/block/black_concrete_bottom.json +0a689e15c3933ae96293d8689247bd2291dfbaa9 assets/tfmg/models/block/black_concrete_stairs.json +654f5460397e9221127aad0504c17bf8db001236 assets/tfmg/models/block/black_concrete_stairs_inner.json +59a02514d363474195a60c73e2059d8962b2eeb0 assets/tfmg/models/block/black_concrete_stairs_outer.json +be4c782a3f82325a84f0feaa56d3f114aa2a93a5 assets/tfmg/models/block/black_concrete_top.json +5752f421b928c440183ceddd1cf2a0778c316b4b assets/tfmg/models/block/black_concrete_wall_post.json +f945d7434df89a458022fdff31c05410a6baa418 assets/tfmg/models/block/black_concrete_wall_side.json +19d8228d961b16543957f8a5f570ab5c33a84b7a assets/tfmg/models/block/black_concrete_wall_side_tall.json 15597a6b96250c5ac383daca00e7cbf47d629947 assets/tfmg/models/block/blast_furnace_output.json +ec8df0e04ef046e61a6879b5aac0b57e5c00fbdb assets/tfmg/models/block/blue_concrete.json +08e743405ca4dc3d64179c1a016dca80d0eb0e59 assets/tfmg/models/block/blue_concrete_bottom.json +f10130b81ba5d154146abc65c191d87acf97241e assets/tfmg/models/block/blue_concrete_stairs.json +e53beb31efa95d3a0a4f37e1a2a8f7166a7c5099 assets/tfmg/models/block/blue_concrete_stairs_inner.json +a54e802e4004559c75801e8f86179f3309d4d235 assets/tfmg/models/block/blue_concrete_stairs_outer.json +7ca60603cac1702872e5a21dfb2508fa6db1d612 assets/tfmg/models/block/blue_concrete_top.json +3ef0060f5682801306b352b8a040d8db082a8525 assets/tfmg/models/block/blue_concrete_wall_post.json +682dc5586be962a78283fc1764bf471d0d20c598 assets/tfmg/models/block/blue_concrete_wall_side.json +fadbdc5fc6614b6aa126e71f4298e27e6af4c74e assets/tfmg/models/block/blue_concrete_wall_side_tall.json +755f62d7c9773c8733c80150100409a97b1b8925 assets/tfmg/models/block/brown_concrete.json +4abe5a60d2a1953596ef00b65d1f82d87d6638e0 assets/tfmg/models/block/brown_concrete_bottom.json +344490ebab8b66a451a837f586d5b2eff40d4d44 assets/tfmg/models/block/brown_concrete_stairs.json +73d89df6f1abcf2a73226d7b80d0e553590de5ec assets/tfmg/models/block/brown_concrete_stairs_inner.json +888fec3cd4609e8f1a465a619397146356a770a6 assets/tfmg/models/block/brown_concrete_stairs_outer.json +9ecf96f084b51eebe355dcaea014e7478dd8b100 assets/tfmg/models/block/brown_concrete_top.json +844f9ffae26fa5fd58f169a23d9e52f44fb5e412 assets/tfmg/models/block/brown_concrete_wall_post.json +f7859871c4ed8bd987aad68b8ecb65328708ec3b assets/tfmg/models/block/brown_concrete_wall_side.json +fc263e5f3999e7e23471cbd6f3663239dfac363c assets/tfmg/models/block/brown_concrete_wall_side_tall.json 37789d06ec6cfc0312be7b1b66ac1ec6403d4516 assets/tfmg/models/block/cast_iron_block.json 925d61d0f1379e02c1f8892e3b86be5aa623b9ae assets/tfmg/models/block/cast_iron_distillation_controller.json 73cb08b1b298a3e02731e61326b65f94ef39e9bb assets/tfmg/models/block/cast_iron_distillation_output.json @@ -105,6 +197,15 @@ c087d9aad64b8d89cfbbe58a3db6a4e8ef6ff3a8 assets/tfmg/models/block/cut_bauxite_st c85e3f557de57442a06502abd302f2b0deb4c6bf assets/tfmg/models/block/cut_bauxite_wall_post.json 38e83097489baf251fba2c4229a6fedf6b441528 assets/tfmg/models/block/cut_bauxite_wall_side.json a98527559bb1385b628e465d629ac429cdfb9f8e assets/tfmg/models/block/cut_bauxite_wall_side_tall.json +618d59eb1932c5adb0067731c224b8cbee774a6d assets/tfmg/models/block/cyan_concrete.json +b7d5e9521d259a8e15150c775e690eaeb577b8c3 assets/tfmg/models/block/cyan_concrete_bottom.json +f96eef07802246f99f1f58e175e9702a52e61c49 assets/tfmg/models/block/cyan_concrete_stairs.json +4d5f03bbec3016016b9c996e4a2f699ec7302477 assets/tfmg/models/block/cyan_concrete_stairs_inner.json +8be78ed206af865ba706f5fd5fcaf2b063c42df0 assets/tfmg/models/block/cyan_concrete_stairs_outer.json +9b6ce8f813b50c0f104c8a5e30796e0c928eebf3 assets/tfmg/models/block/cyan_concrete_top.json +7dbcc9a9fb06920609eed68adcc5811c80fe1e04 assets/tfmg/models/block/cyan_concrete_wall_post.json +7664edb7379805be37a42f6b7358a8b6a351c346 assets/tfmg/models/block/cyan_concrete_wall_side.json +22d02a8b23d403a34b1da585f8d10cd2cf85f638 assets/tfmg/models/block/cyan_concrete_wall_side_tall.json 997750c71f9ead915c393c5821146a57dcd01bfa assets/tfmg/models/block/diesel.json 9202745e6093098507d6b800f5e52a99b74eaa20 assets/tfmg/models/block/fireproof_bricks.json 88d17739f2b8a2d77397f20bdbba486f95f88d18 assets/tfmg/models/block/fireproof_brick_reinforcement_wall_post.json @@ -112,20 +213,92 @@ a98527559bb1385b628e465d629ac429cdfb9f8e assets/tfmg/models/block/cut_bauxite_wa a657ae729b3afadf239d0a48b55f54ab756f4ec9 assets/tfmg/models/block/fireproof_brick_reinforcement_wall_side_tall.json b0cb044b77cb3ffaf0628e0a06a8fe12c7462da0 assets/tfmg/models/block/fossilstone.json e0cf42adbfeaa5c781b8239352335985658ae2d3 assets/tfmg/models/block/gasoline.json +2c5fc6e5a6a600f95df53abda56dc70b8c96b4bf assets/tfmg/models/block/gray_concrete.json +cefd4317ef0afa08a5dd05a22899872844795bf7 assets/tfmg/models/block/gray_concrete_bottom.json +6b4635f007e7fc8935764698716c04d95e1bb978 assets/tfmg/models/block/gray_concrete_stairs.json +8bec3722799e2898ca586ca4c61964f148ad4383 assets/tfmg/models/block/gray_concrete_stairs_inner.json +c76becbcb787b31c67b2dc8181f8089103022659 assets/tfmg/models/block/gray_concrete_stairs_outer.json +3d5f35e1f0700f7f87e2c5e8b5e54aedb21968ea assets/tfmg/models/block/gray_concrete_top.json +d33a24948b639c30b378f20e2f86255aa6be7835 assets/tfmg/models/block/gray_concrete_wall_post.json +2aca421149dcee0e9d3f36f5ab2a8cb8a02b6924 assets/tfmg/models/block/gray_concrete_wall_side.json +8001ee2683f0c95ba1fc9c37364afd3097fa27f9 assets/tfmg/models/block/gray_concrete_wall_side_tall.json +41c3a6e002675e2c188b359e1b7bdd1ab59b3847 assets/tfmg/models/block/green_concrete.json +48d7022b0ec25fb8e16f2a112529f20862b775cf assets/tfmg/models/block/green_concrete_bottom.json +f94c77a72d75c2f0289709075d810de4b1ba042f assets/tfmg/models/block/green_concrete_stairs.json +fb326634ed8af2dc0eb9ff474c56e86b07b7c348 assets/tfmg/models/block/green_concrete_stairs_inner.json +74b15b152831d79bed96b7d55496c11d66d7c0e0 assets/tfmg/models/block/green_concrete_stairs_outer.json +29a8ed83a0d18b856bddb049215c04ae2569f757 assets/tfmg/models/block/green_concrete_top.json +c0e92a75dbb6a9b273971e772c499ca575cd0edb assets/tfmg/models/block/green_concrete_wall_post.json +bb5535ccddef7c6da2769888a79245d16381952c assets/tfmg/models/block/green_concrete_wall_side.json +9d311f37cdaed122f7178b3d4670b084c80ef9b2 assets/tfmg/models/block/green_concrete_wall_side_tall.json 717ee09803cb584062c9717f45475fbd15673cde assets/tfmg/models/block/heavy_machinery_casing.json 725ac5c4c5aade982edbcb6c4e6c53626f0e68e4 assets/tfmg/models/block/heavy_oil.json 6c893c24e234b70930e69cfc742df3af97d9a337 assets/tfmg/models/block/industrial_pipe.json 796f870ee5d3f55ace500798ae389e532c7233b8 assets/tfmg/models/block/kerosene.json 87cc75cb9bc8e65f8e46785b14e21ac5a4356faa assets/tfmg/models/block/layered_bauxite.json 79862c4e9a084be72f402e1378c3bb009a8db889 assets/tfmg/models/block/lead_block.json +50c3eede0eb0f4a28abc7dac6f4896b80d95ffff assets/tfmg/models/block/light_blue_concrete.json +f45cdc254e2df518fb9c2e2e4ad1446cb0e3fd3b assets/tfmg/models/block/light_blue_concrete_bottom.json +5d035d017b707f073b8ec39ab170a2e1b4fdc025 assets/tfmg/models/block/light_blue_concrete_stairs.json +a506f178cbb7f5841ee519f1641c07170efc841e assets/tfmg/models/block/light_blue_concrete_stairs_inner.json +b4089d7dcbb1e954911552768f83154209d7eeaf assets/tfmg/models/block/light_blue_concrete_stairs_outer.json +591d3d2c3ff79101cc3f71d39a16a9bc76401bef assets/tfmg/models/block/light_blue_concrete_top.json +2ad1d503b189a673db40273f5b1509d332563d42 assets/tfmg/models/block/light_blue_concrete_wall_post.json +411682670e1330ff12cb2b0cbc67c7dfeec76953 assets/tfmg/models/block/light_blue_concrete_wall_side.json +41678a761df5da1df357d8f9daf8e3175d7c2237 assets/tfmg/models/block/light_blue_concrete_wall_side_tall.json +e3767745816d9ba79adf5ed7ac443be21e0f6926 assets/tfmg/models/block/light_gray_concrete.json +15c3b42122e3f6aa00630279d1aec0386ddb0cd1 assets/tfmg/models/block/light_gray_concrete_bottom.json +3693fadf2776450e75f6bd388a976e27026e85d7 assets/tfmg/models/block/light_gray_concrete_stairs.json +a020e3fda20b01d4070b271120bae6235b466f75 assets/tfmg/models/block/light_gray_concrete_stairs_inner.json +2dcba32bd4717c8edf75d2701ed03e64f7be781a assets/tfmg/models/block/light_gray_concrete_stairs_outer.json +20bd48bd1ed4f0ef6eca6ebc264aeb046efd4b81 assets/tfmg/models/block/light_gray_concrete_top.json +086b4cee3c01ff9d97113ed4f2a9d26e36384c11 assets/tfmg/models/block/light_gray_concrete_wall_post.json +8f59866bcc91ec6b5b5590ed61d9b15ac730aec9 assets/tfmg/models/block/light_gray_concrete_wall_side.json +fd7f9b361a1f71b1438076ff22e4140cc6a7c0fa assets/tfmg/models/block/light_gray_concrete_wall_side_tall.json +41ce67785e3e3941d7b9a1d2078a2bc3d7f46a4e assets/tfmg/models/block/lime_concrete.json +11d96089e7c5d61dbc9944cf3e8e80760113e3f0 assets/tfmg/models/block/lime_concrete_bottom.json +fa1a971f73f0f86b59f517c34534f791bdb3d3e5 assets/tfmg/models/block/lime_concrete_stairs.json +6f04e8f04ce3abaf3589e69297eb321548d0a690 assets/tfmg/models/block/lime_concrete_stairs_inner.json +4f5bc34573c8a823f5ead7396ac006e138ab8fdf assets/tfmg/models/block/lime_concrete_stairs_outer.json +a0156fffa3e16fc4fce46627b80d221c7e3b288b assets/tfmg/models/block/lime_concrete_top.json +1927ae9c32c0738a6befb0fb3b3e77a4e40b8249 assets/tfmg/models/block/lime_concrete_wall_post.json +9e176144520e29888f217accf55bef45982e9f28 assets/tfmg/models/block/lime_concrete_wall_side.json +e004cb6834f41b9b79b21ac2299e0cf25364655d assets/tfmg/models/block/lime_concrete_wall_side_tall.json eced115e0feb825f719abc480c4f9d7e7cc698c8 assets/tfmg/models/block/liquid_concrete.json 03ace76bbda220374985683aeea1eb4466bd4f13 assets/tfmg/models/block/liquid_plastic.json 6de36688139c9b11ed1ce6ef26ef1b65dfad34f5 assets/tfmg/models/block/lubrication_oil.json 0eb63c5a02a37435d1abef55fb1373aa67cf7b88 assets/tfmg/models/block/machine_input.json +d4b6d14d6ff35dc688fcbe528967c4f431be42e5 assets/tfmg/models/block/magenta_concrete.json +447f65768cd328253278823068a95ab21f732d90 assets/tfmg/models/block/magenta_concrete_bottom.json +b24fb7dd304535239b356c7f24d88bd4ba4047bf assets/tfmg/models/block/magenta_concrete_stairs.json +b4b9531e5e917c8503ecd3559aec2b9c8a724d1e assets/tfmg/models/block/magenta_concrete_stairs_inner.json +1d642810234ee3292d8777dcecc42b44093864be assets/tfmg/models/block/magenta_concrete_stairs_outer.json +313754925397d470181bc3258cf1b6d659fd983a assets/tfmg/models/block/magenta_concrete_top.json +69afb99c9b25c72162af2c8a99610469c7f6712b assets/tfmg/models/block/magenta_concrete_wall_post.json +aadf3a5b1b19992bad786a5049ddd9eef6c6d940 assets/tfmg/models/block/magenta_concrete_wall_side.json +bcda75f097f13b1d873493e87068584bf507a006 assets/tfmg/models/block/magenta_concrete_wall_side_tall.json 80fb4a90f861992322bfd63f1232593e8cce708e assets/tfmg/models/block/napalm.json b541c0cab9298f1d2578639349755b93f1019621 assets/tfmg/models/block/napalm_bomb.json e8e7bb74d46f9cec768a5443c10870fe1dd2105b assets/tfmg/models/block/naphtha.json 891d9c448d29b31bd28b3bf86395aabe9d645b87 assets/tfmg/models/block/oil_deposit.json +198c3584fdfe4807816954ec806ea7505b4839d1 assets/tfmg/models/block/orange_concrete.json +504faa077501ac6415ab9d697a4dba80f5bef5a7 assets/tfmg/models/block/orange_concrete_bottom.json +6c39050c75d1cb6b98933349dd4baa9b5c211774 assets/tfmg/models/block/orange_concrete_stairs.json +7b700d05bfbdc3c5c6b9c1dc80fcffe22c99eb71 assets/tfmg/models/block/orange_concrete_stairs_inner.json +11086681ad070b2951b20a76f6376404955ec5fb assets/tfmg/models/block/orange_concrete_stairs_outer.json +9f5b3444938397a5b37819c3b7516786fa495a1b assets/tfmg/models/block/orange_concrete_top.json +dbf36f24a55c5f435407e8df81b792d262622761 assets/tfmg/models/block/orange_concrete_wall_post.json +4b3f2d0c00e0634498c9bd835a95e6d5da2f4aeb assets/tfmg/models/block/orange_concrete_wall_side.json +3c9781cee9aa6bf890b0b3d7ab6dad1e80570bea assets/tfmg/models/block/orange_concrete_wall_side_tall.json +76bd7055f258946d93d3ee5c2aa06457e80ddb24 assets/tfmg/models/block/pink_concrete.json +871ae36c6f2bc9468eb823241da16cb67064d037 assets/tfmg/models/block/pink_concrete_bottom.json +23a5e44476e1ec8ba6778bbc3dad12d04f8573a5 assets/tfmg/models/block/pink_concrete_stairs.json +e3d90b391cf0c05071fe1d61f5bc3d890a4fa506 assets/tfmg/models/block/pink_concrete_stairs_inner.json +712c170ad3bfa40ea45353ec1dfa8d7025395e67 assets/tfmg/models/block/pink_concrete_stairs_outer.json +64c3cc5857bc5ec32a301f3b4ca13b5d5fe98aa1 assets/tfmg/models/block/pink_concrete_top.json +23650fd79100a79670b3dd3bcc67d52dc6ed4ec1 assets/tfmg/models/block/pink_concrete_wall_post.json +78ae26560ff23389b2219a76b74974f4c1eb91fd assets/tfmg/models/block/pink_concrete_wall_side.json +5b58dbf873c00087d476f4b395f7090b34f5bcdb assets/tfmg/models/block/pink_concrete_wall_side_tall.json 713266e9f0f9ad53bfebee09059f4ac443d4e5a6 assets/tfmg/models/block/polished_cut_bauxite.json 5f847a2787b932b7c0984c78ec7abe0c80f4632b assets/tfmg/models/block/polished_cut_bauxite_slab.json 02a179eed2dc456e2e590255d1e41c894cf126ce assets/tfmg/models/block/polished_cut_bauxite_slab_double.json @@ -139,6 +312,24 @@ dfaec7706609f1df7535203fbc653e53907f6885 assets/tfmg/models/block/polished_cut_b cd235893ef4ab30f83c76635dba2ed6a09e5aa3a assets/tfmg/models/block/pumpjack_base.json 46190cbdab7774010229d537796d8396aecf3288 assets/tfmg/models/block/pumpjack_crank.json f134b83206ab8fa1199aecbfb110a8cc5e964cee assets/tfmg/models/block/pumpjack_hammer_holder.json +ba6f69e143915fedf081f7bf3434e2ecfe9c86a7 assets/tfmg/models/block/purple_concrete.json +b8620085e7a0f53365cdab32cc6fa09888ce0514 assets/tfmg/models/block/purple_concrete_bottom.json +b2d96b5c7a937d69452e75a52f29ceba99df2c8d assets/tfmg/models/block/purple_concrete_stairs.json +8a7c9295625c0f628121b236b58eea2ac5762297 assets/tfmg/models/block/purple_concrete_stairs_inner.json +56d9a751cce394b818abb3df783189a00dec86db assets/tfmg/models/block/purple_concrete_stairs_outer.json +ed75898bcabca38c33cf3b5f4cdf542ad8f43823 assets/tfmg/models/block/purple_concrete_top.json +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 +1a7e3178749d61380189e5d2e82a449a7af955e9 assets/tfmg/models/block/red_concrete.json +e31bd8cef2a057dd918c9d7f5324585b317391ab assets/tfmg/models/block/red_concrete_bottom.json +50f1c8c09a56b94a9d0c60c3c78e90e4a7e7d3b2 assets/tfmg/models/block/red_concrete_stairs.json +e0e4ed6ac58d5b073bada6627f8db40df532437e assets/tfmg/models/block/red_concrete_stairs_inner.json +9bf9252fff90f8b5656d6a6b834b9efe9701390d assets/tfmg/models/block/red_concrete_stairs_outer.json +ebe034df02109594467f14936fe51fc9599837a4 assets/tfmg/models/block/red_concrete_top.json +dc6e4ccb14d0e1e9609a2288b36e795193ce9c90 assets/tfmg/models/block/red_concrete_wall_post.json +51eb342e89183a45f82b07cb5bd7dcc0af3cb92d assets/tfmg/models/block/red_concrete_wall_side.json +cceea88c9ee12c5a6ffb6d1e722aa1d39618d59b assets/tfmg/models/block/red_concrete_wall_side_tall.json 0527561f96904dabea20a824baf8828ff1bbfc32 assets/tfmg/models/block/small_bauxite_bricks.json 35349e72beddafb42b477c100ba16e41eb0bc473 assets/tfmg/models/block/small_bauxite_bricks_wall_post.json 86658ab1a36973071032dd844664d817e0628adb assets/tfmg/models/block/small_bauxite_bricks_wall_side.json @@ -183,12 +374,43 @@ d34e5efd71420623baab6ff86cbb9a68abcb343d assets/tfmg/models/block/steel_pipe/ud_ e583e8755126d362e21057464e2f12af3f32ba25 assets/tfmg/models/block/steel_pipe/u_y.json 56b3110e7a55c08302e27d5b7f32f7b7b9cd60a0 assets/tfmg/models/block/steel_pipe/u_z.json c7b153dff2ba1a88f02e950cc8d28d61bd68b1df assets/tfmg/models/block/steel_sheetmetal.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 +9707001dbf261e5c8086b1991fd0055de943d645 assets/tfmg/models/block/white_concrete_stairs_inner.json +31e5248e1cef5b863cae89c8ecb435b4c17ded1d assets/tfmg/models/block/white_concrete_stairs_outer.json +f3bda435c4253bb54336b3767446293d1eec7af2 assets/tfmg/models/block/white_concrete_top.json +2f3451e530a0543345df5d9fc27ce2d88142d23d assets/tfmg/models/block/white_concrete_wall_post.json +21f3a70526abf7deef3b3751c6cede1b87883089 assets/tfmg/models/block/white_concrete_wall_side.json +80fad7af8287eb9705f8afeb2cde958e12071be4 assets/tfmg/models/block/white_concrete_wall_side_tall.json +3bc79405c46c5411e65d70265769cd86f16ff040 assets/tfmg/models/block/yellow_concrete.json +e470e91ec9f63b160f360b02e4f0895f3d94428e assets/tfmg/models/block/yellow_concrete_bottom.json +c6ef8cfdd60dc6d163699847a1dcaeb1f5b2b297 assets/tfmg/models/block/yellow_concrete_stairs.json +00ab90cf9cb32d06b2517a3c0cd4e626b4174b8e assets/tfmg/models/block/yellow_concrete_stairs_inner.json +3408b47b607ee17c6ce57038d044f89e39b6e0a1 assets/tfmg/models/block/yellow_concrete_stairs_outer.json +b9a1477ab92ea6eb6daad65aad5e73f339402588 assets/tfmg/models/block/yellow_concrete_top.json +fea28ae2dbee700a4219f227bf6a87502b31cb05 assets/tfmg/models/block/yellow_concrete_wall_post.json +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 714173e054b787915b8cebfb50deb61b28dba5a3 assets/tfmg/models/item/aluminum_block.json f685ca653c8e197986b1ac8f43297989816d39d2 assets/tfmg/models/item/aluminum_ingot.json 4ace0da00498fcbb9ddfdf321767b40b095c8778 assets/tfmg/models/item/bauxite.json 41091873d85bac787e4752d0ff81189432f1e28e assets/tfmg/models/item/bauxite_pillar.json +84e0e0c582d8e8aa155073716c6840c823a3811b assets/tfmg/models/item/black_concrete.json +059e1cf0e5a1b37e2ae807cea32f62f28817787c assets/tfmg/models/item/black_concrete_slab.json +d5251229881d3c03f887dd11a34a200ec71ca03b assets/tfmg/models/item/black_concrete_stairs.json +a41523da5b971a98e101f03f058f50c944fc4960 assets/tfmg/models/item/black_concrete_wall.json 8ef0374ff08be7e1501c64fce1e075144e0c070f assets/tfmg/models/item/blast_furnace_output.json a846fbfd51826403a8695e89fccaa9d54a7e3ea6 assets/tfmg/models/item/block_mold.json +c5ad82126c949732854f9be8492d4bfdf756259b assets/tfmg/models/item/blue_concrete.json +96648e327c65736445def6d44948cc9a883fb860 assets/tfmg/models/item/blue_concrete_slab.json +916e86f0a2f5de23ae84e5289176573033dae696 assets/tfmg/models/item/blue_concrete_stairs.json +1f3696b17c4630b06c61af5bc9fd06d0ff702eec assets/tfmg/models/item/blue_concrete_wall.json +2af2b0dbdd2e56e6a206a4ff3e20672fdff60a12 assets/tfmg/models/item/brown_concrete.json +4edd1d1a741a4bcee9dc1c5526ce2a97e878ede2 assets/tfmg/models/item/brown_concrete_slab.json +4d8e39b32cf583923994d5e3da0c720d3777b9dd assets/tfmg/models/item/brown_concrete_stairs.json +0be3b12389658b8cdc54796d2b60dc3440171e0c assets/tfmg/models/item/brown_concrete_wall.json 1e73706492a2cc569bb603443d56b2e9773b9c6b assets/tfmg/models/item/casting_basin.json 94fd821fec37d1f451c1094d19ead45ed8c98f45 assets/tfmg/models/item/casting_spout.json ec38882fb9010884823d6d6afa604f8a6512d279 assets/tfmg/models/item/cast_iron_block.json @@ -212,12 +434,24 @@ cb56b95b0aad65f7d51e707eb7c4e5fa406bb741 assets/tfmg/models/item/cut_bauxite_bri 65fc6c720b7fcd2609ee20215971e84e0d0c0cd3 assets/tfmg/models/item/cut_bauxite_slab.json e6bf52c7a969b26d65cc36353a6a3e2a91752e42 assets/tfmg/models/item/cut_bauxite_stairs.json 0cef1f82baa51acdbe768b60f54ba126f9f6eb60 assets/tfmg/models/item/cut_bauxite_wall.json +606a911fc34096d2213eb7262a02a3ca239b7df1 assets/tfmg/models/item/cyan_concrete.json +7c8c3a20c9e2487017c0a0a32a21a7194b01cb0c assets/tfmg/models/item/cyan_concrete_slab.json +5a0b3c3328796a6b85a0faeb8fa9e5f676e4ab03 assets/tfmg/models/item/cyan_concrete_stairs.json +36ddfc344417e445c751af930d937cab41e81d6c assets/tfmg/models/item/cyan_concrete_wall.json 3497bcbaee50b2f766de659043bf3c36823b570d assets/tfmg/models/item/diesel_bucket.json 080629b77cc20daacb129c7fe3c3a97d5df677f2 assets/tfmg/models/item/fireproof_bricks.json c0137c7e66f70afe28cac27fe903fe000e4c8eae assets/tfmg/models/item/fireproof_brick_reinforcement.json a11a0b5a9887ba342d80b574a7f2c3dc5cdd7372 assets/tfmg/models/item/formwork_block.json 7e4a58a6d05b19dc8c5fff73434c2d7cefa75343 assets/tfmg/models/item/fossilstone.json ed2830b2988403aebaca633b2e315878b41f7503 assets/tfmg/models/item/gasoline_bucket.json +c7d4cc91447bc3512efbe18bc7b2344a42196a88 assets/tfmg/models/item/gray_concrete.json +c6e8b96444d3846d41e34fee578013f644a78a00 assets/tfmg/models/item/gray_concrete_slab.json +b4f8f0ab7e36d17544706f2a40a5a7970c49b18f assets/tfmg/models/item/gray_concrete_stairs.json +31a09cb5e3993b3e6166f11ecf8db8ebba224760 assets/tfmg/models/item/gray_concrete_wall.json +ff1641bd493666480186a4b926d4942c1f707fcf assets/tfmg/models/item/green_concrete.json +71e878e3f709bb5d252bc2bbdcfdac4f7dee4096 assets/tfmg/models/item/green_concrete_slab.json +e9129a8f6912964b13174edfb792bdfc0f47d98f assets/tfmg/models/item/green_concrete_stairs.json +2309af33d4f0dc4c95f07b694e2b6f24836f84e9 assets/tfmg/models/item/green_concrete_wall.json 5b5625568b4b6e0920fd680f626b31fd3ae6d095 assets/tfmg/models/item/heavy_casing_door.json 3fdff9e88db39939ee31968358eb51c060006766 assets/tfmg/models/item/heavy_machinery_casing.json f3bea42a905b7df9395bda18f751e2ee0c023e65 assets/tfmg/models/item/heavy_oil_bucket.json @@ -227,14 +461,38 @@ f3bea42a905b7df9395bda18f751e2ee0c023e65 assets/tfmg/models/item/heavy_oil_bucke c0f668fca568bc4c35aba97d9ac93986720e501f assets/tfmg/models/item/layered_bauxite.json ee1682c21054b9a9ffde5983141d49e8177f9a2a assets/tfmg/models/item/lead_block.json 9577774198ba4564927fc63cdfa2f61d19838c43 assets/tfmg/models/item/lead_ingot.json +5884ec17db0b5f949c0ec0b0bc22527311cd6ca1 assets/tfmg/models/item/light_blue_concrete.json +80ca9f92eb8de4d592368d476d4deb86bf9fe482 assets/tfmg/models/item/light_blue_concrete_slab.json +e2a01972a96eb3b0ddd3b25d2209168be98cdb65 assets/tfmg/models/item/light_blue_concrete_stairs.json +bc37c001a222cbb1ec77190409fef813ce904373 assets/tfmg/models/item/light_blue_concrete_wall.json +d315da0ed974d84b4c8d984129f5607a0675d5a1 assets/tfmg/models/item/light_gray_concrete.json +1d93ab2aecf5ade2a2938ffe6655a14592f42ba9 assets/tfmg/models/item/light_gray_concrete_slab.json +158d6f00759012a727803f2b12799014f5ee500d assets/tfmg/models/item/light_gray_concrete_stairs.json +d6890e38c6fbf2e9718b7019452afa4ec7f1114e assets/tfmg/models/item/light_gray_concrete_wall.json +26e9a08980b9b129f818ee432cbbfa8951db3757 assets/tfmg/models/item/lime_concrete.json +fbf6df7415c0edc6e0da805c5ea41e4c01d88152 assets/tfmg/models/item/lime_concrete_slab.json +2c09af4c17c2ab0f252a87976ca74982f1a208bf assets/tfmg/models/item/lime_concrete_stairs.json +6164fba5f7b145d65f930449857d930161861568 assets/tfmg/models/item/lime_concrete_wall.json 46bda405310f45b8faff7d29f3e2b76b6e6d512f assets/tfmg/models/item/liquid_concrete_bucket.json 630e09bfe78ed89d966b0e78599e818ef69f56a6 assets/tfmg/models/item/liquid_plastic_bucket.json c86a836bfcf884dc13094fd908a561dd1d8f7ad8 assets/tfmg/models/item/lubrication_oil_bucket.json e5b540df3672daceba8eac388904fa91cad98277 assets/tfmg/models/item/machine_input.json +558c8fe366c7d5b00e41dfe9f9e61a267e5a7b0f assets/tfmg/models/item/magenta_concrete.json +67e495cd5350171ffe42c7fe3adb15dc97db8d32 assets/tfmg/models/item/magenta_concrete_slab.json +b30c36117a4728d08ee65a80098ecac77c08def2 assets/tfmg/models/item/magenta_concrete_stairs.json +b380ae21f3274a48806976f58647150028a8df63 assets/tfmg/models/item/magenta_concrete_wall.json afac1fce0904a0df4e68d731b897ff1be6c68766 assets/tfmg/models/item/napalm_bomb.json b41853a4ae8b890f924058e57d274e956e6f4e37 assets/tfmg/models/item/napalm_bucket.json aa94f1afebb7c458e85849d8ddff76c27efefb80 assets/tfmg/models/item/naphtha_bucket.json 9907695c674afea00d3affefdc2ede9e68aa5667 assets/tfmg/models/item/oil_deposit.json +3670762634f4e4b1366b6a19253453ad3667655f assets/tfmg/models/item/orange_concrete.json +c4d486b71f966ee9019ed124e1b84914386386dd assets/tfmg/models/item/orange_concrete_slab.json +640cbc33b7e2ac984e245f05618132cf51cb8469 assets/tfmg/models/item/orange_concrete_stairs.json +8b06ab68cf9c58a2071876a1e317f2b4c314a5d9 assets/tfmg/models/item/orange_concrete_wall.json +d77e7390aaa313fbbd6bbc794f8511d862bf0249 assets/tfmg/models/item/pink_concrete.json +fd91f0efb6b57ffae2ae9062d76e3750234dd02a assets/tfmg/models/item/pink_concrete_slab.json +8163b7b6cd9c1e52e86e622b80959b55a737a8a3 assets/tfmg/models/item/pink_concrete_stairs.json +c8dbaddf0deab7fe4e420ab18138b8b8c92f4fd7 assets/tfmg/models/item/pink_concrete_wall.json b652ff21ebb628809b8756d7d62644e0d2a5adfb assets/tfmg/models/item/polished_cut_bauxite.json 489528130097d6163d032483048ac41fa9da0dff assets/tfmg/models/item/polished_cut_bauxite_slab.json ac7c8f2f308145f0ae8108648cfb9fd0513987c6 assets/tfmg/models/item/polished_cut_bauxite_stairs.json @@ -242,7 +500,15 @@ ac7c8f2f308145f0ae8108648cfb9fd0513987c6 assets/tfmg/models/item/polished_cut_ba a6da50f604abf3b381b447c494a217cdac2a9b65 assets/tfmg/models/item/pumpjack_base.json 3bcbd66f8acbdafc865012eb6cc1307c4c1efa8e assets/tfmg/models/item/pumpjack_crank.json 01e6301c2b992c89790fdf385c1f89e2c71469c8 assets/tfmg/models/item/pumpjack_hammer_holder.json +3574f93a5d5c3384bf5cac99b0dafcc5b519504d assets/tfmg/models/item/purple_concrete.json +47d418d02e729bdf140398aec4a33d8063303069 assets/tfmg/models/item/purple_concrete_slab.json +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 +779a4b7ec8fbe631fca0047390f817002ee85a90 assets/tfmg/models/item/red_concrete.json +246ed9eeac9898bc2e495e82f650a989797a8804 assets/tfmg/models/item/red_concrete_slab.json +9e71f4d1095e7568885c310d0710ef330eb1ac59 assets/tfmg/models/item/red_concrete_stairs.json +9d00ee9bd5bcd5464676311cabd925b175ba9686 assets/tfmg/models/item/red_concrete_wall.json d6cafabe2c6380ac0d2f2339a3861009de3ec989 assets/tfmg/models/item/screwdriver.json c00f7c5c7d05936bbe6a3069116c5adba5c60acf assets/tfmg/models/item/small_bauxite_bricks.json f1fffad853ccb4173ba63efaf89ce0bf112915a8 assets/tfmg/models/item/small_bauxite_brick_slab.json @@ -262,6 +528,14 @@ ec731aefdbbbaca3a4dac8ac2d6bd2d0aa6ebef5 assets/tfmg/models/item/steel_distillat 2badc90d08a4fd5f54c5e836ae2613b2e233f702 assets/tfmg/models/item/steel_smart_fluid_pipe.json e2fb504cbb8808de330d4ea87030f0d089921e23 assets/tfmg/models/item/surface_scanner.json 72da5f91f1992b502e90c8fc84d654e075163eb7 assets/tfmg/models/item/thermite_grenade.json +3364d43896991c64fd99480fdb7f5f9af1ab17a2 assets/tfmg/models/item/white_concrete.json +eed7ac8dbb27b6af5ca4037db1e2b4949ea7c16a assets/tfmg/models/item/white_concrete_slab.json +4e02717d5f18da45095a831b81e55335f686ab31 assets/tfmg/models/item/white_concrete_stairs.json +2d071678053e2c64df26025232ee54634fbbb16c assets/tfmg/models/item/white_concrete_wall.json +b109faa224eec911c1ee74044ae3a4f2eb357124 assets/tfmg/models/item/yellow_concrete.json +ece959a56af46e02f993c12fe921dc1660019686 assets/tfmg/models/item/yellow_concrete_slab.json +40b923b4bf305d225a3e9bd18e757159d97963b5 assets/tfmg/models/item/yellow_concrete_stairs.json +78c30e30b8cd20f404ead48c4e99a56dee2de5fd assets/tfmg/models/item/yellow_concrete_wall.json f189171410564631c6074593da126b8d13fe9f8b assets/tfmg/models/item/zinc_grenade.json 2b45163d462fba0e86bb1ac8fc299509fbe1e58d data/create/tags/blocks/casing.json 2b45163d462fba0e86bb1ac8fc299509fbe1e58d data/create/tags/items/casing.json @@ -296,13 +570,13 @@ d26621b9617890011a68780cf7ab40fbb4658edc data/forge/tags/items/storage_blocks/le 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/dripstone_replaceable_blocks.json 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/lush_ground_replaceable.json 694d1673a052cf6c604fd75f5f0b8954a04a05e3 data/minecraft/tags/blocks/mineable/axe.json -4f5ce2d2b247c3271434a846a5172de74ac10b39 data/minecraft/tags/blocks/mineable/pickaxe.json +0387039765b3f9146a8058212726138ab70ee1c0 data/minecraft/tags/blocks/mineable/pickaxe.json 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/moss_replaceable.json f67e51a16b6d140324ca0201f1b05e672eb63774 data/minecraft/tags/blocks/needs_iron_tool.json -755548d9019c1bb26a568488912ebfdf399e02d2 data/minecraft/tags/blocks/needs_stone_tool.json +600157e15973be3852ceea79716f4505d063439c data/minecraft/tags/blocks/needs_stone_tool.json 193c8b45d804216ca5fe2035fa8dfc4567303500 data/minecraft/tags/blocks/slabs.json -e02820ff93a8835947837b6b7e4f75b90a365ffb data/minecraft/tags/blocks/stairs.json -ab31c3dbbad90f45620470d3c22c64a2cc475790 data/minecraft/tags/blocks/walls.json +1a01a787dfc9be6f1038c8039d039a59313904f7 data/minecraft/tags/blocks/stairs.json +c98cc00d00650d5eda4ab2b76b6c47a6bcd1d6cf 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 @@ -344,10 +618,23 @@ a3cf7dc55ab1c4d12d91d870ff2f577153f6c79f data/tfmg/advancements/recipes/tfmg.bui d152c8826235944ea57ff042dcd0bd19e13a7c29 data/tfmg/advancements/recipes/tfmg.building/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json 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 a4b393a2526bd10fa38095ac80769f913f139889 data/tfmg/loot_tables/blocks/aluminum_block.json 56d114d40ea3160b5c06cf9cfaa2e5107543c460 data/tfmg/loot_tables/blocks/bauxite.json 473b0effd9a768189aa232855cd09e7b380c3adc data/tfmg/loot_tables/blocks/bauxite_pillar.json +61921290837fa1f3c4d16ba8a4a6ca198fe75a95 data/tfmg/loot_tables/blocks/black_concrete.json +b17a3f5deeec3284b7eab9e332b2fdde5833ce8d data/tfmg/loot_tables/blocks/black_concrete_slab.json +fb38e96399584a672c8f72e8bb907499a712affb data/tfmg/loot_tables/blocks/black_concrete_stairs.json +a1dc4c0bcb46e2a2604aa98c0502badba8244f7e data/tfmg/loot_tables/blocks/black_concrete_wall.json 42f0a002820ca15e79fbc28e45e0f34638e9aeab data/tfmg/loot_tables/blocks/blast_furnace_output.json +604ff761ac374ec805dc23ef41aafcb27b5c8cae data/tfmg/loot_tables/blocks/blue_concrete.json +e2470cf67953d43adedefe90e0f63a8745d778ae data/tfmg/loot_tables/blocks/blue_concrete_slab.json +ed01d5791df26ca7f1649b6baf8828b2c8020a77 data/tfmg/loot_tables/blocks/blue_concrete_stairs.json +6180f802257d3a1ac71921e9db8e8e3be8e10569 data/tfmg/loot_tables/blocks/blue_concrete_wall.json +bf7da6a394e0417a2e2a2542c622cc0fda7cd954 data/tfmg/loot_tables/blocks/brown_concrete.json +da5c8c6f44f47a62a9a2bb740c9ed896da69823d data/tfmg/loot_tables/blocks/brown_concrete_slab.json +eecb88b87e41b9a89100accd3741ecab4a94c77b data/tfmg/loot_tables/blocks/brown_concrete_stairs.json +11259835d2eb72f3d82a8356c384c20a4c056f69 data/tfmg/loot_tables/blocks/brown_concrete_wall.json b856690500dccf0e5407bcb45e057710259f48e3 data/tfmg/loot_tables/blocks/casting_basin.json 5627226e6bd089259395af9338db044278133033 data/tfmg/loot_tables/blocks/casting_spout.json 60857d034446187e758de87644a80a7bc4d6b150 data/tfmg/loot_tables/blocks/cast_iron_block.json @@ -365,19 +652,55 @@ d32a75f20ca3f2da6ba69b0a91e295c63f65de92 data/tfmg/loot_tables/blocks/concrete.j ce0c785984e63fa57a0cc8a9d5af0ce997285554 data/tfmg/loot_tables/blocks/cut_bauxite_slab.json efba82fdf0c26dd90aacf5f604e613e29513b60e data/tfmg/loot_tables/blocks/cut_bauxite_stairs.json ce47c0f03819dab221e70b3d4197ac82963b47d6 data/tfmg/loot_tables/blocks/cut_bauxite_wall.json +bcdc6406f3e82c52d1531b10ad05e4fb9b1433d1 data/tfmg/loot_tables/blocks/cyan_concrete.json +bca6aaf5cb5543625303de1f9c959b8abb758d62 data/tfmg/loot_tables/blocks/cyan_concrete_slab.json +53065cde698eebebf76700cabd3cb509ee7b1f1a data/tfmg/loot_tables/blocks/cyan_concrete_stairs.json +46482c07a16b5926ee907dc9a8b709108e507cab data/tfmg/loot_tables/blocks/cyan_concrete_wall.json 84715ecae584c6da15030710e401288881c3b845 data/tfmg/loot_tables/blocks/fireproof_bricks.json 1ce0e68d76b640ce1c668cfdcf4acf744288982f data/tfmg/loot_tables/blocks/fireproof_brick_reinforcement.json 51818c7cf522c10c409c8737fdc30a58d7560f71 data/tfmg/loot_tables/blocks/formwork_block.json fd7674b996fd961339614656498a1ff54f092bb8 data/tfmg/loot_tables/blocks/fossilstone.json 1622328d319fc3c71269b0f9f1aef43a77132f3a data/tfmg/loot_tables/blocks/glass_steel_pipe.json +6d2c0512a812eecb499688d936308add89f1008a data/tfmg/loot_tables/blocks/gray_concrete.json +7d05552eee1f7f26c1cf0a637d1aac45495b29e5 data/tfmg/loot_tables/blocks/gray_concrete_slab.json +5b43c955932e5c29e9a10b260a02f104c4703f6a data/tfmg/loot_tables/blocks/gray_concrete_stairs.json +f2191ce7581418d7aa310f80730e4fa257997e5a data/tfmg/loot_tables/blocks/gray_concrete_wall.json +3d5bf33d1f47f0f099258e6d9b83b342cf50b1c4 data/tfmg/loot_tables/blocks/green_concrete.json +cf9445775fe4d317f50f879ab83bf505caba859a data/tfmg/loot_tables/blocks/green_concrete_slab.json +d2225403107d8bb526d52290462953a172e7289c data/tfmg/loot_tables/blocks/green_concrete_stairs.json +2359fb93b9d30d66a535bc59a458c892bfe35bbc data/tfmg/loot_tables/blocks/green_concrete_wall.json 673b4eaefb99f4322f2b172c2c2651969389ff9b data/tfmg/loot_tables/blocks/heavy_casing_door.json 661cc61f9c13ddf8c6bf06470defa93170e8ee7f data/tfmg/loot_tables/blocks/heavy_machinery_casing.json 922fec21549635d98ec80e7a2a4bf92bd8878da8 data/tfmg/loot_tables/blocks/industrial_pipe.json 1633b0609c1f7b71d0ccda03bdb95bf873692b18 data/tfmg/loot_tables/blocks/layered_bauxite.json a5ecc7b7daab82db283453319f5bae9057e63e62 data/tfmg/loot_tables/blocks/lead_block.json +48506d0eb0b6e0c4ca333109cf5b193f5f7e8198 data/tfmg/loot_tables/blocks/light_blue_concrete.json +3ca01614b52dc5df71953ffd54af089c645d7fcc data/tfmg/loot_tables/blocks/light_blue_concrete_slab.json +1dd11a0b351e8f18a0ccb4d705e95b08477cc634 data/tfmg/loot_tables/blocks/light_blue_concrete_stairs.json +3045c99edbd953308c316ac0c952b9e1420bad99 data/tfmg/loot_tables/blocks/light_blue_concrete_wall.json +08114b7ae1fdd51d595a2121b61baf377d26a46c data/tfmg/loot_tables/blocks/light_gray_concrete.json +4c81eda281aea6c0eebd742ec49440a915d3ed78 data/tfmg/loot_tables/blocks/light_gray_concrete_slab.json +c2b38ae36010e69ad7928f54aab4f0002db36242 data/tfmg/loot_tables/blocks/light_gray_concrete_stairs.json +9d329b0be10f57089c52ad1245adf8a849cf25df data/tfmg/loot_tables/blocks/light_gray_concrete_wall.json +33a2a45219a3876db7b90a45965a6643836d116c data/tfmg/loot_tables/blocks/lime_concrete.json +720cff3f78223d2d99fdd0505c5ef23693b15f01 data/tfmg/loot_tables/blocks/lime_concrete_slab.json +189050ec888c48c0bf79da023d78e43b24b02523 data/tfmg/loot_tables/blocks/lime_concrete_stairs.json +0e0a140a2b7f363790becae1c3650421ba8ac49f data/tfmg/loot_tables/blocks/lime_concrete_wall.json c54478618ec2bcb1433ef2ad69a9b2453b3b8424 data/tfmg/loot_tables/blocks/machine_input.json +15bac4cb86d90aeb7d9d0e3bee74a730cefbd9c4 data/tfmg/loot_tables/blocks/magenta_concrete.json +6f0f47fca2af371ba550096a8dd247f88cb04e24 data/tfmg/loot_tables/blocks/magenta_concrete_slab.json +d07b9e25eda529a76b0988f61e93386c586d8d80 data/tfmg/loot_tables/blocks/magenta_concrete_stairs.json +eaac087d09b8227e0b32464975c3a7ddd473a5ed data/tfmg/loot_tables/blocks/magenta_concrete_wall.json 7da9b20012e584104331da961756d6c1d02682b5 data/tfmg/loot_tables/blocks/napalm_bomb.json 04ed0121924425d89886398da07c98277cb26100 data/tfmg/loot_tables/blocks/oil_deposit.json +deffb34344a98b729118b1153619d60d9d647534 data/tfmg/loot_tables/blocks/orange_concrete.json +48afca3f47e0571f0f099b9cf980db3e4883c522 data/tfmg/loot_tables/blocks/orange_concrete_slab.json +b5af52ac5695d9abb48dfb31b1acc62a9bf89e35 data/tfmg/loot_tables/blocks/orange_concrete_stairs.json +b3ac8c3247bac650886ce02b5e59ff9e28ac1e8b data/tfmg/loot_tables/blocks/orange_concrete_wall.json +ff3bb1df468a1bdc4b5a1d8a0185d625fdaae934 data/tfmg/loot_tables/blocks/pink_concrete.json +29e4433abe37663a75c87c07d15b114cc081df32 data/tfmg/loot_tables/blocks/pink_concrete_slab.json +37e56425b4c4144b1368d8ae181e646ad914af18 data/tfmg/loot_tables/blocks/pink_concrete_stairs.json +71a24cfc09126264e412ad8592d0ab3765f8c826 data/tfmg/loot_tables/blocks/pink_concrete_wall.json c8658b25761345012c9861389a95a4605380f868 data/tfmg/loot_tables/blocks/polished_cut_bauxite.json df7e518e9def864a4fad6b6bfbb605ae5bd4e57b data/tfmg/loot_tables/blocks/polished_cut_bauxite_slab.json 699d56aed6ceeeecb9ba94634130a05167ca041c data/tfmg/loot_tables/blocks/polished_cut_bauxite_stairs.json @@ -385,6 +708,14 @@ df7e518e9def864a4fad6b6bfbb605ae5bd4e57b data/tfmg/loot_tables/blocks/polished_c 8979e04ca8e0b1874baad459d35d7c80bb3fc5a8 data/tfmg/loot_tables/blocks/pumpjack_base.json 0fc9c3218514717c907b1f76f2abc55911459670 data/tfmg/loot_tables/blocks/pumpjack_crank.json 7e589d000c28526e306c5da5948e6c88ffb73d93 data/tfmg/loot_tables/blocks/pumpjack_hammer_holder.json +a7b1c84c642fca2ff1bc807a4a7ffc3523412960 data/tfmg/loot_tables/blocks/purple_concrete.json +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 +e19ba049e8388d728b6e2e8faee1321f221a7401 data/tfmg/loot_tables/blocks/red_concrete.json +98550bd835e5bcd93cada2cd11929283012ef98d data/tfmg/loot_tables/blocks/red_concrete_slab.json +a16309a5204c34addc1b1188d88bee22115686b8 data/tfmg/loot_tables/blocks/red_concrete_stairs.json +685279408dec5741f5ba9a592880677dc22faa8d data/tfmg/loot_tables/blocks/red_concrete_wall.json 8392e6fbbaeb3a1f1316b3f12ecaf8927042a7ea data/tfmg/loot_tables/blocks/small_bauxite_bricks.json 211d6ba8f5576975698ad91ebdf5feb36f618ac7 data/tfmg/loot_tables/blocks/small_bauxite_brick_slab.json b43d1fa7a2ac0534ab2867dec787d97f205f4a8d data/tfmg/loot_tables/blocks/small_bauxite_brick_stairs.json @@ -401,6 +732,14 @@ da3aa200dc67d6a7bfbb0bb9e988a325fed4c670 data/tfmg/loot_tables/blocks/steel_flui de0407a343a604ef410196b774c1dba3d65b0c61 data/tfmg/loot_tables/blocks/steel_sheetmetal.json 7b9a14c0366a480e04473eed373e94fe8a5e8618 data/tfmg/loot_tables/blocks/steel_smart_fluid_pipe.json d200ab69297adec0f9d02d06f12d90ba049be5c6 data/tfmg/loot_tables/blocks/surface_scanner.json +4df116f603b680bdf017327598a7f18e54822554 data/tfmg/loot_tables/blocks/white_concrete.json +498e63d21e3a20b6e77963418627a4761785da3e data/tfmg/loot_tables/blocks/white_concrete_slab.json +7ef27f0d73c458c9a8a1c162b14a32fd969a7b19 data/tfmg/loot_tables/blocks/white_concrete_stairs.json +18e10cf67aec18f3790ff2398da6d2291bd29b73 data/tfmg/loot_tables/blocks/white_concrete_wall.json +38d2796faafe6d0e4ef83196a4f74355cb5de8f2 data/tfmg/loot_tables/blocks/yellow_concrete.json +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 fe8fbd529304f28f4aeb1017956f288f6e6bbe1c data/tfmg/recipes/bauxite_from_stone_types_bauxite_stonecutting.json 9bddb0ff48b335428001ae0526e41ab6d09da1c3 data/tfmg/recipes/bauxite_pillar_from_stone_types_bauxite_stonecutting.json c1d723c26e4e2eeeb46ef03e16df946309ff2650 data/tfmg/recipes/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json diff --git a/src/generated/resources/assets/tfmg/blockstates/air_intake.json b/src/generated/resources/assets/tfmg/blockstates/air_intake.json new file mode 100644 index 00000000..7f6671a4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/air_intake.json @@ -0,0 +1,56 @@ +{ + "variants": { + "facing=down,invisible=false": { + "model": "tfmg:block/air_intake/block", + "x": 180 + }, + "facing=down,invisible=true": { + "model": "tfmg:block/air_intake/block_empty", + "x": 180 + }, + "facing=east,invisible=false": { + "model": "tfmg:block/air_intake/block", + "x": 90, + "y": 90 + }, + "facing=east,invisible=true": { + "model": "tfmg:block/air_intake/block_empty", + "x": 90, + "y": 90 + }, + "facing=north,invisible=false": { + "model": "tfmg:block/air_intake/block", + "x": 90 + }, + "facing=north,invisible=true": { + "model": "tfmg:block/air_intake/block_empty", + "x": 90 + }, + "facing=south,invisible=false": { + "model": "tfmg:block/air_intake/block", + "x": 90, + "y": 180 + }, + "facing=south,invisible=true": { + "model": "tfmg:block/air_intake/block_empty", + "x": 90, + "y": 180 + }, + "facing=up,invisible=false": { + "model": "tfmg:block/air_intake/block" + }, + "facing=up,invisible=true": { + "model": "tfmg:block/air_intake/block_empty" + }, + "facing=west,invisible=false": { + "model": "tfmg:block/air_intake/block", + "x": 90, + "y": 270 + }, + "facing=west,invisible=true": { + "model": "tfmg:block/air_intake/block_empty", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/black_concrete.json b/src/generated/resources/assets/tfmg/blockstates/black_concrete.json new file mode 100644 index 00000000..3c8e2953 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/black_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/black_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/black_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/black_concrete_slab.json new file mode 100644 index 00000000..5f509190 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/black_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/black_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/black_concrete" + }, + "type=top": { + "model": "tfmg:block/black_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/black_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/black_concrete_stairs.json new file mode 100644 index 00000000..e94d19cb --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/black_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/black_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/black_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/black_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/black_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/black_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/black_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/black_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/black_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/black_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/black_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/black_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/black_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/black_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/black_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/black_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/black_concrete_wall.json new file mode 100644 index 00000000..203c70f6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/black_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/black_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/black_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/black_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/black_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/black_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/black_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/black_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/black_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/black_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/blue_concrete.json b/src/generated/resources/assets/tfmg/blockstates/blue_concrete.json new file mode 100644 index 00000000..68e42ee3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/blue_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/blue_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/blue_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/blue_concrete_slab.json new file mode 100644 index 00000000..5990cea3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/blue_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/blue_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/blue_concrete" + }, + "type=top": { + "model": "tfmg:block/blue_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/blue_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/blue_concrete_stairs.json new file mode 100644 index 00000000..01360839 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/blue_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/blue_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/blue_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/blue_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/blue_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/blue_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/blue_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/blue_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/blue_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/blue_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/blue_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/blue_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/blue_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/blue_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/blue_concrete_wall.json new file mode 100644 index 00000000..d24dbe63 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/blue_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/blue_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/blue_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/blue_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/blue_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/blue_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/blue_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/blue_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/blue_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/blue_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/brown_concrete.json b/src/generated/resources/assets/tfmg/blockstates/brown_concrete.json new file mode 100644 index 00000000..99e0979f --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/brown_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/brown_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/brown_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/brown_concrete_slab.json new file mode 100644 index 00000000..396f23f2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/brown_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/brown_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/brown_concrete" + }, + "type=top": { + "model": "tfmg:block/brown_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/brown_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/brown_concrete_stairs.json new file mode 100644 index 00000000..0f6c086a --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/brown_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/brown_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/brown_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/brown_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/brown_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/brown_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/brown_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/brown_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/brown_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/brown_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/brown_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/brown_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/brown_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/brown_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/brown_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/brown_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/brown_concrete_wall.json new file mode 100644 index 00000000..bd575df3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/brown_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/brown_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/brown_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/brown_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/brown_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/brown_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/brown_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/brown_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/brown_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/brown_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/cyan_concrete.json b/src/generated/resources/assets/tfmg/blockstates/cyan_concrete.json new file mode 100644 index 00000000..56d6156b --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cyan_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/cyan_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_slab.json new file mode 100644 index 00000000..5fd79900 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/cyan_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/cyan_concrete" + }, + "type=top": { + "model": "tfmg:block/cyan_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_stairs.json new file mode 100644 index 00000000..7e5a5f9d --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/cyan_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/cyan_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/cyan_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/cyan_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/cyan_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/cyan_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/cyan_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/cyan_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/cyan_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/cyan_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/cyan_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/cyan_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/cyan_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/cyan_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_wall.json new file mode 100644 index 00000000..b2ccf7f3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cyan_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/cyan_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/cyan_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cyan_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cyan_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cyan_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cyan_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cyan_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cyan_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cyan_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/gray_concrete.json b/src/generated/resources/assets/tfmg/blockstates/gray_concrete.json new file mode 100644 index 00000000..cea786cf --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/gray_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/gray_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/gray_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/gray_concrete_slab.json new file mode 100644 index 00000000..94fb647f --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/gray_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/gray_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/gray_concrete" + }, + "type=top": { + "model": "tfmg:block/gray_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/gray_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/gray_concrete_stairs.json new file mode 100644 index 00000000..1180463c --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/gray_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/gray_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/gray_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/gray_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/gray_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/gray_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/gray_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/gray_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/gray_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/gray_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/gray_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/gray_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/gray_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/gray_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/gray_concrete_wall.json new file mode 100644 index 00000000..1fa3f2c8 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/gray_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/gray_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/gray_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/gray_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/gray_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/gray_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/gray_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/gray_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/gray_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/gray_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/green_concrete.json b/src/generated/resources/assets/tfmg/blockstates/green_concrete.json new file mode 100644 index 00000000..45f6507b --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/green_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/green_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/green_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/green_concrete_slab.json new file mode 100644 index 00000000..a8758b5f --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/green_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/green_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/green_concrete" + }, + "type=top": { + "model": "tfmg:block/green_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/green_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/green_concrete_stairs.json new file mode 100644 index 00000000..b0bd2790 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/green_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/green_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/green_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/green_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/green_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/green_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/green_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/green_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/green_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/green_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/green_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/green_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/green_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/green_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/green_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/green_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/green_concrete_wall.json new file mode 100644 index 00000000..d39ff687 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/green_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/green_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/green_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/green_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/green_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/green_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/green_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/green_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/green_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/green_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/light_blue_concrete.json b/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete.json new file mode 100644 index 00000000..7a3e3669 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/light_blue_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_slab.json new file mode 100644 index 00000000..fceb8b00 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/light_blue_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/light_blue_concrete" + }, + "type=top": { + "model": "tfmg:block/light_blue_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_stairs.json new file mode 100644 index 00000000..c37ec2fe --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/light_blue_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/light_blue_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/light_blue_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/light_blue_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/light_blue_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/light_blue_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/light_blue_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/light_blue_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/light_blue_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/light_blue_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/light_blue_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/light_blue_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/light_blue_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/light_blue_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_wall.json new file mode 100644 index 00000000..12ab190d --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/light_blue_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/light_blue_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/light_blue_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/light_blue_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/light_blue_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/light_blue_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/light_blue_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/light_blue_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/light_blue_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/light_blue_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/light_gray_concrete.json b/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete.json new file mode 100644 index 00000000..fef40440 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/light_gray_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_slab.json new file mode 100644 index 00000000..0a69f890 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/light_gray_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/light_gray_concrete" + }, + "type=top": { + "model": "tfmg:block/light_gray_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_stairs.json new file mode 100644 index 00000000..411109cf --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/light_gray_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/light_gray_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/light_gray_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/light_gray_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/light_gray_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/light_gray_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/light_gray_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/light_gray_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/light_gray_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/light_gray_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/light_gray_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/light_gray_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/light_gray_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/light_gray_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_wall.json new file mode 100644 index 00000000..7ed35d87 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/light_gray_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/light_gray_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/light_gray_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/light_gray_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/light_gray_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/light_gray_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/light_gray_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/light_gray_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/light_gray_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/light_gray_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/lime_concrete.json b/src/generated/resources/assets/tfmg/blockstates/lime_concrete.json new file mode 100644 index 00000000..65389d91 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/lime_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/lime_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/lime_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/lime_concrete_slab.json new file mode 100644 index 00000000..0936cd4b --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/lime_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/lime_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/lime_concrete" + }, + "type=top": { + "model": "tfmg:block/lime_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/lime_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/lime_concrete_stairs.json new file mode 100644 index 00000000..8d99b6b5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/lime_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/lime_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/lime_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/lime_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/lime_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/lime_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/lime_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/lime_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/lime_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/lime_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/lime_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/lime_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/lime_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/lime_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/lime_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/lime_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/lime_concrete_wall.json new file mode 100644 index 00000000..2975bc75 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/lime_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/lime_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/lime_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/lime_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/lime_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/lime_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/lime_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/lime_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/lime_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/lime_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/magenta_concrete.json b/src/generated/resources/assets/tfmg/blockstates/magenta_concrete.json new file mode 100644 index 00000000..2483d32d --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/magenta_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/magenta_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_slab.json new file mode 100644 index 00000000..79b2ce24 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/magenta_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/magenta_concrete" + }, + "type=top": { + "model": "tfmg:block/magenta_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_stairs.json new file mode 100644 index 00000000..701c5f6e --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/magenta_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/magenta_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/magenta_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/magenta_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/magenta_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/magenta_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/magenta_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/magenta_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/magenta_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/magenta_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/magenta_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/magenta_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/magenta_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/magenta_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_wall.json new file mode 100644 index 00000000..69c3f9ec --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/magenta_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/magenta_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/magenta_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/magenta_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/magenta_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/magenta_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/magenta_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/magenta_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/magenta_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/magenta_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/orange_concrete.json b/src/generated/resources/assets/tfmg/blockstates/orange_concrete.json new file mode 100644 index 00000000..76be7b3a --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/orange_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/orange_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/orange_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/orange_concrete_slab.json new file mode 100644 index 00000000..a749437c --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/orange_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/orange_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/orange_concrete" + }, + "type=top": { + "model": "tfmg:block/orange_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/orange_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/orange_concrete_stairs.json new file mode 100644 index 00000000..c82b4fa7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/orange_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/orange_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/orange_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/orange_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/orange_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/orange_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/orange_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/orange_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/orange_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/orange_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/orange_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/orange_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/orange_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/orange_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/orange_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/orange_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/orange_concrete_wall.json new file mode 100644 index 00000000..e5fad77a --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/orange_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/orange_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/orange_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/orange_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/orange_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/orange_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/orange_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/orange_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/orange_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/orange_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/pink_concrete.json b/src/generated/resources/assets/tfmg/blockstates/pink_concrete.json new file mode 100644 index 00000000..f42b0c49 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/pink_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/pink_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/pink_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/pink_concrete_slab.json new file mode 100644 index 00000000..f6a019b4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/pink_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/pink_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/pink_concrete" + }, + "type=top": { + "model": "tfmg:block/pink_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/pink_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/pink_concrete_stairs.json new file mode 100644 index 00000000..908367a5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/pink_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/pink_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/pink_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/pink_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/pink_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/pink_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/pink_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/pink_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/pink_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/pink_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/pink_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/pink_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/pink_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/pink_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/pink_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/pink_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/pink_concrete_wall.json new file mode 100644 index 00000000..acd2f479 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/pink_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/pink_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/pink_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/pink_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/pink_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/pink_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/pink_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/pink_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/pink_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/pink_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/purple_concrete.json b/src/generated/resources/assets/tfmg/blockstates/purple_concrete.json new file mode 100644 index 00000000..a9f86419 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/purple_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/purple_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/purple_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/purple_concrete_slab.json new file mode 100644 index 00000000..765e9a99 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/purple_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/purple_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/purple_concrete" + }, + "type=top": { + "model": "tfmg:block/purple_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/purple_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/purple_concrete_stairs.json new file mode 100644 index 00000000..e8903664 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/purple_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/purple_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/purple_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/purple_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/purple_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/purple_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/purple_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/purple_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/purple_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/purple_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/purple_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/purple_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/purple_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/purple_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/purple_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/purple_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/purple_concrete_wall.json new file mode 100644 index 00000000..00d1b031 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/purple_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/purple_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/purple_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/purple_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/purple_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/purple_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/purple_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/purple_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/purple_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/purple_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/red_concrete.json b/src/generated/resources/assets/tfmg/blockstates/red_concrete.json new file mode 100644 index 00000000..458dd7fe --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/red_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/red_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/red_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/red_concrete_slab.json new file mode 100644 index 00000000..e2e64c68 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/red_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/red_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/red_concrete" + }, + "type=top": { + "model": "tfmg:block/red_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/red_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/red_concrete_stairs.json new file mode 100644 index 00000000..c81f7c85 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/red_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/red_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/red_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/red_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/red_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/red_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/red_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/red_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/red_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/red_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/red_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/red_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/red_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/red_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/red_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/red_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/red_concrete_wall.json new file mode 100644 index 00000000..1dacf99a --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/red_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/red_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/red_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/red_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/red_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/red_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/red_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/red_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/red_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/red_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/white_concrete.json b/src/generated/resources/assets/tfmg/blockstates/white_concrete.json new file mode 100644 index 00000000..362b37cc --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/white_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/white_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/white_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/white_concrete_slab.json new file mode 100644 index 00000000..19a3dd11 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/white_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/white_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/white_concrete" + }, + "type=top": { + "model": "tfmg:block/white_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/white_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/white_concrete_stairs.json new file mode 100644 index 00000000..0600ae6e --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/white_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/white_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/white_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/white_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/white_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/white_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/white_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/white_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/white_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/white_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/white_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/white_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/white_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/white_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/white_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/white_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/white_concrete_wall.json new file mode 100644 index 00000000..0d107ac0 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/white_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/white_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/white_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/white_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/white_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/white_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/white_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/white_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/white_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/white_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/yellow_concrete.json b/src/generated/resources/assets/tfmg/blockstates/yellow_concrete.json new file mode 100644 index 00000000..f0f8f408 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/yellow_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/yellow_concrete" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_slab.json b/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_slab.json new file mode 100644 index 00000000..f6b6fbae --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/yellow_concrete_bottom" + }, + "type=double": { + "model": "tfmg:block/yellow_concrete" + }, + "type=top": { + "model": "tfmg:block/yellow_concrete_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_stairs.json b/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_stairs.json new file mode 100644 index 00000000..67c2e856 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/yellow_concrete_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/yellow_concrete_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/yellow_concrete_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/yellow_concrete_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/yellow_concrete_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/yellow_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/yellow_concrete_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/yellow_concrete_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/yellow_concrete_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/yellow_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/yellow_concrete_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/yellow_concrete_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/yellow_concrete_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/yellow_concrete_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_wall.json b/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_wall.json new file mode 100644 index 00000000..d162cd55 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/yellow_concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/yellow_concrete_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/yellow_concrete_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/yellow_concrete_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/yellow_concrete_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/yellow_concrete_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/yellow_concrete_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/yellow_concrete_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/yellow_concrete_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/yellow_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/lang/en_ud.json b/src/generated/resources/assets/tfmg/lang/en_ud.json index 94460135..385f1310 100644 --- a/src/generated/resources/assets/tfmg/lang/en_ud.json +++ b/src/generated/resources/assets/tfmg/lang/en_ud.json @@ -1,8 +1,21 @@ { + "block.tfmg.air_intake": "ǝʞɐʇuI ɹıⱯ", "block.tfmg.aluminum_block": "ɯnuıɯnןⱯ ɟo ʞɔoןᗺ", "block.tfmg.bauxite": "ǝʇıxnɐᗺ", "block.tfmg.bauxite_pillar": "ɹɐןןıԀ ǝʇıxnɐᗺ", + "block.tfmg.black_concrete": "ǝʇǝɹɔuoƆ ʞɔɐןᗺ", + "block.tfmg.black_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʞɔɐןᗺ", + "block.tfmg.black_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʞɔɐןᗺ", + "block.tfmg.black_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʞɔɐןᗺ", "block.tfmg.blast_furnace_output": "ʇndʇnO ǝɔɐuɹnℲ ʇsɐןᗺ", + "block.tfmg.blue_concrete": "ǝʇǝɹɔuoƆ ǝnןᗺ", + "block.tfmg.blue_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝnןᗺ", + "block.tfmg.blue_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝnןᗺ", + "block.tfmg.blue_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝnןᗺ", + "block.tfmg.brown_concrete": "ǝʇǝɹɔuoƆ uʍoɹᗺ", + "block.tfmg.brown_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ uʍoɹᗺ", + "block.tfmg.brown_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ uʍoɹᗺ", + "block.tfmg.brown_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ uʍoɹᗺ", "block.tfmg.cast_iron_block": "uoɹI ʇsɐƆ ɟo ʞɔoןᗺ", "block.tfmg.cast_iron_distillation_controller": "ɹǝןןoɹʇuoƆ uoıʇɐןןıʇsıᗡ uoɹI ʇsɐƆ", "block.tfmg.cast_iron_distillation_output": "ʇndʇnO uoıʇɐןןıʇsıᗡ uoɹI ʇsɐƆ", @@ -23,6 +36,10 @@ "block.tfmg.cut_bauxite_slab": "qɐןS ǝʇıxnɐᗺ ʇnƆ", "block.tfmg.cut_bauxite_stairs": "sɹıɐʇS ǝʇıxnɐᗺ ʇnƆ", "block.tfmg.cut_bauxite_wall": "ןןɐM ǝʇıxnɐᗺ ʇnƆ", + "block.tfmg.cyan_concrete": "ǝʇǝɹɔuoƆ uɐʎƆ", + "block.tfmg.cyan_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ uɐʎƆ", + "block.tfmg.cyan_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ uɐʎƆ", + "block.tfmg.cyan_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ uɐʎƆ", "block.tfmg.diesel": "ןǝsǝıᗡ", "block.tfmg.fireproof_brick_reinforcement": "ʇuǝɯǝɔɹoɟuıǝᴚ ʞɔıɹᗺ ɟooɹdǝɹıℲ", "block.tfmg.fireproof_bricks": "sʞɔıɹᗺ ɟooɹdǝɹıℲ", @@ -30,6 +47,14 @@ "block.tfmg.fossilstone": "ǝuoʇsןıssoℲ", "block.tfmg.gasoline": "ǝuıןosɐ⅁", "block.tfmg.glass_steel_pipe": "ǝdıԀ ןǝǝʇS ssɐן⅁", + "block.tfmg.gray_concrete": "ǝʇǝɹɔuoƆ ʎɐɹ⅁", + "block.tfmg.gray_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʎɐɹ⅁", + "block.tfmg.gray_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʎɐɹ⅁", + "block.tfmg.gray_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʎɐɹ⅁", + "block.tfmg.green_concrete": "ǝʇǝɹɔuoƆ uǝǝɹ⅁", + "block.tfmg.green_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ uǝǝɹ⅁", + "block.tfmg.green_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ uǝǝɹ⅁", + "block.tfmg.green_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ uǝǝɹ⅁", "block.tfmg.heavy_casing_door": "ɹooᗡ buısɐƆ ʎʌɐǝH", "block.tfmg.heavy_machinery_casing": "buısɐƆ ʎɹǝuıɥɔɐW ʎʌɐǝH", "block.tfmg.heavy_oil": "ןıO ʎʌɐǝH", @@ -37,15 +62,39 @@ "block.tfmg.kerosene": "ǝuǝsoɹǝʞ", "block.tfmg.layered_bauxite": "ǝʇıxnɐᗺ pǝɹǝʎɐꞀ", "block.tfmg.lead_block": "pɐǝꞀ ɟo ʞɔoןᗺ", + "block.tfmg.light_blue_concrete": "ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ", + "block.tfmg.light_blue_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ", + "block.tfmg.light_blue_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ", + "block.tfmg.light_blue_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ", + "block.tfmg.light_gray_concrete": "ǝʇǝɹɔuoƆ ʎɐɹ⅁ ʇɥbıꞀ", + "block.tfmg.light_gray_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʎɐɹ⅁ ʇɥbıꞀ", + "block.tfmg.light_gray_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʎɐɹ⅁ ʇɥbıꞀ", + "block.tfmg.light_gray_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʎɐɹ⅁ ʇɥbıꞀ", + "block.tfmg.lime_concrete": "ǝʇǝɹɔuoƆ ǝɯıꞀ", + "block.tfmg.lime_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝɯıꞀ", + "block.tfmg.lime_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝɯıꞀ", + "block.tfmg.lime_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝɯıꞀ", "block.tfmg.liquid_concrete": "ǝʇǝɹɔuoƆ pınbıꞀ", "block.tfmg.liquid_plastic": "ɔıʇsɐןԀ pınbıꞀ", "block.tfmg.lubrication_oil": "ןıO uoıʇɐɔıɹqnꞀ", "block.tfmg.machine_input": "ʇnduI ǝuıɥɔɐW", + "block.tfmg.magenta_concrete": "ǝʇǝɹɔuoƆ ɐʇuǝbɐW", + "block.tfmg.magenta_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ɐʇuǝbɐW", + "block.tfmg.magenta_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ɐʇuǝbɐW", + "block.tfmg.magenta_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ɐʇuǝbɐW", "block.tfmg.molten_metal": "ןɐʇǝW uǝʇןoW", "block.tfmg.napalm": "ɯןɐdɐN", "block.tfmg.napalm_bomb": "qɯoᗺ ɯןɐdɐN", "block.tfmg.naphtha": "ɐɥʇɥdɐN", "block.tfmg.oil_deposit": "ʇısodǝᗡ ןıO", + "block.tfmg.orange_concrete": "ǝʇǝɹɔuoƆ ǝbuɐɹO", + "block.tfmg.orange_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝbuɐɹO", + "block.tfmg.orange_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝbuɐɹO", + "block.tfmg.orange_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝbuɐɹO", + "block.tfmg.pink_concrete": "ǝʇǝɹɔuoƆ ʞuıԀ", + "block.tfmg.pink_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʞuıԀ", + "block.tfmg.pink_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʞuıԀ", + "block.tfmg.pink_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʞuıԀ", "block.tfmg.polished_cut_bauxite": "ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ", "block.tfmg.polished_cut_bauxite_slab": "qɐןS ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ", "block.tfmg.polished_cut_bauxite_stairs": "sɹıɐʇS ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ", @@ -53,6 +102,14 @@ "block.tfmg.pumpjack_base": "ǝsɐᗺ ʞɔɐظdɯnԀ", "block.tfmg.pumpjack_crank": "ʞuɐɹƆ ʞɔɐظdɯnԀ", "block.tfmg.pumpjack_hammer_holder": "ɹǝpןoH ɹǝɯɯɐH ʞɔɐظdɯnԀ", + "block.tfmg.purple_concrete": "ǝʇǝɹɔuoƆ ǝןdɹnԀ", + "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.red_concrete": "ǝʇǝɹɔuoƆ pǝᴚ", + "block.tfmg.red_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ pǝᴚ", + "block.tfmg.red_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ pǝᴚ", + "block.tfmg.red_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ pǝᴚ", "block.tfmg.small_bauxite_brick_slab": "qɐןS ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", "block.tfmg.small_bauxite_brick_stairs": "sɹıɐʇS ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", "block.tfmg.small_bauxite_brick_wall": "ןןɐM ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", @@ -69,6 +126,14 @@ "block.tfmg.steel_sheetmetal": "ןɐʇǝɯʇǝǝɥS ןǝǝʇS", "block.tfmg.steel_smart_fluid_pipe": "ǝdıԀ pınןℲ ʇɹɐɯS ןǝǝʇS", "block.tfmg.surface_scanner": "ɹǝuuɐɔS ǝɔɐɟɹnS", + "block.tfmg.white_concrete": "ǝʇǝɹɔuoƆ ǝʇıɥM", + "block.tfmg.white_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝʇıɥM", + "block.tfmg.white_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝʇıɥM", + "block.tfmg.white_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝʇıɥM", + "block.tfmg.yellow_concrete": "ǝʇǝɹɔuoƆ ʍoןןǝʎ", + "block.tfmg.yellow_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʍoןןǝʎ", + "block.tfmg.yellow_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʍoןןǝʎ", + "block.tfmg.yellow_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʍoןןǝʎ", "entity.tfmg.blue_spark": "ʞɹɐdS ǝnןᗺ", "entity.tfmg.copper_grenade": "ǝpɐuǝɹ⅁ ɹǝddoƆ", "entity.tfmg.green_spark": "ʞɹɐdS uǝǝɹ⅁", diff --git a/src/generated/resources/assets/tfmg/lang/en_us.json b/src/generated/resources/assets/tfmg/lang/en_us.json index 601081fe..8eb9cce3 100644 --- a/src/generated/resources/assets/tfmg/lang/en_us.json +++ b/src/generated/resources/assets/tfmg/lang/en_us.json @@ -2,10 +2,23 @@ "_": "->------------------------] Game Elements [------------------------<-", + "block.tfmg.air_intake": "Air Intake", "block.tfmg.aluminum_block": "Block of Aluminum", "block.tfmg.bauxite": "Bauxite", "block.tfmg.bauxite_pillar": "Bauxite Pillar", + "block.tfmg.black_concrete": "Black Concrete", + "block.tfmg.black_concrete_slab": "Black Concrete Slab", + "block.tfmg.black_concrete_stairs": "Black Concrete Stairs", + "block.tfmg.black_concrete_wall": "Black Concrete Wall", "block.tfmg.blast_furnace_output": "Blast Furnace Output", + "block.tfmg.blue_concrete": "Blue Concrete", + "block.tfmg.blue_concrete_slab": "Blue Concrete Slab", + "block.tfmg.blue_concrete_stairs": "Blue Concrete Stairs", + "block.tfmg.blue_concrete_wall": "Blue Concrete Wall", + "block.tfmg.brown_concrete": "Brown Concrete", + "block.tfmg.brown_concrete_slab": "Brown Concrete Slab", + "block.tfmg.brown_concrete_stairs": "Brown Concrete Stairs", + "block.tfmg.brown_concrete_wall": "Brown Concrete Wall", "block.tfmg.cast_iron_block": "Block of Cast Iron", "block.tfmg.cast_iron_distillation_controller": "Cast Iron Distillation Controller", "block.tfmg.cast_iron_distillation_output": "Cast Iron Distillation Output", @@ -26,6 +39,10 @@ "block.tfmg.cut_bauxite_slab": "Cut Bauxite Slab", "block.tfmg.cut_bauxite_stairs": "Cut Bauxite Stairs", "block.tfmg.cut_bauxite_wall": "Cut Bauxite Wall", + "block.tfmg.cyan_concrete": "Cyan Concrete", + "block.tfmg.cyan_concrete_slab": "Cyan Concrete Slab", + "block.tfmg.cyan_concrete_stairs": "Cyan Concrete Stairs", + "block.tfmg.cyan_concrete_wall": "Cyan Concrete Wall", "block.tfmg.diesel": "Diesel", "block.tfmg.fireproof_brick_reinforcement": "Fireproof Brick Reinforcement", "block.tfmg.fireproof_bricks": "Fireproof Bricks", @@ -33,6 +50,14 @@ "block.tfmg.fossilstone": "Fossilstone", "block.tfmg.gasoline": "Gasoline", "block.tfmg.glass_steel_pipe": "Glass Steel Pipe", + "block.tfmg.gray_concrete": "Gray Concrete", + "block.tfmg.gray_concrete_slab": "Gray Concrete Slab", + "block.tfmg.gray_concrete_stairs": "Gray Concrete Stairs", + "block.tfmg.gray_concrete_wall": "Gray Concrete Wall", + "block.tfmg.green_concrete": "Green Concrete", + "block.tfmg.green_concrete_slab": "Green Concrete Slab", + "block.tfmg.green_concrete_stairs": "Green Concrete Stairs", + "block.tfmg.green_concrete_wall": "Green Concrete Wall", "block.tfmg.heavy_casing_door": "Heavy Casing Door", "block.tfmg.heavy_machinery_casing": "Heavy Machinery Casing", "block.tfmg.heavy_oil": "Heavy Oil", @@ -40,15 +65,39 @@ "block.tfmg.kerosene": "Kerosene", "block.tfmg.layered_bauxite": "Layered Bauxite", "block.tfmg.lead_block": "Block of Lead", + "block.tfmg.light_blue_concrete": "Light Blue Concrete", + "block.tfmg.light_blue_concrete_slab": "Light Blue Concrete Slab", + "block.tfmg.light_blue_concrete_stairs": "Light Blue Concrete Stairs", + "block.tfmg.light_blue_concrete_wall": "Light Blue Concrete Wall", + "block.tfmg.light_gray_concrete": "Light Gray Concrete", + "block.tfmg.light_gray_concrete_slab": "Light Gray Concrete Slab", + "block.tfmg.light_gray_concrete_stairs": "Light Gray Concrete Stairs", + "block.tfmg.light_gray_concrete_wall": "Light Gray Concrete Wall", + "block.tfmg.lime_concrete": "Lime Concrete", + "block.tfmg.lime_concrete_slab": "Lime Concrete Slab", + "block.tfmg.lime_concrete_stairs": "Lime Concrete Stairs", + "block.tfmg.lime_concrete_wall": "Lime Concrete Wall", "block.tfmg.liquid_concrete": "Liquid Concrete", "block.tfmg.liquid_plastic": "Liquid Plastic", "block.tfmg.lubrication_oil": "Lubrication Oil", "block.tfmg.machine_input": "Machine Input", + "block.tfmg.magenta_concrete": "Magenta Concrete", + "block.tfmg.magenta_concrete_slab": "Magenta Concrete Slab", + "block.tfmg.magenta_concrete_stairs": "Magenta Concrete Stairs", + "block.tfmg.magenta_concrete_wall": "Magenta Concrete Wall", "block.tfmg.molten_metal": "Molten Metal", "block.tfmg.napalm": "Napalm", "block.tfmg.napalm_bomb": "Napalm Bomb", "block.tfmg.naphtha": "Naphtha", "block.tfmg.oil_deposit": "Oil Deposit", + "block.tfmg.orange_concrete": "Orange Concrete", + "block.tfmg.orange_concrete_slab": "Orange Concrete Slab", + "block.tfmg.orange_concrete_stairs": "Orange Concrete Stairs", + "block.tfmg.orange_concrete_wall": "Orange Concrete Wall", + "block.tfmg.pink_concrete": "Pink Concrete", + "block.tfmg.pink_concrete_slab": "Pink Concrete Slab", + "block.tfmg.pink_concrete_stairs": "Pink Concrete Stairs", + "block.tfmg.pink_concrete_wall": "Pink Concrete Wall", "block.tfmg.polished_cut_bauxite": "Polished Cut Bauxite", "block.tfmg.polished_cut_bauxite_slab": "Polished Cut Bauxite Slab", "block.tfmg.polished_cut_bauxite_stairs": "Polished Cut Bauxite Stairs", @@ -56,6 +105,14 @@ "block.tfmg.pumpjack_base": "Pumpjack Base", "block.tfmg.pumpjack_crank": "Pumpjack Crank", "block.tfmg.pumpjack_hammer_holder": "Pumpjack Hammer Holder", + "block.tfmg.purple_concrete": "Purple Concrete", + "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.red_concrete": "Red Concrete", + "block.tfmg.red_concrete_slab": "Red Concrete Slab", + "block.tfmg.red_concrete_stairs": "Red Concrete Stairs", + "block.tfmg.red_concrete_wall": "Red Concrete Wall", "block.tfmg.small_bauxite_brick_slab": "Small Bauxite Brick Slab", "block.tfmg.small_bauxite_brick_stairs": "Small Bauxite Brick Stairs", "block.tfmg.small_bauxite_brick_wall": "Small Bauxite Brick Wall", @@ -72,6 +129,14 @@ "block.tfmg.steel_sheetmetal": "Steel Sheetmetal", "block.tfmg.steel_smart_fluid_pipe": "Steel Smart Fluid Pipe", "block.tfmg.surface_scanner": "Surface Scanner", + "block.tfmg.white_concrete": "White Concrete", + "block.tfmg.white_concrete_slab": "White Concrete Slab", + "block.tfmg.white_concrete_stairs": "White Concrete Stairs", + "block.tfmg.white_concrete_wall": "White Concrete Wall", + "block.tfmg.yellow_concrete": "Yellow Concrete", + "block.tfmg.yellow_concrete_slab": "Yellow Concrete Slab", + "block.tfmg.yellow_concrete_stairs": "Yellow Concrete Stairs", + "block.tfmg.yellow_concrete_wall": "Yellow Concrete Wall", "entity.tfmg.blue_spark": "Blue Spark", "entity.tfmg.copper_grenade": "Copper Grenade", @@ -126,6 +191,45 @@ "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/black_concrete.json b/src/generated/resources/assets/tfmg/models/block/black_concrete.json new file mode 100644 index 00000000..0c23961b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/black_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/black_concrete_bottom.json new file mode 100644 index 00000000..037961fa --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/black_concrete", + "side": "tfmg:block/black_concrete", + "top": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs.json new file mode 100644 index 00000000..0fa0c0fe --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/black_concrete", + "side": "tfmg:block/black_concrete", + "top": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs_inner.json new file mode 100644 index 00000000..4a02bdc8 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/black_concrete", + "side": "tfmg:block/black_concrete", + "top": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs_outer.json new file mode 100644 index 00000000..7a7f3d2e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/black_concrete", + "side": "tfmg:block/black_concrete", + "top": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/black_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/black_concrete_top.json new file mode 100644 index 00000000..cc4f567b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/black_concrete", + "side": "tfmg:block/black_concrete", + "top": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_post.json new file mode 100644 index 00000000..4db2eeb7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_side.json new file mode 100644 index 00000000..7e21ea06 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_side_tall.json new file mode 100644 index 00000000..21510a06 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/black_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete.json new file mode 100644 index 00000000..547363cf --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete_bottom.json new file mode 100644 index 00000000..b41ef0cb --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/blue_concrete", + "side": "tfmg:block/blue_concrete", + "top": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs.json new file mode 100644 index 00000000..d4a6a85b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/blue_concrete", + "side": "tfmg:block/blue_concrete", + "top": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs_inner.json new file mode 100644 index 00000000..853d47a1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/blue_concrete", + "side": "tfmg:block/blue_concrete", + "top": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs_outer.json new file mode 100644 index 00000000..5c921ab9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/blue_concrete", + "side": "tfmg:block/blue_concrete", + "top": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete_top.json new file mode 100644 index 00000000..13be15e3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/blue_concrete", + "side": "tfmg:block/blue_concrete", + "top": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_post.json new file mode 100644 index 00000000..fd44427d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_side.json new file mode 100644 index 00000000..f0592285 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_side_tall.json new file mode 100644 index 00000000..84d31756 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/blue_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete.json new file mode 100644 index 00000000..b950b2b2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete_bottom.json new file mode 100644 index 00000000..4e50d23b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/brown_concrete", + "side": "tfmg:block/brown_concrete", + "top": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs.json new file mode 100644 index 00000000..c6222c73 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/brown_concrete", + "side": "tfmg:block/brown_concrete", + "top": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs_inner.json new file mode 100644 index 00000000..7c6ee9a5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/brown_concrete", + "side": "tfmg:block/brown_concrete", + "top": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs_outer.json new file mode 100644 index 00000000..ac957fc2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/brown_concrete", + "side": "tfmg:block/brown_concrete", + "top": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete_top.json new file mode 100644 index 00000000..99042c14 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/brown_concrete", + "side": "tfmg:block/brown_concrete", + "top": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_post.json new file mode 100644 index 00000000..73b7cd7e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_side.json new file mode 100644 index 00000000..f6e57d7c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_side_tall.json new file mode 100644 index 00000000..0a66fbca --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/brown_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete.json new file mode 100644 index 00000000..c54a5e41 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_bottom.json new file mode 100644 index 00000000..9871a399 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/cyan_concrete", + "side": "tfmg:block/cyan_concrete", + "top": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs.json new file mode 100644 index 00000000..316247aa --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/cyan_concrete", + "side": "tfmg:block/cyan_concrete", + "top": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs_inner.json new file mode 100644 index 00000000..beadad4e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/cyan_concrete", + "side": "tfmg:block/cyan_concrete", + "top": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs_outer.json new file mode 100644 index 00000000..dffe0ba3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/cyan_concrete", + "side": "tfmg:block/cyan_concrete", + "top": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_top.json new file mode 100644 index 00000000..4d5e09ae --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/cyan_concrete", + "side": "tfmg:block/cyan_concrete", + "top": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_post.json new file mode 100644 index 00000000..beeb7d50 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_side.json new file mode 100644 index 00000000..3b4ef751 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_side_tall.json new file mode 100644 index 00000000..8eb333d7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cyan_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete.json new file mode 100644 index 00000000..18afe9b7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete_bottom.json new file mode 100644 index 00000000..4b135627 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/gray_concrete", + "side": "tfmg:block/gray_concrete", + "top": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs.json new file mode 100644 index 00000000..38a199fc --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/gray_concrete", + "side": "tfmg:block/gray_concrete", + "top": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs_inner.json new file mode 100644 index 00000000..ba0a1b5d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/gray_concrete", + "side": "tfmg:block/gray_concrete", + "top": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs_outer.json new file mode 100644 index 00000000..c6e976cd --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/gray_concrete", + "side": "tfmg:block/gray_concrete", + "top": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete_top.json new file mode 100644 index 00000000..27bb1d56 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/gray_concrete", + "side": "tfmg:block/gray_concrete", + "top": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_post.json new file mode 100644 index 00000000..5bfde20f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_side.json new file mode 100644 index 00000000..901f40ff --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_side_tall.json new file mode 100644 index 00000000..800a95f9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/gray_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete.json b/src/generated/resources/assets/tfmg/models/block/green_concrete.json new file mode 100644 index 00000000..008c7fd9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/green_concrete_bottom.json new file mode 100644 index 00000000..de38f35f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/green_concrete", + "side": "tfmg:block/green_concrete", + "top": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs.json new file mode 100644 index 00000000..7b8da7de --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/green_concrete", + "side": "tfmg:block/green_concrete", + "top": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs_inner.json new file mode 100644 index 00000000..6fb7fb01 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/green_concrete", + "side": "tfmg:block/green_concrete", + "top": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs_outer.json new file mode 100644 index 00000000..14b5fec1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/green_concrete", + "side": "tfmg:block/green_concrete", + "top": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/green_concrete_top.json new file mode 100644 index 00000000..96959025 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/green_concrete", + "side": "tfmg:block/green_concrete", + "top": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_post.json new file mode 100644 index 00000000..605c13ee --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_side.json new file mode 100644 index 00000000..05fd64d1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_side_tall.json new file mode 100644 index 00000000..0dccb25e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/green_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete.json new file mode 100644 index 00000000..3ca27528 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_bottom.json new file mode 100644 index 00000000..e4ae3119 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/light_blue_concrete", + "side": "tfmg:block/light_blue_concrete", + "top": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs.json new file mode 100644 index 00000000..dd1152d5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/light_blue_concrete", + "side": "tfmg:block/light_blue_concrete", + "top": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs_inner.json new file mode 100644 index 00000000..e4539ea1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/light_blue_concrete", + "side": "tfmg:block/light_blue_concrete", + "top": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs_outer.json new file mode 100644 index 00000000..a7e92ee5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/light_blue_concrete", + "side": "tfmg:block/light_blue_concrete", + "top": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_top.json new file mode 100644 index 00000000..ea1ae5e5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/light_blue_concrete", + "side": "tfmg:block/light_blue_concrete", + "top": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_post.json new file mode 100644 index 00000000..99870de7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_side.json new file mode 100644 index 00000000..3782371b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_side_tall.json new file mode 100644 index 00000000..ed9699b1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_blue_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete.json new file mode 100644 index 00000000..bc81b5c6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_bottom.json new file mode 100644 index 00000000..4f8438c2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/light_gray_concrete", + "side": "tfmg:block/light_gray_concrete", + "top": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs.json new file mode 100644 index 00000000..d00883ba --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/light_gray_concrete", + "side": "tfmg:block/light_gray_concrete", + "top": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs_inner.json new file mode 100644 index 00000000..4692976c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/light_gray_concrete", + "side": "tfmg:block/light_gray_concrete", + "top": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs_outer.json new file mode 100644 index 00000000..218a5ff0 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/light_gray_concrete", + "side": "tfmg:block/light_gray_concrete", + "top": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_top.json new file mode 100644 index 00000000..c1e0d441 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/light_gray_concrete", + "side": "tfmg:block/light_gray_concrete", + "top": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_post.json new file mode 100644 index 00000000..aa83a54b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_side.json new file mode 100644 index 00000000..51334060 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_side_tall.json new file mode 100644 index 00000000..3821f730 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/light_gray_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete.json new file mode 100644 index 00000000..c9ab73fa --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete_bottom.json new file mode 100644 index 00000000..1c14abae --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/lime_concrete", + "side": "tfmg:block/lime_concrete", + "top": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs.json new file mode 100644 index 00000000..111207ba --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/lime_concrete", + "side": "tfmg:block/lime_concrete", + "top": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs_inner.json new file mode 100644 index 00000000..6f9940fe --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/lime_concrete", + "side": "tfmg:block/lime_concrete", + "top": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs_outer.json new file mode 100644 index 00000000..6577754b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/lime_concrete", + "side": "tfmg:block/lime_concrete", + "top": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete_top.json new file mode 100644 index 00000000..82957a5d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/lime_concrete", + "side": "tfmg:block/lime_concrete", + "top": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_post.json new file mode 100644 index 00000000..84e16e70 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_side.json new file mode 100644 index 00000000..5ba64fd5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_side_tall.json new file mode 100644 index 00000000..60038ad1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/lime_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete.json new file mode 100644 index 00000000..e305735c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_bottom.json new file mode 100644 index 00000000..23d9d71c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/magenta_concrete", + "side": "tfmg:block/magenta_concrete", + "top": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs.json new file mode 100644 index 00000000..e4ebbc90 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/magenta_concrete", + "side": "tfmg:block/magenta_concrete", + "top": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs_inner.json new file mode 100644 index 00000000..d3942e73 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/magenta_concrete", + "side": "tfmg:block/magenta_concrete", + "top": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs_outer.json new file mode 100644 index 00000000..2bf07e07 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/magenta_concrete", + "side": "tfmg:block/magenta_concrete", + "top": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_top.json new file mode 100644 index 00000000..3e5808ae --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/magenta_concrete", + "side": "tfmg:block/magenta_concrete", + "top": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_post.json new file mode 100644 index 00000000..7440652d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_side.json new file mode 100644 index 00000000..7a9ad35e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_side_tall.json new file mode 100644 index 00000000..c5645390 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/magenta_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete.json new file mode 100644 index 00000000..49db3ef7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete_bottom.json new file mode 100644 index 00000000..b614659b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/orange_concrete", + "side": "tfmg:block/orange_concrete", + "top": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs.json new file mode 100644 index 00000000..98afda2a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/orange_concrete", + "side": "tfmg:block/orange_concrete", + "top": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs_inner.json new file mode 100644 index 00000000..9a98b33a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/orange_concrete", + "side": "tfmg:block/orange_concrete", + "top": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs_outer.json new file mode 100644 index 00000000..059ce8e0 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/orange_concrete", + "side": "tfmg:block/orange_concrete", + "top": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete_top.json new file mode 100644 index 00000000..9d2555a3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/orange_concrete", + "side": "tfmg:block/orange_concrete", + "top": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_post.json new file mode 100644 index 00000000..96db75f6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_side.json new file mode 100644 index 00000000..8a8f8920 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_side_tall.json new file mode 100644 index 00000000..c304d9aa --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/orange_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete.json new file mode 100644 index 00000000..1de71f57 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete_bottom.json new file mode 100644 index 00000000..aa4921d9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/pink_concrete", + "side": "tfmg:block/pink_concrete", + "top": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs.json new file mode 100644 index 00000000..a7b8e6b6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/pink_concrete", + "side": "tfmg:block/pink_concrete", + "top": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs_inner.json new file mode 100644 index 00000000..0adbeaa9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/pink_concrete", + "side": "tfmg:block/pink_concrete", + "top": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs_outer.json new file mode 100644 index 00000000..32f32f98 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/pink_concrete", + "side": "tfmg:block/pink_concrete", + "top": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete_top.json new file mode 100644 index 00000000..27b6d02d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/pink_concrete", + "side": "tfmg:block/pink_concrete", + "top": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_post.json new file mode 100644 index 00000000..d3ce7978 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_side.json new file mode 100644 index 00000000..90e5d989 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_side_tall.json new file mode 100644 index 00000000..029ab817 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/pink_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete.json new file mode 100644 index 00000000..61379c2e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete_bottom.json new file mode 100644 index 00000000..78842bb9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/purple_concrete", + "side": "tfmg:block/purple_concrete", + "top": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs.json new file mode 100644 index 00000000..2338b852 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/purple_concrete", + "side": "tfmg:block/purple_concrete", + "top": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs_inner.json new file mode 100644 index 00000000..9719244b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/purple_concrete", + "side": "tfmg:block/purple_concrete", + "top": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs_outer.json new file mode 100644 index 00000000..9d56ba60 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/purple_concrete", + "side": "tfmg:block/purple_concrete", + "top": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete_top.json new file mode 100644 index 00000000..50012898 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/purple_concrete", + "side": "tfmg:block/purple_concrete", + "top": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_post.json new file mode 100644 index 00000000..ef2707e7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_side.json new file mode 100644 index 00000000..891921c2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_side_tall.json new file mode 100644 index 00000000..19f35e57 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/purple_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete.json b/src/generated/resources/assets/tfmg/models/block/red_concrete.json new file mode 100644 index 00000000..081ad945 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/red_concrete_bottom.json new file mode 100644 index 00000000..16dee328 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/red_concrete", + "side": "tfmg:block/red_concrete", + "top": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs.json new file mode 100644 index 00000000..4964ffab --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/red_concrete", + "side": "tfmg:block/red_concrete", + "top": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs_inner.json new file mode 100644 index 00000000..22adc015 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/red_concrete", + "side": "tfmg:block/red_concrete", + "top": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs_outer.json new file mode 100644 index 00000000..28a1233f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/red_concrete", + "side": "tfmg:block/red_concrete", + "top": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/red_concrete_top.json new file mode 100644 index 00000000..543d0fff --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/red_concrete", + "side": "tfmg:block/red_concrete", + "top": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_post.json new file mode 100644 index 00000000..6965aa4c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_side.json new file mode 100644 index 00000000..7aa08d99 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_side_tall.json new file mode 100644 index 00000000..f3636ed7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/red_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete.json b/src/generated/resources/assets/tfmg/models/block/white_concrete.json new file mode 100644 index 00000000..ffa7bcf2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/white_concrete_bottom.json new file mode 100644 index 00000000..fc171ab4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/white_concrete", + "side": "tfmg:block/white_concrete", + "top": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs.json new file mode 100644 index 00000000..bc396763 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/white_concrete", + "side": "tfmg:block/white_concrete", + "top": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs_inner.json new file mode 100644 index 00000000..2672deb0 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/white_concrete", + "side": "tfmg:block/white_concrete", + "top": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs_outer.json new file mode 100644 index 00000000..b42f3a75 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/white_concrete", + "side": "tfmg:block/white_concrete", + "top": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/white_concrete_top.json new file mode 100644 index 00000000..649a5919 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/white_concrete", + "side": "tfmg:block/white_concrete", + "top": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_post.json new file mode 100644 index 00000000..97a03b8c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_side.json new file mode 100644 index 00000000..b95ce2f7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_side_tall.json new file mode 100644 index 00000000..e4890b95 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/white_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete.json new file mode 100644 index 00000000..57c26a39 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete_bottom.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_bottom.json new file mode 100644 index 00000000..c5172069 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_bottom.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/yellow_concrete", + "side": "tfmg:block/yellow_concrete", + "top": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs.json new file mode 100644 index 00000000..c5acde0c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/yellow_concrete", + "side": "tfmg:block/yellow_concrete", + "top": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs_inner.json new file mode 100644 index 00000000..38d8d8d7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/yellow_concrete", + "side": "tfmg:block/yellow_concrete", + "top": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs_outer.json new file mode 100644 index 00000000..b576b14e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/yellow_concrete", + "side": "tfmg:block/yellow_concrete", + "top": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete_top.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_top.json new file mode 100644 index 00000000..48df4a3a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/yellow_concrete", + "side": "tfmg:block/yellow_concrete", + "top": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_post.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_post.json new file mode 100644 index 00000000..987197d7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_side.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_side.json new file mode 100644 index 00000000..40e34fca --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_side_tall.json new file mode 100644 index 00000000..10e9b02b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/yellow_concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/air_intake.json b/src/generated/resources/assets/tfmg/models/item/air_intake.json new file mode 100644 index 00000000..2564c3cf --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/air_intake.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/air_intake/item" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/black_concrete.json b/src/generated/resources/assets/tfmg/models/item/black_concrete.json new file mode 100644 index 00000000..65716848 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/black_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/black_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/black_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/black_concrete_slab.json new file mode 100644 index 00000000..60a74147 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/black_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/black_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/black_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/black_concrete_stairs.json new file mode 100644 index 00000000..1210e894 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/black_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/black_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/black_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/black_concrete_wall.json new file mode 100644 index 00000000..7dbbd03f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/black_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/blue_concrete.json b/src/generated/resources/assets/tfmg/models/item/blue_concrete.json new file mode 100644 index 00000000..676104d6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/blue_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/blue_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/blue_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/blue_concrete_slab.json new file mode 100644 index 00000000..432cb70d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/blue_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/blue_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/blue_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/blue_concrete_stairs.json new file mode 100644 index 00000000..cb5cc10c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/blue_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/blue_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/blue_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/blue_concrete_wall.json new file mode 100644 index 00000000..799e622f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/blue_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/brown_concrete.json b/src/generated/resources/assets/tfmg/models/item/brown_concrete.json new file mode 100644 index 00000000..dfc2c988 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/brown_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/brown_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/brown_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/brown_concrete_slab.json new file mode 100644 index 00000000..d6c4d75f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/brown_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/brown_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/brown_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/brown_concrete_stairs.json new file mode 100644 index 00000000..20074c95 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/brown_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/brown_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/brown_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/brown_concrete_wall.json new file mode 100644 index 00000000..7e8f2e14 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/brown_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cyan_concrete.json b/src/generated/resources/assets/tfmg/models/item/cyan_concrete.json new file mode 100644 index 00000000..9da3dd41 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cyan_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cyan_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cyan_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/cyan_concrete_slab.json new file mode 100644 index 00000000..c72b90b4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cyan_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cyan_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cyan_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/cyan_concrete_stairs.json new file mode 100644 index 00000000..f58d9ed8 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cyan_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cyan_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cyan_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/cyan_concrete_wall.json new file mode 100644 index 00000000..af0be36c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cyan_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/gray_concrete.json b/src/generated/resources/assets/tfmg/models/item/gray_concrete.json new file mode 100644 index 00000000..7e2b1bf0 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/gray_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/gray_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/gray_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/gray_concrete_slab.json new file mode 100644 index 00000000..98f876af --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/gray_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/gray_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/gray_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/gray_concrete_stairs.json new file mode 100644 index 00000000..cca5c4ed --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/gray_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/gray_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/gray_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/gray_concrete_wall.json new file mode 100644 index 00000000..9bc6393a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/gray_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/green_concrete.json b/src/generated/resources/assets/tfmg/models/item/green_concrete.json new file mode 100644 index 00000000..03015678 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/green_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/green_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/green_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/green_concrete_slab.json new file mode 100644 index 00000000..e1b0ccec --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/green_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/green_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/green_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/green_concrete_stairs.json new file mode 100644 index 00000000..84c3bc09 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/green_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/green_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/green_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/green_concrete_wall.json new file mode 100644 index 00000000..b43b6fd1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/green_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/light_blue_concrete.json b/src/generated/resources/assets/tfmg/models/item/light_blue_concrete.json new file mode 100644 index 00000000..ff4bfd3c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/light_blue_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/light_blue_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_slab.json new file mode 100644 index 00000000..76c8a2c9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/light_blue_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_stairs.json new file mode 100644 index 00000000..72c84d5c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/light_blue_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_wall.json new file mode 100644 index 00000000..af3f96d2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/light_blue_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/light_gray_concrete.json b/src/generated/resources/assets/tfmg/models/item/light_gray_concrete.json new file mode 100644 index 00000000..5a7f2f38 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/light_gray_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/light_gray_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_slab.json new file mode 100644 index 00000000..ca71419a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/light_gray_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_stairs.json new file mode 100644 index 00000000..f80acb8b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/light_gray_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_wall.json new file mode 100644 index 00000000..2aa00b1d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/light_gray_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/lime_concrete.json b/src/generated/resources/assets/tfmg/models/item/lime_concrete.json new file mode 100644 index 00000000..362f19bf --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/lime_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/lime_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/lime_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/lime_concrete_slab.json new file mode 100644 index 00000000..89676987 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/lime_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/lime_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/lime_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/lime_concrete_stairs.json new file mode 100644 index 00000000..36440bc3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/lime_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/lime_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/lime_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/lime_concrete_wall.json new file mode 100644 index 00000000..c5f73b6a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/lime_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/magenta_concrete.json b/src/generated/resources/assets/tfmg/models/item/magenta_concrete.json new file mode 100644 index 00000000..a8cd5144 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/magenta_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/magenta_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/magenta_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/magenta_concrete_slab.json new file mode 100644 index 00000000..25a70835 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/magenta_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/magenta_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/magenta_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/magenta_concrete_stairs.json new file mode 100644 index 00000000..ccabc51d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/magenta_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/magenta_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/magenta_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/magenta_concrete_wall.json new file mode 100644 index 00000000..06b98997 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/magenta_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/orange_concrete.json b/src/generated/resources/assets/tfmg/models/item/orange_concrete.json new file mode 100644 index 00000000..dbdefe73 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/orange_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/orange_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/orange_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/orange_concrete_slab.json new file mode 100644 index 00000000..fa6296b6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/orange_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/orange_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/orange_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/orange_concrete_stairs.json new file mode 100644 index 00000000..d511469f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/orange_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/orange_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/orange_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/orange_concrete_wall.json new file mode 100644 index 00000000..a4663f08 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/orange_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/pink_concrete.json b/src/generated/resources/assets/tfmg/models/item/pink_concrete.json new file mode 100644 index 00000000..e54a8bd7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/pink_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/pink_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/pink_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/pink_concrete_slab.json new file mode 100644 index 00000000..70dfab34 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/pink_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/pink_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/pink_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/pink_concrete_stairs.json new file mode 100644 index 00000000..ddb88f29 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/pink_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/pink_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/pink_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/pink_concrete_wall.json new file mode 100644 index 00000000..8ec2d50c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/pink_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/purple_concrete.json b/src/generated/resources/assets/tfmg/models/item/purple_concrete.json new file mode 100644 index 00000000..635f4471 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/purple_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/purple_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/purple_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/purple_concrete_slab.json new file mode 100644 index 00000000..c6cd8d39 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/purple_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/purple_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/purple_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/purple_concrete_stairs.json new file mode 100644 index 00000000..96d3f159 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/purple_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/purple_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/purple_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/purple_concrete_wall.json new file mode 100644 index 00000000..1f06160e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/purple_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/red_concrete.json b/src/generated/resources/assets/tfmg/models/item/red_concrete.json new file mode 100644 index 00000000..657d6752 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/red_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/red_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/red_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/red_concrete_slab.json new file mode 100644 index 00000000..32b2cbba --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/red_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/red_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/red_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/red_concrete_stairs.json new file mode 100644 index 00000000..0e1eb0bc --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/red_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/red_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/red_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/red_concrete_wall.json new file mode 100644 index 00000000..83a6814e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/red_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/white_concrete.json b/src/generated/resources/assets/tfmg/models/item/white_concrete.json new file mode 100644 index 00000000..0540b9d9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/white_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/white_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/white_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/white_concrete_slab.json new file mode 100644 index 00000000..4ad65670 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/white_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/white_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/white_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/white_concrete_stairs.json new file mode 100644 index 00000000..b41709a2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/white_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/white_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/white_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/white_concrete_wall.json new file mode 100644 index 00000000..53100f34 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/white_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/yellow_concrete.json b/src/generated/resources/assets/tfmg/models/item/yellow_concrete.json new file mode 100644 index 00000000..58d4b828 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/yellow_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/yellow_concrete" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/yellow_concrete_slab.json b/src/generated/resources/assets/tfmg/models/item/yellow_concrete_slab.json new file mode 100644 index 00000000..330134fa --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/yellow_concrete_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/yellow_concrete_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/yellow_concrete_stairs.json b/src/generated/resources/assets/tfmg/models/item/yellow_concrete_stairs.json new file mode 100644 index 00000000..44f43393 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/yellow_concrete_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/yellow_concrete_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/yellow_concrete_wall.json b/src/generated/resources/assets/tfmg/models/item/yellow_concrete_wall.json new file mode 100644 index 00000000..01962c00 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/yellow_concrete_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/yellow_concrete" + } +} \ No newline at end of file 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 f29e7b3a..75b79702 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -23,6 +23,7 @@ "tfmg:casting_basin", "tfmg:casting_spout", "tfmg:coke_oven", + "tfmg:air_intake", "tfmg:steel_block", "tfmg:cast_iron_block", "tfmg:aluminum_block", @@ -31,6 +32,70 @@ "tfmg:steel_sheetmetal", "tfmg:heavy_casing_door", "tfmg:steel_door", + "tfmg:black_concrete", + "tfmg:black_concrete_wall", + "tfmg:black_concrete_stairs", + "tfmg:black_concrete_slab", + "tfmg:white_concrete", + "tfmg:white_concrete_wall", + "tfmg:white_concrete_stairs", + "tfmg:white_concrete_slab", + "tfmg:blue_concrete", + "tfmg:blue_concrete_wall", + "tfmg:blue_concrete_stairs", + "tfmg:blue_concrete_slab", + "tfmg:light_blue_concrete", + "tfmg:light_blue_concrete_wall", + "tfmg:light_blue_concrete_stairs", + "tfmg:light_blue_concrete_slab", + "tfmg:red_concrete", + "tfmg:red_concrete_wall", + "tfmg:red_concrete_stairs", + "tfmg:red_concrete_slab", + "tfmg:green_concrete", + "tfmg:green_concrete_wall", + "tfmg:green_concrete_stairs", + "tfmg:green_concrete_slab", + "tfmg:lime_concrete", + "tfmg:lime_concrete_wall", + "tfmg:lime_concrete_stairs", + "tfmg:lime_concrete_slab", + "tfmg:pink_concrete", + "tfmg:pink_concrete_wall", + "tfmg:pink_concrete_stairs", + "tfmg:pink_concrete_slab", + "tfmg:magenta_concrete", + "tfmg:magenta_concrete_wall", + "tfmg:magenta_concrete_stairs", + "tfmg:magenta_concrete_slab", + "tfmg:yellow_concrete", + "tfmg:yellow_concrete_wall", + "tfmg:yellow_concrete_stairs", + "tfmg:yellow_concrete_slab", + "tfmg:gray_concrete", + "tfmg:gray_concrete_wall", + "tfmg:gray_concrete_stairs", + "tfmg:gray_concrete_slab", + "tfmg:light_gray_concrete", + "tfmg:light_gray_concrete_wall", + "tfmg:light_gray_concrete_stairs", + "tfmg:light_gray_concrete_slab", + "tfmg:brown_concrete", + "tfmg:brown_concrete_wall", + "tfmg:brown_concrete_stairs", + "tfmg:brown_concrete_slab", + "tfmg:cyan_concrete", + "tfmg:cyan_concrete_wall", + "tfmg:cyan_concrete_stairs", + "tfmg:cyan_concrete_slab", + "tfmg:purple_concrete", + "tfmg:purple_concrete_wall", + "tfmg:purple_concrete_stairs", + "tfmg:purple_concrete_slab", + "tfmg:orange_concrete", + "tfmg:orange_concrete_wall", + "tfmg:orange_concrete_stairs", + "tfmg:orange_concrete_slab", "tfmg:concrete", "tfmg:bauxite", "tfmg:cut_bauxite", 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 8b26f0bb..89aaead2 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 @@ -1,6 +1,70 @@ { "values": [ "tfmg:coal_coke_block", + "tfmg:black_concrete", + "tfmg:black_concrete_wall", + "tfmg:black_concrete_stairs", + "tfmg:black_concrete_slab", + "tfmg:white_concrete", + "tfmg:white_concrete_wall", + "tfmg:white_concrete_stairs", + "tfmg:white_concrete_slab", + "tfmg:blue_concrete", + "tfmg:blue_concrete_wall", + "tfmg:blue_concrete_stairs", + "tfmg:blue_concrete_slab", + "tfmg:light_blue_concrete", + "tfmg:light_blue_concrete_wall", + "tfmg:light_blue_concrete_stairs", + "tfmg:light_blue_concrete_slab", + "tfmg:red_concrete", + "tfmg:red_concrete_wall", + "tfmg:red_concrete_stairs", + "tfmg:red_concrete_slab", + "tfmg:green_concrete", + "tfmg:green_concrete_wall", + "tfmg:green_concrete_stairs", + "tfmg:green_concrete_slab", + "tfmg:lime_concrete", + "tfmg:lime_concrete_wall", + "tfmg:lime_concrete_stairs", + "tfmg:lime_concrete_slab", + "tfmg:pink_concrete", + "tfmg:pink_concrete_wall", + "tfmg:pink_concrete_stairs", + "tfmg:pink_concrete_slab", + "tfmg:magenta_concrete", + "tfmg:magenta_concrete_wall", + "tfmg:magenta_concrete_stairs", + "tfmg:magenta_concrete_slab", + "tfmg:yellow_concrete", + "tfmg:yellow_concrete_wall", + "tfmg:yellow_concrete_stairs", + "tfmg:yellow_concrete_slab", + "tfmg:gray_concrete", + "tfmg:gray_concrete_wall", + "tfmg:gray_concrete_stairs", + "tfmg:gray_concrete_slab", + "tfmg:light_gray_concrete", + "tfmg:light_gray_concrete_wall", + "tfmg:light_gray_concrete_stairs", + "tfmg:light_gray_concrete_slab", + "tfmg:brown_concrete", + "tfmg:brown_concrete_wall", + "tfmg:brown_concrete_stairs", + "tfmg:brown_concrete_slab", + "tfmg:cyan_concrete", + "tfmg:cyan_concrete_wall", + "tfmg:cyan_concrete_stairs", + "tfmg:cyan_concrete_slab", + "tfmg:purple_concrete", + "tfmg:purple_concrete_wall", + "tfmg:purple_concrete_stairs", + "tfmg:purple_concrete_slab", + "tfmg:orange_concrete", + "tfmg:orange_concrete_wall", + "tfmg:orange_concrete_stairs", + "tfmg:orange_concrete_slab", "tfmg:concrete" ] } \ 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 fafd6261..66cc1897 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -1,5 +1,21 @@ { "values": [ + "tfmg:black_concrete_stairs", + "tfmg:white_concrete_stairs", + "tfmg:blue_concrete_stairs", + "tfmg:light_blue_concrete_stairs", + "tfmg:red_concrete_stairs", + "tfmg:green_concrete_stairs", + "tfmg:lime_concrete_stairs", + "tfmg:pink_concrete_stairs", + "tfmg:magenta_concrete_stairs", + "tfmg:yellow_concrete_stairs", + "tfmg:gray_concrete_stairs", + "tfmg:light_gray_concrete_stairs", + "tfmg:brown_concrete_stairs", + "tfmg:cyan_concrete_stairs", + "tfmg:purple_concrete_stairs", + "tfmg:orange_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 7683b5a0..391cedf3 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/walls.json +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -1,6 +1,38 @@ { "values": [ "tfmg:fireproof_brick_reinforcement", + "tfmg:black_concrete_wall", + "tfmg:black_concrete_slab", + "tfmg:white_concrete_wall", + "tfmg:white_concrete_slab", + "tfmg:blue_concrete_wall", + "tfmg:blue_concrete_slab", + "tfmg:light_blue_concrete_wall", + "tfmg:light_blue_concrete_slab", + "tfmg:red_concrete_wall", + "tfmg:red_concrete_slab", + "tfmg:green_concrete_wall", + "tfmg:green_concrete_slab", + "tfmg:lime_concrete_wall", + "tfmg:lime_concrete_slab", + "tfmg:pink_concrete_wall", + "tfmg:pink_concrete_slab", + "tfmg:magenta_concrete_wall", + "tfmg:magenta_concrete_slab", + "tfmg:yellow_concrete_wall", + "tfmg:yellow_concrete_slab", + "tfmg:gray_concrete_wall", + "tfmg:gray_concrete_slab", + "tfmg:light_gray_concrete_wall", + "tfmg:light_gray_concrete_slab", + "tfmg:brown_concrete_wall", + "tfmg:brown_concrete_slab", + "tfmg:cyan_concrete_wall", + "tfmg:cyan_concrete_slab", + "tfmg:purple_concrete_wall", + "tfmg:purple_concrete_slab", + "tfmg:orange_concrete_wall", + "tfmg:orange_concrete_slab", "tfmg:cut_bauxite_wall", "tfmg:polished_cut_bauxite_wall", "tfmg:cut_bauxite_brick_wall", diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/air_intake.json b/src/generated/resources/data/tfmg/loot_tables/blocks/air_intake.json new file mode 100644 index 00000000..0d06a53f --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/air_intake.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:air_intake" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/black_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/black_concrete.json new file mode 100644 index 00000000..13e3a087 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/black_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:black_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/black_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/black_concrete_slab.json new file mode 100644 index 00000000..a8cde9b6 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/black_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:black_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/black_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/black_concrete_stairs.json new file mode 100644 index 00000000..0fb53e75 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/black_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:black_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/black_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/black_concrete_wall.json new file mode 100644 index 00000000..034b1cdc --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/black_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:black_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/blue_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/blue_concrete.json new file mode 100644 index 00000000..c894468f --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/blue_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:blue_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/blue_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/blue_concrete_slab.json new file mode 100644 index 00000000..45ad7ede --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/blue_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:blue_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/blue_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/blue_concrete_stairs.json new file mode 100644 index 00000000..a4789562 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/blue_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:blue_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/blue_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/blue_concrete_wall.json new file mode 100644 index 00000000..1dfeb4c5 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/blue_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:blue_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/brown_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/brown_concrete.json new file mode 100644 index 00000000..74a71b10 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/brown_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:brown_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/brown_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/brown_concrete_slab.json new file mode 100644 index 00000000..72d62051 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/brown_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:brown_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/brown_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/brown_concrete_stairs.json new file mode 100644 index 00000000..60319048 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/brown_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:brown_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/brown_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/brown_concrete_wall.json new file mode 100644 index 00000000..fb1c0dfc --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/brown_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:brown_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_concrete.json new file mode 100644 index 00000000..9c3eea28 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_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:cyan_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_concrete_slab.json new file mode 100644 index 00000000..54e4ec8f --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_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:cyan_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_concrete_stairs.json new file mode 100644 index 00000000..970ecc4f --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_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:cyan_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_concrete_wall.json new file mode 100644 index 00000000..559fef1e --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cyan_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:cyan_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/gray_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/gray_concrete.json new file mode 100644 index 00000000..0c61fead --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/gray_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:gray_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/gray_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/gray_concrete_slab.json new file mode 100644 index 00000000..bb202a43 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/gray_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:gray_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/gray_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/gray_concrete_stairs.json new file mode 100644 index 00000000..a68244c9 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/gray_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:gray_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/gray_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/gray_concrete_wall.json new file mode 100644 index 00000000..4ebe2ae2 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/gray_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:gray_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/green_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/green_concrete.json new file mode 100644 index 00000000..12058920 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/green_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:green_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/green_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/green_concrete_slab.json new file mode 100644 index 00000000..954e4cd8 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/green_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:green_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/green_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/green_concrete_stairs.json new file mode 100644 index 00000000..36062da1 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/green_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:green_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/green_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/green_concrete_wall.json new file mode 100644 index 00000000..ca25c97b --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/green_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:green_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_concrete.json new file mode 100644 index 00000000..8d1d6f05 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_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:light_blue_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_concrete_slab.json new file mode 100644 index 00000000..3b19c491 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_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:light_blue_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_concrete_stairs.json new file mode 100644 index 00000000..29b6e9ae --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_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:light_blue_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_concrete_wall.json new file mode 100644 index 00000000..347fd267 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/light_blue_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:light_blue_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_concrete.json new file mode 100644 index 00000000..a8119cf1 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_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:light_gray_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_concrete_slab.json new file mode 100644 index 00000000..898082c4 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_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:light_gray_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_concrete_stairs.json new file mode 100644 index 00000000..982163d7 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_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:light_gray_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_concrete_wall.json new file mode 100644 index 00000000..7a8d8460 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/light_gray_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:light_gray_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/lime_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/lime_concrete.json new file mode 100644 index 00000000..2717f0e9 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/lime_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:lime_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/lime_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/lime_concrete_slab.json new file mode 100644 index 00000000..d7fa8ef5 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/lime_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:lime_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/lime_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/lime_concrete_stairs.json new file mode 100644 index 00000000..d78a65ed --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/lime_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:lime_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/lime_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/lime_concrete_wall.json new file mode 100644 index 00000000..231a38cc --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/lime_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:lime_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_concrete.json new file mode 100644 index 00000000..2bcdf8ea --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_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:magenta_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_concrete_slab.json new file mode 100644 index 00000000..ea93e2c2 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_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:magenta_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_concrete_stairs.json new file mode 100644 index 00000000..6cc706f1 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_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:magenta_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_concrete_wall.json new file mode 100644 index 00000000..91df943d --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/magenta_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:magenta_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/orange_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/orange_concrete.json new file mode 100644 index 00000000..c4e55086 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/orange_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:orange_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/orange_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/orange_concrete_slab.json new file mode 100644 index 00000000..5c09d270 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/orange_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:orange_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/orange_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/orange_concrete_stairs.json new file mode 100644 index 00000000..4d464fe7 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/orange_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:orange_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/orange_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/orange_concrete_wall.json new file mode 100644 index 00000000..c902913c --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/orange_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:orange_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/pink_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/pink_concrete.json new file mode 100644 index 00000000..678086d3 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/pink_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:pink_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/pink_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/pink_concrete_slab.json new file mode 100644 index 00000000..f9946d01 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/pink_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:pink_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/pink_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/pink_concrete_stairs.json new file mode 100644 index 00000000..fd243b08 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/pink_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:pink_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/pink_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/pink_concrete_wall.json new file mode 100644 index 00000000..dcd3ce7a --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/pink_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:pink_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/purple_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/purple_concrete.json new file mode 100644 index 00000000..64eb3744 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/purple_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:purple_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/purple_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/purple_concrete_slab.json new file mode 100644 index 00000000..85a6f06d --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/purple_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:purple_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/purple_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/purple_concrete_stairs.json new file mode 100644 index 00000000..2f3f0fc1 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/purple_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:purple_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/purple_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/purple_concrete_wall.json new file mode 100644 index 00000000..5b1de183 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/purple_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:purple_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/red_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/red_concrete.json new file mode 100644 index 00000000..7eebed3d --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/red_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:red_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/red_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/red_concrete_slab.json new file mode 100644 index 00000000..e67f4fad --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/red_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:red_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/red_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/red_concrete_stairs.json new file mode 100644 index 00000000..f284280f --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/red_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:red_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/red_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/red_concrete_wall.json new file mode 100644 index 00000000..be2fa86a --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/red_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:red_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/white_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/white_concrete.json new file mode 100644 index 00000000..a669d5fa --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/white_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:white_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/white_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/white_concrete_slab.json new file mode 100644 index 00000000..d9aedfa1 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/white_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:white_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/white_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/white_concrete_stairs.json new file mode 100644 index 00000000..26ca6c15 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/white_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:white_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/white_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/white_concrete_wall.json new file mode 100644 index 00000000..894b4d91 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/white_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:white_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_concrete.json b/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_concrete.json new file mode 100644 index 00000000..596ae3b1 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_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:yellow_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_concrete_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_concrete_slab.json new file mode 100644 index 00000000..688fa95a --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_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:yellow_concrete_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_concrete_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_concrete_stairs.json new file mode 100644 index 00000000..bceb4bef --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_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:yellow_concrete_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_concrete_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_concrete_wall.json new file mode 100644 index 00000000..1822f80f --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/yellow_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:yellow_concrete_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/CreateTFMG.java b/src/main/java/com/drmangotea/tfmg/CreateTFMG.java index 2584d0ce..e712c502 100644 --- a/src/main/java/com/drmangotea/tfmg/CreateTFMG.java +++ b/src/main/java/com/drmangotea/tfmg/CreateTFMG.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg; import com.drmangotea.tfmg.base.TFMGLangPartials; -import com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.fire.TFMGColoredFires; +import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.fire.TFMGColoredFires; import com.drmangotea.tfmg.registry.*; import com.drmangotea.tfmg.worldgen.TFMGConfiguredFeatures; import com.drmangotea.tfmg.worldgen.TFMGFeatures; @@ -69,6 +69,7 @@ public class CreateTFMG DataGenerator gen = event.getGenerator(); gen.addProvider(true, new LangMerger(gen, MOD_ID, NAME, TFMGLangPartials.values())); } + @SuppressWarnings("removal") private void clientSetup(final FMLClientSetupEvent event) { ItemBlockRenderTypes.setRenderLayer(TFMGColoredFires.GREEN_FIRE.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(TFMGColoredFires.BLUE_FIRE.get(), RenderType.cutout()); diff --git a/src/main/java/com/drmangotea/tfmg/CreateTFMGClient.java b/src/main/java/com/drmangotea/tfmg/CreateTFMGClient.java index 98925efe..e467c619 100644 --- a/src/main/java/com/drmangotea/tfmg/CreateTFMGClient.java +++ b/src/main/java/com/drmangotea/tfmg/CreateTFMGClient.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg; -import com.drmangotea.tfmg.blocks.gadgets.quad_potato_cannon.QuadPotatoCannonRenderHandler; +import com.drmangotea.tfmg.items.gadgets.quad_potato_cannon.QuadPotatoCannonRenderHandler; import com.drmangotea.tfmg.registry.TFMGPartialModels; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGVanillaBlockStates.java b/src/main/java/com/drmangotea/tfmg/base/TFMGVanillaBlockStates.java index 03207167..a6a54a65 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGVanillaBlockStates.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGVanillaBlockStates.java @@ -1,18 +1,70 @@ package com.drmangotea.tfmg.base; import com.drmangotea.tfmg.CreateTFMG; +import com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.tterrag.registrate.builders.BlockBuilder; +import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.WallBlock; +import net.minecraftforge.client.model.generators.ModelFile; + +import java.util.function.Supplier; public class TFMGVanillaBlockStates { + + + //WALL public static void generateWallBlockState(DataGenContext ctx, RegistrateBlockstateProvider prov, String name) { prov.wallBlock(ctx.get(), name, CreateTFMG.asResource("block/"+name)); } + public static ItemBuilder> transformWallItem( + ItemBuilder> builder, String name) { + builder.model((c, p) -> p.wallInventory(c.getName(), CreateTFMG.asResource("block/"+name))); + return builder; + } + + //STAIR + public static void generateStairBlockState(DataGenContext ctx, RegistrateBlockstateProvider prov, + String name) { + prov.stairsBlock(ctx.get(), name, CreateTFMG.asResource("block/"+name)); + } + public static ItemBuilder> transformStairItem( + ItemBuilder> builder, String variantName) { + return builder; + } + + //SLAB + + public static void generateSlabBlockState(DataGenContext ctx, RegistrateBlockstateProvider prov, + String variantName) { + String name = variantName; + ResourceLocation texture = CreateTFMG.asResource("block/"+name); + + + ModelFile bottom = prov.models() + .slab(name+"_bottom", texture, texture, texture); + ModelFile top = prov.models() + .slabTop(name + "_top", texture, texture, texture); + ModelFile doubleSlab = prov.models() + .getExistingFile(prov.modLoc("block/"+name)); + + + prov.slabBlock(ctx.get(), bottom, top, doubleSlab); + } + public static ItemBuilder> transformSlabItem( + ItemBuilder> builder, String variantName) { + return builder; + } } diff --git a/src/main/java/com/drmangotea/tfmg/base/creative_mode_tabs/BuldingCreativeModeTab.java b/src/main/java/com/drmangotea/tfmg/base/creative_mode_tabs/BuldingCreativeModeTab.java index e29f03d2..d5853c17 100644 --- a/src/main/java/com/drmangotea/tfmg/base/creative_mode_tabs/BuldingCreativeModeTab.java +++ b/src/main/java/com/drmangotea/tfmg/base/creative_mode_tabs/BuldingCreativeModeTab.java @@ -17,6 +17,6 @@ public class BuldingCreativeModeTab extends TFMGCreativeModeTab { @Override public ItemStack makeIcon() { - return TFMGBlocks.CONCRETE.asStack(); + return TFMGBlocks.CONCRETE_TEST.asStack(); } } diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java b/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java index 9aec3b5d..93ee071e 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.base.spark; -import com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.fire.BlueFireBlock; +import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.fire.BlueFireBlock; import com.drmangotea.tfmg.registry.TFMGEntityTypes; import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.content.trains.CubeParticleData; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java b/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java index 120fc17c..1dd80672 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.base.spark; -import com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.fire.GreenFireBlock; +import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.fire.GreenFireBlock; import com.drmangotea.tfmg.registry.TFMGEntityTypes; import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.content.trains.CubeParticleData; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/concrete/ConcreteFluid.java b/src/main/java/com/drmangotea/tfmg/blocks/concrete/ConcreteFluid.java index 61e520b7..606a4a40 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/concrete/ConcreteFluid.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/concrete/ConcreteFluid.java @@ -31,7 +31,7 @@ public class ConcreteFluid extends ForgeFlowingFluid { int random = randomSource.nextInt(7) ; if(random==2) { - level.setBlock(pos, TFMGBlocks.CONCRETE.get().defaultBlockState(), 3); + level.setBlock(pos, TFMGBlocks.CONCRETE_TEST.get().defaultBlockState(), 3); } } diff --git a/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/FormWorkBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/FormWorkBlockEntity.java index 891279a6..f0212b00 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/FormWorkBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/concrete/formwork/FormWorkBlockEntity.java @@ -64,7 +64,7 @@ public class FormWorkBlockEntity extends TFMGMachineBlockEntity { timer--; if(timer==0){ - level.setBlock(getBlockPos(), TFMGBlocks.CONCRETE.getDefaultState(),1); + level.setBlock(getBlockPos(), TFMGBlocks.CONCRETE_TEST.getDefaultState(),1); } } diff --git a/src/main/java/com/drmangotea/tfmg/blocks/decoration/CornerRailingBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/decoration/CornerRailingBlock.java new file mode 100644 index 00000000..94c60481 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/decoration/CornerRailingBlock.java @@ -0,0 +1,125 @@ +package com.drmangotea.tfmg.blocks.decoration; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.pathfinder.PathComputationType; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; + +public class CornerRailingBlock extends Block { + public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; + + + + public static final VoxelShape SHAPE_SECONDARY_RAILING_WEST = Block.box(0, 0, 14, 16, 16, 16); + public static final VoxelShape SHAPE_SECONDARY_RAILING_NORTH = Block.box(0, 0, 0, 2, 16, 16); + public static final VoxelShape SHAPE_SECONDARY_RAILING_EAST = Block.box(0, 0, 0, 16, 16, 2); + public static final VoxelShape SHAPE_SECONDARY_RAILING_SOUTH = Block.box(14, 0, 0, 16, 16, 16); + + public static final VoxelShape SHAPE_WEST = Shapes.or(Block.box(0, 0, 0, 2, 16, 16),SHAPE_SECONDARY_RAILING_WEST); + public static final VoxelShape SHAPE_NORTH = Shapes.or(Block.box(0, 0, 0, 16, 16, 2),SHAPE_SECONDARY_RAILING_NORTH); + public static final VoxelShape SHAPE_EAST = Shapes.or(Block.box(14, 0, 0, 16, 16, 16),SHAPE_SECONDARY_RAILING_EAST); + public static final VoxelShape SHAPE_SOUTH = Shapes.or(Block.box(0, 0, 14, 16, 16, 16),SHAPE_SECONDARY_RAILING_SOUTH); + + + public CornerRailingBlock(Properties p_54479_) { + super(p_54479_); + this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); + } + + public RenderShape getRenderShape(BlockState p_54559_) { + return RenderShape.MODEL; + } + + public VoxelShape getOcclusionShape(BlockState p_54584_, BlockGetter p_54585_, BlockPos p_54586_) { + switch((Direction)p_54584_.getValue(FACING)) { + case NORTH: + return SHAPE_SOUTH; + case SOUTH: + return SHAPE_NORTH; + case EAST: + return SHAPE_WEST; + case WEST: + return SHAPE_EAST; + default: + return SHAPE_NORTH; + } + } + + public boolean useShapeForLightOcclusion(BlockState p_54582_) { + return true; + } + + public BlockState getStateForPlacement(BlockPlaceContext p_54481_) { + Level level = p_54481_.getLevel(); + ItemStack itemstack = p_54481_.getItemInHand(); + Player player = p_54481_.getPlayer(); + boolean flag = false; + if (!level.isClientSide && player != null && player.canUseGameMasterBlocks()) { + CompoundTag compoundtag = BlockItem.getBlockEntityData(itemstack); + if (compoundtag != null && compoundtag.contains("Book")) { + flag = true; + } + } + + return this.defaultBlockState().setValue(FACING, p_54481_.getHorizontalDirection().getOpposite()); + } + + public VoxelShape getCollisionShape(BlockState p_54577_, BlockGetter p_54578_, BlockPos p_54579_, CollisionContext p_54580_) { + switch((Direction)p_54577_.getValue(FACING)) { + case NORTH: + return SHAPE_SOUTH; + case SOUTH: + return SHAPE_NORTH; + case EAST: + return SHAPE_WEST; + case WEST: + return SHAPE_EAST; + default: + return SHAPE_NORTH; + } + } + + public VoxelShape getShape(BlockState p_54561_, BlockGetter p_54562_, BlockPos p_54563_, CollisionContext p_54564_) { + switch((Direction)p_54561_.getValue(FACING)) { + case NORTH: + return SHAPE_SOUTH; + case SOUTH: + return SHAPE_NORTH; + case EAST: + return SHAPE_WEST; + case WEST: + return SHAPE_EAST; + default: + return SHAPE_NORTH; + } + } + + public BlockState rotate(BlockState p_54540_, Rotation p_54541_) { + return p_54540_.setValue(FACING, p_54541_.rotate(p_54540_.getValue(FACING))); + } + + public BlockState mirror(BlockState p_54537_, Mirror p_54538_) { + return p_54537_.rotate(p_54538_.getRotation(p_54537_.getValue(FACING))); + } + + protected void createBlockStateDefinition(StateDefinition.Builder p_54543_) { + p_54543_.add(FACING); + } + + + public boolean isPathfindable(BlockState p_54510_, BlockGetter p_54511_, BlockPos p_54512_, PathComputationType p_54513_) { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/blocks/decoration/RailingBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/decoration/RailingBlock.java new file mode 100644 index 00000000..952c1b66 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/decoration/RailingBlock.java @@ -0,0 +1,117 @@ +package com.drmangotea.tfmg.blocks.decoration; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.DirectionProperty; +import net.minecraft.world.level.pathfinder.PathComputationType; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; + +public class RailingBlock extends Block { + public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; + + public static final VoxelShape SHAPE_WEST = Block.box(0, 0, 0, 2, 16, 16); + public static final VoxelShape SHAPE_NORTH = Block.box(0, 0, 0, 16, 16, 2); + public static final VoxelShape SHAPE_EAST = Block.box(14, 0, 0, 16, 16, 16); + public static final VoxelShape SHAPE_SOUTH = Block.box(0, 0, 14, 16, 16, 16); + + + public RailingBlock(Properties p_54479_) { + super(p_54479_); + this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.NORTH)); + } + + public RenderShape getRenderShape(BlockState p_54559_) { + return RenderShape.MODEL; + } + + public VoxelShape getOcclusionShape(BlockState p_54584_, BlockGetter p_54585_, BlockPos p_54586_) { + switch((Direction)p_54584_.getValue(FACING)) { + case NORTH: + return SHAPE_SOUTH; + case SOUTH: + return SHAPE_NORTH; + case EAST: + return SHAPE_WEST; + case WEST: + return SHAPE_EAST; + default: + return SHAPE_NORTH; + } + } + + public boolean useShapeForLightOcclusion(BlockState p_54582_) { + return true; + } + + public BlockState getStateForPlacement(BlockPlaceContext p_54481_) { + Level level = p_54481_.getLevel(); + ItemStack itemstack = p_54481_.getItemInHand(); + Player player = p_54481_.getPlayer(); + boolean flag = false; + if (!level.isClientSide && player != null && player.canUseGameMasterBlocks()) { + CompoundTag compoundtag = BlockItem.getBlockEntityData(itemstack); + if (compoundtag != null && compoundtag.contains("Book")) { + flag = true; + } + } + + return this.defaultBlockState().setValue(FACING, p_54481_.getHorizontalDirection().getOpposite()); + } + + public VoxelShape getCollisionShape(BlockState p_54577_, BlockGetter p_54578_, BlockPos p_54579_, CollisionContext p_54580_) { + switch((Direction)p_54577_.getValue(FACING)) { + case NORTH: + return SHAPE_SOUTH; + case SOUTH: + return SHAPE_NORTH; + case EAST: + return SHAPE_WEST; + case WEST: + return SHAPE_EAST; + default: + return SHAPE_NORTH; + } + } + + public VoxelShape getShape(BlockState p_54561_, BlockGetter p_54562_, BlockPos p_54563_, CollisionContext p_54564_) { + switch((Direction)p_54561_.getValue(FACING)) { + case NORTH: + return SHAPE_SOUTH; + case SOUTH: + return SHAPE_NORTH; + case EAST: + return SHAPE_WEST; + case WEST: + return SHAPE_EAST; + default: + return SHAPE_NORTH; + } + } + + public BlockState rotate(BlockState p_54540_, Rotation p_54541_) { + return p_54540_.setValue(FACING, p_54541_.rotate(p_54540_.getValue(FACING))); + } + + public BlockState mirror(BlockState p_54537_, Mirror p_54538_) { + return p_54537_.rotate(p_54538_.getRotation(p_54537_.getValue(FACING))); + } + + protected void createBlockStateDefinition(StateDefinition.Builder p_54543_) { + p_54543_.add(FACING); + } + + + public boolean isPathfindable(BlockState p_54510_, BlockGetter p_54511_, BlockPos p_54512_, PathComputationType p_54513_) { + return false; + } +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/blocks/decoration/TFMGGravityBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/decoration/TFMGGravityBlock.java new file mode 100644 index 00000000..db5f477a --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/decoration/TFMGGravityBlock.java @@ -0,0 +1,18 @@ +package com.drmangotea.tfmg.blocks.decoration; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.FallingBlock; +import net.minecraft.world.level.block.state.BlockState; + +public class TFMGGravityBlock extends FallingBlock { + public TFMGGravityBlock(Properties p_53736_) { + super(p_53736_); + } + + public int getDustColor(BlockState p_53738_, BlockGetter p_53739_, BlockPos p_53740_) { + return -8356741; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/blocks/decoration/TrussBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/decoration/TrussBlock.java new file mode 100644 index 00000000..90abaee2 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/decoration/TrussBlock.java @@ -0,0 +1,65 @@ +package com.drmangotea.tfmg.blocks.decoration; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.SimpleWaterloggedBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.BooleanProperty; +import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.level.material.Fluids; + +public class TrussBlock extends Block implements SimpleWaterloggedBlock { + public static final EnumProperty AXIS = BlockStateProperties.AXIS; + public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; + public TrussBlock(Properties p_55926_) { + super(p_55926_); + this.registerDefaultState(this.defaultBlockState().setValue(AXIS, Direction.Axis.Y).setValue(WATERLOGGED, Boolean.valueOf(false))); + } + public BlockState rotate(BlockState p_55930_, Rotation p_55931_) { + return rotatePillar(p_55930_, p_55931_); + } + + public static BlockState rotatePillar(BlockState p_154377_, Rotation p_154378_) { + switch(p_154378_) { + case COUNTERCLOCKWISE_90: + case CLOCKWISE_90: + switch((Direction.Axis)p_154377_.getValue(AXIS)) { + case X: + return p_154377_.setValue(AXIS, Direction.Axis.Z); + case Z: + return p_154377_.setValue(AXIS, Direction.Axis.X); + default: + return p_154377_; + } + default: + return p_154377_; + } + } + + protected void createBlockStateDefinition(StateDefinition.Builder p_55933_) { + p_55933_.add(AXIS, WATERLOGGED); + } + public BlockState updateShape(BlockState p_56381_, Direction p_56382_, BlockState p_56383_, LevelAccessor p_56384_, BlockPos p_56385_, BlockPos p_56386_) { + if (p_56381_.getValue(WATERLOGGED)) { + p_56384_.scheduleTick(p_56385_, Fluids.WATER, Fluids.WATER.getTickDelay(p_56384_)); + } + + return super.updateShape(p_56381_, p_56382_, p_56383_, p_56384_, p_56385_, p_56386_); + } + public FluidState getFluidState(BlockState p_56397_) { + return p_56397_.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(p_56397_); + } + + public BlockState getStateForPlacement(BlockPlaceContext p_55928_) { + return this.defaultBlockState().setValue(AXIS, p_55928_.getClickedFace().getAxis()); + } +} + + diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlock.java new file mode 100644 index 00000000..24ae7caa --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlock.java @@ -0,0 +1,220 @@ +package com.drmangotea.tfmg.blocks.engines.diesel; + + +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllShapes; +import com.simibubi.create.content.equipment.wrench.IWrenchable; +import com.simibubi.create.content.fluids.tank.FluidTankBlock; +import com.simibubi.create.content.kinetics.simpleRelays.ShaftBlock; +import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlock; +import com.simibubi.create.foundation.block.IBE; +import com.simibubi.create.foundation.placement.IPlacementHelper; +import com.simibubi.create.foundation.placement.PlacementHelpers; +import com.simibubi.create.foundation.placement.PlacementOffset; +import com.simibubi.create.foundation.utility.BlockHelper; +import com.simibubi.create.foundation.utility.Couple; +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition.Builder; +import net.minecraft.world.level.block.state.properties.AttachFace; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.level.pathfinder.PathComputationType; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; + +import javax.annotation.Nullable; +import java.util.function.Predicate; + +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED; + +public class DieselEngineBlock extends HorizontalDirectionalBlock + implements IWrenchable, IBE { + public static final EnumProperty FACE = BlockStateProperties.ATTACH_FACE; + + private static final int placementHelperId = PlacementHelpers.register(new PlacementHelper()); + + public DieselEngineBlock(Properties properties) { + super(properties); + registerDefaultState(stateDefinition.any().setValue(FACE, AttachFace.FLOOR).setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, false)); + } + public static Direction getConnectedDirection(BlockState p_53201_) { + switch((AttachFace)p_53201_.getValue(FACE)) { + case CEILING: + return Direction.DOWN; + case FLOOR: + return Direction.UP; + default: + return p_53201_.getValue(FACING); + } + } + @Override + protected void createBlockStateDefinition(Builder pBuilder) { + super.createBlockStateDefinition(pBuilder.add(FACE, FACING, WATERLOGGED)); + } +/* + @Override + public void setPlacedBy(Level pLevel, BlockPos pPos, BlockState pState, LivingEntity pPlacer, ItemStack pStack) { + super.setPlacedBy(pLevel, pPos, pState, pPlacer, pStack); + AdvancementBehaviour.setPlacedBy(pLevel, pPos, pPlacer); + } + +*/ +@Nullable +public BlockState getStateForPlacement(BlockPlaceContext p_53184_) { + for(Direction direction : p_53184_.getNearestLookingDirections()) { + BlockState blockstate; + if (direction.getAxis() == Axis.Y) { + blockstate = this.defaultBlockState().setValue(FACE, direction == Direction.UP ? AttachFace.CEILING : AttachFace.FLOOR).setValue(FACING, p_53184_.getHorizontalDirection()); + } else { + blockstate = this.defaultBlockState().setValue(FACE, AttachFace.WALL).setValue(FACING, direction.getOpposite()); + } + + if (blockstate.canSurvive(p_53184_.getLevel(), p_53184_.getClickedPos())) { + return blockstate; + } + } + + return null; +} + + + + + + + + @Override + public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, + BlockHitResult ray) { + ItemStack heldItem = player.getItemInHand(hand); + + IPlacementHelper placementHelper = PlacementHelpers.get(placementHelperId); + if (placementHelper.matchesItem(heldItem)) + return placementHelper.getOffset(player, world, state, pos, ray) + .placeInWorld(world, (BlockItem) heldItem.getItem(), player, hand, ray); + return InteractionResult.PASS; + } + + @Override + public BlockState updateShape(BlockState state, Direction direction, BlockState neighbourState, LevelAccessor world, + BlockPos pos, BlockPos neighbourPos) { + // if (state.getValue(WATERLOGGED)) + // world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world)); + return state; + } + + @Override + public void onPlace(BlockState pState, Level pLevel, BlockPos pPos, BlockState pOldState, boolean pIsMoving) { + // FluidTankBlock.updateBoilerState(pState, pLevel, pPos.relative(getFacing(pState).getOpposite())); + BlockPos shaftPos = getShaftPos(pState, pPos); + BlockState shaftState = pLevel.getBlockState(shaftPos); + if (isShaftValid(pState, shaftState)) + pLevel.setBlock(shaftPos, PoweredShaftBlock.getEquivalent(shaftState), 3); + } + + @Override + public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pIsMoving) { + if (pState.hasBlockEntity() && (!pState.is(pNewState.getBlock()) || !pNewState.hasBlockEntity())) + pLevel.removeBlockEntity(pPos); + FluidTankBlock.updateBoilerState(pState, pLevel, pPos.relative(getFacing(pState).getOpposite())); + BlockPos shaftPos = getShaftPos(pState, pPos); + BlockState shaftState = pLevel.getBlockState(shaftPos); + if (AllBlocks.POWERED_SHAFT.has(shaftState)) + pLevel.scheduleTick(shaftPos, shaftState.getBlock(), 1); + } + + @Override + public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) { + AttachFace face = pState.getValue(FACE); + Direction direction = pState.getValue(FACING); + return face == AttachFace.CEILING ? AllShapes.STEAM_ENGINE_CEILING.get(direction.getAxis()) + : face == AttachFace.FLOOR ? AllShapes.STEAM_ENGINE.get(direction.getAxis()) + : AllShapes.STEAM_ENGINE_WALL.get(direction); + } + + + @Override + public boolean isPathfindable(BlockState state, BlockGetter reader, BlockPos pos, PathComputationType type) { + return false; + } + + public static Direction getFacing(BlockState sideState) { + return getConnectedDirection(sideState); + } + + public static BlockPos getShaftPos(BlockState sideState, BlockPos pos) { + return pos.relative(getConnectedDirection(sideState), 2); + } + + public static boolean isShaftValid(BlockState state, BlockState shaft) { + return (AllBlocks.SHAFT.has(shaft) || AllBlocks.POWERED_SHAFT.has(shaft)) + && shaft.getValue(ShaftBlock.AXIS) != getFacing(state).getAxis(); + } + + @Override + public Class getBlockEntityClass() { + return DieselEngineBlockEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.DIESEL_ENGINE.get(); + } + + @MethodsReturnNonnullByDefault + private static class PlacementHelper implements IPlacementHelper { + @Override + public Predicate getItemPredicate() { + return AllBlocks.SHAFT::isIn; + } + + @Override + public Predicate getStatePredicate() { + return s -> s.getBlock() instanceof DieselEngineBlock; + } + + @Override + public PlacementOffset getOffset(Player player, Level world, BlockState state, BlockPos pos, + BlockHitResult ray) { + BlockPos shaftPos =DieselEngineBlock.getShaftPos(state, pos); + BlockState shaft = AllBlocks.SHAFT.getDefaultState(); + for (Direction direction : Direction.orderedByNearest(player)) { + shaft = shaft.setValue(ShaftBlock.AXIS, direction.getAxis()); + if (isShaftValid(state, shaft)) + break; + } + + BlockState newState = world.getBlockState(shaftPos); + if (!newState.getMaterial().isReplaceable()) + return PlacementOffset.fail(); + + Axis axis = shaft.getValue(ShaftBlock.AXIS); + return PlacementOffset.success(shaftPos, + s -> BlockHelper.copyProperties(s, AllBlocks.POWERED_SHAFT.getDefaultState()) + .setValue(PoweredShaftBlock.AXIS, axis)); + } + } + + public static Couple getSpeedRange() { + return Couple.create(16, 128); + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java new file mode 100644 index 00000000..abb22850 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java @@ -0,0 +1,545 @@ +package com.drmangotea.tfmg.blocks.engines.diesel; + + +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlockEntity; +import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; +import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity; +import com.simibubi.create.content.kinetics.base.IRotate; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; +import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour; +import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity; +import com.simibubi.create.content.kinetics.steamEngine.SteamEngineValueBox; +import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; +import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; +import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; +import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour; +import com.simibubi.create.foundation.fluid.CombinedTankWrapper; +import com.simibubi.create.foundation.utility.*; +import net.minecraft.ChatFormatting; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; +import net.minecraft.core.Direction.AxisDirection; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +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.minecraft.world.phys.AABB; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fml.DistExecutor; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.lang.ref.WeakReference; +import java.util.List; +import java.util.Optional; + +public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { + + protected ScrollOptionBehaviour movementDirection; + + public WeakReference target; +/////////// + + public SmartFluidTankBehaviour inputTank; + protected SmartFluidTankBehaviour exhaustTank; + private boolean contentsChanged; + private int consumptionTimer=0; + public float engineStrength = 0; + private Couple tanks; + + public boolean connectionVerticalX=false; + public boolean connectionVerticalZ=false; + + public boolean connectionX=false; + public boolean connectionX2=false; + + public boolean connectionZ=false; + public boolean connectionZ2=false; + + protected LazyOptional fluidCapability; + + + + + + + List> visualizedOutputFluids; + + public DieselEngineBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + target = new WeakReference<>(null); + + ///////// + + + + contentsChanged = true; + + + + tanks = Couple.create(inputTank, exhaustTank); + tanks.get(true).forbidExtraction(); + tanks.get(false).forbidInsertion(); + + + + } + + @Override + public void addBehaviours(List behaviours) { + //movementDirection = new ScrollOptionBehaviour<>(WindmillBearingBlockEntity.RotationDirection.class, + // Lang.translateDirect("contraptions.windmill.rotation_direction"), this, new DieselEngineValueBox()); + movementDirection = new ScrollOptionBehaviour<>(WindmillBearingBlockEntity.RotationDirection.class, + Lang.translateDirect("contraptions.windmill.rotation_direction"), this, new SteamEngineValueBox()); + movementDirection.onlyActiveWhen(() -> { + PoweredShaftBlockEntity shaft = getShaft(); + return shaft == null || !shaft.hasSource(); + }); + movementDirection.withCallback($ -> onDirectionChanged()); + behaviours.add(movementDirection); +//////////////////////////////////////////// + behaviours.add(new DirectBeltInputBehaviour(this)); + + + + inputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.INPUT, this, 1, 1000, true) + .whenFluidUpdates(() -> contentsChanged = true); + + exhaustTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 1, 1000, true) + .whenFluidUpdates(() -> contentsChanged = true) + .forbidInsertion(); + behaviours.add(inputTank); + behaviours.add(exhaustTank); + + fluidCapability = LazyOptional.of(() -> { + LazyOptional inputCap = inputTank.getCapability(); + LazyOptional outputCap = exhaustTank.getCapability(); + return new CombinedTankWrapper(outputCap.orElse(null), inputCap.orElse(null)); + }); + } + + private void onDirectionChanged() {} + + @Override + public void tick() { + super.tick(); + + + spawnConnections(); + + + + if(!level.isClientSide()){ + + + + } + + + + PoweredShaftBlockEntity shaft = getShaft(); + + if ( shaft == null) { + if (level.isClientSide()) + return; + if (shaft == null) + return; + if (!shaft.getBlockPos() + .subtract(worldPosition) + .equals(shaft.enginePos)) + return; + if (shaft.engineEfficiency == 0) + return; + Direction facing = DieselEngineBlock.getFacing(getBlockState()); + if (level.isLoaded(worldPosition.relative(facing.getOpposite()))) + shaft.update(worldPosition, 0, 0); + return; + } + engineProcess(); + boolean verticalTarget = false; + BlockState shaftState = shaft.getBlockState(); + Axis targetAxis = Axis.X; + if (shaftState.getBlock()instanceof IRotate ir) + targetAxis = ir.getRotationAxis(shaftState); + verticalTarget = targetAxis == Axis.Y; + + BlockState blockState = getBlockState(); + if (!TFMGBlocks.DIESEL_ENGINE.has(blockState)) + return; + Direction facing = DieselEngineBlock.getFacing(blockState); + if (facing.getAxis() == Axis.Y) + facing = blockState.getValue(DieselEngineBlock.FACING); + + + //if (engineStrength > 0) + + // award(AllAdvancements.STEAM_ENGINE); + + int conveyedSpeedLevel = + engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2; + if (targetAxis == Axis.Z) + conveyedSpeedLevel *= -1; + if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) + conveyedSpeedLevel *= -1; + + float shaftSpeed = shaft.getTheoreticalSpeed(); + if (shaft.hasSource() && shaftSpeed != 0 && conveyedSpeedLevel != 0 + && (shaftSpeed > 0) != (conveyedSpeedLevel > 0)) { + movementDirection.setValue(1 - movementDirection.get() + .ordinal()); + conveyedSpeedLevel *= -1; + } + + shaft.update(worldPosition, conveyedSpeedLevel, engineStrength); + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::makeSound); + } + @OnlyIn(Dist.CLIENT) + private void makeSound(){ + Float targetAngle = getTargetAngle(); + PoweredShaftBlockEntity ste = target.get(); + if (ste == null) + return; + if (!ste.isPoweredBy(worldPosition) || ste.engineEfficiency == 0) + return; + if (targetAngle == null) + return; + + float angle = AngleHelper.deg(targetAngle); + angle += (angle < 0) ? -180 + 75 : 360 - 75; + angle %= 360; + + PoweredShaftBlockEntity shaft = getShaft(); + if (shaft == null || shaft.getSpeed() == 0) + return; + + if (angle >= 0 && !(prevAngle > 180 && angle < 180)) { + prevAngle = angle; + return; + } + if (angle < 0 && !(prevAngle < -180 && angle > -180)) { + prevAngle = angle; + return; + } + + float pitch = 1.18f - level.random.nextFloat() * .25f; + //CISoundEvents.DIESEL_ENGINE_SOUNDS.playAt(level, worldPosition, 0.3f, .2f, false); + + prevAngle = angle; + } + + private void spawnConnections(){ + if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.UP|| + ((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.DOWN){ + + if( + level.getBlockState(this.getBlockPos().north()).is(TFMGBlocks.DIESEL_ENGINE.get())|| + level.getBlockState(this.getBlockPos().south()).is(TFMGBlocks.DIESEL_ENGINE.get()) + ){ + connectionVerticalZ=true; + } else connectionVerticalZ=false; + if( + level.getBlockState(this.getBlockPos().west()).is(TFMGBlocks.DIESEL_ENGINE.get())|| + level.getBlockState(this.getBlockPos().east()).is(TFMGBlocks.DIESEL_ENGINE.get()) + ){ + connectionVerticalX=true; + } else connectionVerticalX=false; + + + + } + if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.WEST|| + ((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.EAST){ + + if( + level.getBlockState(this.getBlockPos().north()).is(TFMGBlocks.DIESEL_ENGINE.get())|| + level.getBlockState(this.getBlockPos().south()).is(TFMGBlocks.DIESEL_ENGINE.get()) + ){ + connectionZ=true; + } else connectionZ=false; + if( + level.getBlockState(this.getBlockPos().above()).is(TFMGBlocks.DIESEL_ENGINE.get())|| + level.getBlockState(this.getBlockPos().below()).is(TFMGBlocks.DIESEL_ENGINE.get()) + ){ + connectionZ2=true; + } else connectionZ2=false; + + + + } + if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.NORTH|| + ((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.SOUTH){ + + if( + level.getBlockState(this.getBlockPos().west()).is(TFMGBlocks.DIESEL_ENGINE.get())|| + level.getBlockState(this.getBlockPos().east()).is(TFMGBlocks.DIESEL_ENGINE.get()) + ){ + connectionX=true; + } else connectionX=false; + if( + level.getBlockState(this.getBlockPos().above()).is(TFMGBlocks.DIESEL_ENGINE.get())|| + level.getBlockState(this.getBlockPos().below()).is(TFMGBlocks.DIESEL_ENGINE.get()) + ){ + connectionX2=true; + } else connectionX2=false; + + + + } + } + + + private void engineProcess() { + if(tanks.get(true).getPrimaryHandler().isEmpty()||tanks.get(true).getPrimaryHandler().isEmpty()) { + engineStrength=0; + return; + } + if(tanks.get(false).getPrimaryHandler().getFluidAmount()+5>1000) { + engineStrength = 0; + return; + } + if(tanks.get(true).getPrimaryHandler().getFluid().getFluid().isSame(TFMGFluids.DIESEL.getSource())) { + + + + if(consumptionTimer>=3) { + //if(signal!=0) + tanks.get(true).getPrimaryHandler().drain(3, IFluidHandler.FluidAction.EXECUTE); + tanks.get(false) .getPrimaryHandler().setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(), tanks.get(false).getPrimaryHandler().getFluidAmount()+1)); + consumptionTimer=0; + } + consumptionTimer++; + + engineStrength=40; + + } + + } + + @Override + public void remove() { + PoweredShaftBlockEntity shaft = getShaft(); + if (shaft != null) + shaft.remove(worldPosition); + super.remove(); + } + + @Override + @OnlyIn(Dist.CLIENT) + protected AABB createRenderBoundingBox() { + return super.createRenderBoundingBox().inflate(2); + } + + public PoweredShaftBlockEntity getShaft() { + PoweredShaftBlockEntity shaft = target.get(); + if (shaft == null || shaft.isRemoved() || !shaft.canBePoweredBy(worldPosition)) { + if (shaft != null) + target = new WeakReference<>(null); + Direction facing = DieselEngineBlock.getFacing(getBlockState()); + BlockEntity anyShaftAt = level.getBlockEntity(worldPosition.relative(facing, 2)); + if (anyShaftAt instanceof PoweredShaftBlockEntity ps && ps.canBePoweredBy(worldPosition)) + target = new WeakReference<>(shaft = ps); + } + return shaft; + } + + + + float prevAngle = 0; + + + + @Nullable + @OnlyIn(Dist.CLIENT) + public Float getTargetAngle() { + float angle = 0; + BlockState blockState = getBlockState(); + if (!TFMGBlocks.DIESEL_ENGINE.has(blockState)) + return null; + + Direction facing = DieselEngineBlock.getFacing(blockState); + PoweredShaftBlockEntity shaft = getShaft(); + Axis facingAxis = facing.getAxis(); + Axis axis = Axis.Y; + + if (shaft == null) + return null; + + axis = KineticBlockEntityRenderer.getRotationAxisOf(shaft); + angle = KineticBlockEntityRenderer.getAngleForTe(shaft, shaft.getBlockPos(), axis); + + if (axis == facingAxis) + return null; + if (axis.isHorizontal() && (facingAxis == Axis.X ^ facing.getAxisDirection() == AxisDirection.POSITIVE)) + angle *= -1; + if (axis == Axis.X && facing == Direction.DOWN) + angle *= -1; + return angle; + } +/* + @Override + public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { + PoweredShaftBlockEntity shaft = getShaft(); + return shaft == null ? false : shaft.addToEngineTooltip(tooltip, isPlayerSneaking); + } + + */ +//////////////////////////////////// + + @Override + protected void read(CompoundTag compound, boolean clientPacket) { + super.read(compound, clientPacket); + + + if (!clientPacket) + return; + // tanks.get(true).getPrimaryHandler().readFromNBT(compound.getCompound("Fuel")); + // tanks.get(true).getPrimaryHandler().readFromNBT(compound.getCompound("Exhaust")); + + } + + @Override + public void write(CompoundTag compound, boolean clientPacket) { + super.write(compound, clientPacket); + + + + if (!clientPacket) + return; + // compound.put("Fuel", tanks.get(true).getPrimaryHandler().writeToNBT(new CompoundTag())); + // compound.put("Exhaust", tanks.get(false).getPrimaryHandler().writeToNBT(new CompoundTag())); + + } + + + @Override + public void invalidate() { + super.invalidate(); + + fluidCapability.invalidate(); + } + + @Nonnull + @Override + public LazyOptional getCapability(@Nonnull Capability cap, Direction side) { + + if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + return fluidCapability.cast(); + return super.getCapability(cap, side); + } + + @Override + public void notifyUpdate() { + super.notifyUpdate(); + } + + + + + + + public Couple getTanks() { + return tanks; + } + + + + + + + + + + @Override + public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { + + + + //--Fluid Info--// + LazyOptional handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY); + Optional resolve = handler.resolve(); + if (!resolve.isPresent()) + return false; + + IFluidHandler tank = resolve.get(); + if (tank.getTanks() == 0) + return false; + + LangBuilder mb = Lang.translate("generic.unit.millibuckets"); + Lang.translate("goggles.diesel_engine_info") + .style(ChatFormatting.GRAY) + .forGoggles(tooltip); + + boolean isEmpty = true; + for (int i = 0; i < tank.getTanks(); i++) { + FluidStack fluidStack = tank.getFluidInTank(i); + if (fluidStack.isEmpty()) + continue; + + Lang.fluidName(fluidStack) + .style(ChatFormatting.GRAY) + .forGoggles(tooltip, 1); + + Lang.builder() + .add(Lang.number(fluidStack.getAmount()) + .add(mb) + .style(ChatFormatting.DARK_GREEN)) + .text(ChatFormatting.GRAY, " / ") + .add(Lang.number(tank.getTankCapacity(i)) + .add(mb) + .style(ChatFormatting.DARK_GRAY)) + .forGoggles(tooltip, 1); + + isEmpty = false; + } + + if (tank.getTanks() > 1) { + if (isEmpty) + tooltip.remove(tooltip.size() - 1); + return true; + } + + if (!isEmpty) + return true; + + Lang.translate("gui.goggles.fluid_container.capacity") + .add(Lang.number(tank.getTankCapacity(0)) + .add(mb) + .style(ChatFormatting.DARK_GREEN)) + .style(ChatFormatting.DARK_GRAY) + .forGoggles(tooltip, 1); + + + return true; + } + + + +/* + class BasinValueBox extends ValueBoxTransform.Sided { + + @Override + protected Vec3 getSouthLocation() { + return VecHelper.voxelSpace(8, 12, 15.75); + } + + @Override + protected boolean isSideActive(BlockState state, Direction direction) { + return direction.getAxis() + .isHorizontal(); + } + + } + + */ + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java new file mode 100644 index 00000000..b74ceb0e --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java @@ -0,0 +1,145 @@ +package com.drmangotea.tfmg.blocks.engines.diesel; + + +import com.drmangotea.tfmg.registry.TFMGPartialModels; +import com.jozufozu.flywheel.api.MaterialManager; +import com.jozufozu.flywheel.api.instance.DynamicInstance; +import com.jozufozu.flywheel.backend.instancing.blockentity.BlockEntityInstance; +import com.jozufozu.flywheel.core.Materials; +import com.jozufozu.flywheel.core.materials.model.ModelData; +import com.simibubi.create.AllPartialModels; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; +import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity; +import com.simibubi.create.foundation.utility.AngleHelper; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; +import net.minecraft.util.Mth; + +public class DieselEngineInstance extends BlockEntityInstance implements DynamicInstance { + + protected final ModelData piston; + protected final ModelData linkage; + protected final ModelData connector; + //protected final ModelData connection; + + public DieselEngineInstance(MaterialManager materialManager, DieselEngineBlockEntity blockEntity) { + super(materialManager, blockEntity); + + piston = materialManager.defaultSolid() + .material(Materials.TRANSFORMED) + .getModel(AllPartialModels.ENGINE_PISTON, blockState) + .createInstance(); + linkage = materialManager.defaultSolid() + .material(Materials.TRANSFORMED) + .getModel(AllPartialModels.ENGINE_LINKAGE, blockState) + .createInstance(); + connector = materialManager.defaultSolid() + .material(Materials.TRANSFORMED) + .getModel(AllPartialModels.ENGINE_CONNECTOR, blockState) + .createInstance(); + //connection = materialManager.defaultSolid() + // .material(Materials.TRANSFORMED) + // .getModel(TFMGPartialModels.DIESEL_ENGINE_CONNECTION, blockState) + // .createInstance(); + + } + + @Override + public void beginFrame() { + Float angle = blockEntity.getTargetAngle(); + if (angle == null) { + piston.setEmptyTransform(); + linkage.setEmptyTransform(); + connector.setEmptyTransform(); + //connection.setEmptyTransform(); + return; + } + + Direction facing = DieselEngineBlock.getFacing(blockState); + Axis facingAxis = facing.getAxis(); + Axis axis = Axis.Y; + + PoweredShaftBlockEntity shaft = blockEntity.getShaft(); + if (shaft != null) + axis = KineticBlockEntityRenderer.getRotationAxisOf(shaft); + + boolean roll90 = facingAxis.isHorizontal() && axis == Axis.Y || facingAxis.isVertical() && axis == Axis.Z; + float sine = Mth.sin(angle); + float sine2 = Mth.sin(angle - Mth.HALF_PI); + float piston = ((1 - sine) / 4) * 24 / 16f; + + + transformed(this.piston, facing, roll90) + .translate(0, piston, 0); + + + transformed(linkage, facing, roll90) + .centre() + .translate(0, 1, 0) + .unCentre() + .translate(0, piston, 0) + .translate(0, 4 / 16f, 8 / 16f) + .rotateX(sine2 * 23f) + .translate(0, -4 / 16f, -8 / 16f); + + transformed(connector, facing, roll90) + .translate(0, 2, 0) + .centre() + .rotateXRadians(-angle + Mth.HALF_PI) + .unCentre(); + + // if(blockEntity.connectionVerticalX) + // transformed(this.connection, facing, roll90) + // .rotateY(90) + // .translate(-1, 0, 0); +// + // if(blockEntity.connectionVerticalZ) + // transformed(this.connection, facing, roll90) + // .rotateY(90) + // .translate(-1, 0, 0); +// + // if(blockEntity.connectionX) + // transformed(this.connection, facing, roll90) + // .rotateY(90) + // .translate(-1, 0, 0); + // if(blockEntity.connectionX2) + // transformed(this.connection, facing, roll90) + // .rotateY(90) + // .translate(-1, 0,0 ); +// + // if(blockEntity.connectionZ) + // transformed(this.connection, facing, roll90) + // .rotateY(90) + // .translate(-1, 0, 0); + // if(blockEntity.connectionZ2) + // transformed(this.connection, facing, roll90) + // .rotateY(90) + // .translate(-1, 0, 0); + + + } + + protected ModelData transformed(ModelData modelData, Direction facing, boolean roll90) { + return modelData.loadIdentity() + .translate(getInstancePosition()) + .centre() + .rotateY(AngleHelper.horizontalAngle(facing)) + .rotateX(AngleHelper.verticalAngle(facing) + 90) + .rotateY(roll90 ? -90 : 0) + .unCentre(); + } + + @Override + public void updateLight() { + relight(pos, piston, linkage, connector); + } + + @Override + protected void remove() { + piston.delete(); + linkage.delete(); + connector.delete(); + //connection.delete(); + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineRenderer.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineRenderer.java new file mode 100644 index 00000000..dd2efe13 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineRenderer.java @@ -0,0 +1,101 @@ +package com.drmangotea.tfmg.blocks.engines.diesel; + + +import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.core.PartialModel; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.simibubi.create.AllPartialModels; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; +import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity; +import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; +import com.simibubi.create.foundation.render.CachedBufferer; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.utility.AngleHelper; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; +import net.minecraft.util.Mth; +import net.minecraft.world.level.block.state.BlockState; + +public class DieselEngineRenderer extends SafeBlockEntityRenderer { + + public DieselEngineRenderer(BlockEntityRendererProvider.Context context) {} + + @Override + protected void renderSafe(DieselEngineBlockEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, + int light, int overlay) { + if (Backend.canUseInstancing(te.getLevel())) + return; + + Float angle = te.getTargetAngle(); + if (angle == null) + return; + + BlockState blockState = te.getBlockState(); + Direction facing = DieselEngineBlock.getFacing(blockState); + Axis facingAxis = facing.getAxis(); + Axis axis = Axis.Y; + + PoweredShaftBlockEntity shaft = te.getShaft(); + if (shaft != null) + axis = KineticBlockEntityRenderer.getRotationAxisOf(shaft); + + boolean roll90 = facingAxis.isHorizontal() && axis == Axis.Y || facingAxis.isVertical() && axis == Axis.Z; + float sine = Mth.sin(angle); + float sine2 = Mth.sin(angle - Mth.HALF_PI); + float piston = ((1 - sine) / 4) * 24 / 16f; + + VertexConsumer vb = buffer.getBuffer(RenderType.solid()); + + + + transformed(AllPartialModels.ENGINE_PISTON, blockState, facing, roll90) + .translate(0, piston, 0) + .light(light) + .renderInto(ms, vb); + + + transformed(AllPartialModels.ENGINE_LINKAGE, blockState, facing, roll90) + .centre() + .translate(0, 1, 0) + .unCentre() + .translate(0, piston, 0) + .translate(0, 4 / 16f, 8 / 16f) + .rotateX(sine2 * 23f) + .translate(0, -4 / 16f, -8 / 16f) + .light(light) + .renderInto(ms, vb); + + transformed(AllPartialModels.ENGINE_CONNECTOR, blockState, facing, roll90) + .translate(0, 2, 0) + .centre() + .rotateXRadians(-angle + Mth.HALF_PI) + .unCentre() + .light(light) + .renderInto(ms, vb); + + + + + + + } + + private SuperByteBuffer transformed(PartialModel model, BlockState blockState, Direction facing, boolean roll90) { + return CachedBufferer.partial(model, blockState) + .centre() + .rotateY(AngleHelper.horizontalAngle(facing)) + .rotateX(AngleHelper.verticalAngle(facing) + 90) + .rotateY(roll90 ? -90 : 0) + .unCentre(); + } + + @Override + public int getViewDistance() { + return 128; + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineValueBox.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineValueBox.java new file mode 100644 index 00000000..23e3b4f0 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineValueBox.java @@ -0,0 +1,79 @@ +package com.drmangotea.tfmg.blocks.engines.diesel; + + +import com.jozufozu.flywheel.util.transform.TransformStack; +import com.mojang.blaze3d.vertex.PoseStack; +import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; +import com.simibubi.create.foundation.utility.AngleHelper; +import com.simibubi.create.foundation.utility.Pointing; +import com.simibubi.create.foundation.utility.VecHelper; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; + +public class DieselEngineValueBox extends ValueBoxTransform.Sided { + + @Override + protected boolean isSideActive(BlockState state, Direction direction) { + return DieselEngineBlock.getFacing(state) + .getAxis() != direction.getAxis(); + } + + @Override + public Vec3 getLocalOffset(BlockState state) { + Direction side = getSide(); + Direction engineFacing = DieselEngineBlock.getFacing(state); + + float roll = 0; + for (Pointing p : Pointing.values()) { + if (p.getCombinedDirection(engineFacing) == side) + roll = p.getXRotation(); + } + if (engineFacing == Direction.UP) + roll += 180; + + float horizontalAngle = AngleHelper.horizontalAngle(engineFacing); + float verticalAngle = AngleHelper.verticalAngle(engineFacing); + + boolean recessed = roll % 180 == 0; + if (engineFacing.getAxis() == Axis.Y) + recessed ^= state.getValue(DieselEngineBlock.FACING).getAxis() == Axis.X; + + Vec3 local = VecHelper.voxelSpace(8, recessed ? 13 : 15, 9); + + local = VecHelper.rotateCentered(local, roll, Axis.Z); + local = VecHelper.rotateCentered(local, horizontalAngle, Axis.Y); + local = VecHelper.rotateCentered(local, verticalAngle, Axis.X); + + return local; + } + + @Override + public void rotate(BlockState state, PoseStack ms) { + Direction facing = DieselEngineBlock.getFacing(state); + + if (facing.getAxis() == Axis.Y) { + super.rotate(state, ms); + return; + } + + float roll = 0; + for (Pointing p : Pointing.values()) { + if (p.getCombinedDirection(facing) == getSide()) + roll = p.getXRotation(); + } + + float yRot = AngleHelper.horizontalAngle(facing) + (facing == Direction.DOWN ? 180 : 0); + TransformStack.cast(ms) + .rotateY(yRot) + .rotateX(facing == Direction.DOWN ? -90 : 90) + .rotateY(roll); + } + + @Override + protected Vec3 getSouthLocation() { + return Vec3.ZERO; + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlock.java new file mode 100644 index 00000000..ae1fd134 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlock.java @@ -0,0 +1,97 @@ +package com.drmangotea.tfmg.blocks.engines.intake; + +import com.drmangotea.tfmg.CreateTFMG; +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.content.equipment.wrench.IWrenchable; +import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock; +import com.simibubi.create.content.kinetics.base.KineticBlock; +import com.simibubi.create.content.kinetics.base.KineticBlockEntity; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.RenderShape; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BooleanProperty; + +public class AirIntakeBlock extends DirectionalKineticBlock implements IBE, IWrenchable { + + public static final BooleanProperty INVISIBLE = BooleanProperty.create("invisible"); + + public AirIntakeBlock(Properties properties) { + super(properties); + this.registerDefaultState(this.stateDefinition.any().setValue(INVISIBLE, false)); + } + + @Override + public Direction.Axis getRotationAxis(BlockState state) { + return state.getValue(FACING).getAxis(); + } + + + @Override + public boolean hasShaftTowards(LevelReader world, BlockPos pos, BlockState state, Direction face) { + AirIntakeBlockEntity be = (AirIntakeBlockEntity) world.getBlockEntity(pos); + + if(be.hasShaft) { + return face == state.getValue(FACING).getOpposite(); + }else return false; + } + public InteractionResult onWrenched(BlockState state, UseOnContext context) { + + Direction direction = context.getClickedFace(); + Level level = context.getLevel(); + AirIntakeBlockEntity be = (AirIntakeBlockEntity) level.getBlockEntity(context.getClickedPos()); + + if(direction == state.getValue(FACING).getOpposite()) { + ((AirIntakeBlockEntity) level.getBlockEntity(context.getClickedPos())).hasShaft = !be.hasShaft; + ////////// + BlockPos pos = context.getClickedPos(); + + playRotateSound(level,pos); + + AirIntakeBlockEntity kineticBlockEntity = (AirIntakeBlockEntity) level.getBlockEntity(pos); + if(!kineticBlockEntity.hasShaft) { + if (kineticBlockEntity.hasNetwork()) + kineticBlockEntity.getOrCreateNetwork() + .remove(kineticBlockEntity); + kineticBlockEntity.detachKinetics(); + kineticBlockEntity.removeSource(); + kineticBlockEntity.setSpeed(0); + kineticBlockEntity.remove(); + kineticBlockEntity.notifyUpdate(); + } else{ + kineticBlockEntity.attachKinetics(); + kineticBlockEntity.notifyUpdate(); + } + } + + + + return super.onWrenched(state,context); + } + + @Override + public Class getBlockEntityClass() { + return AirIntakeBlockEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.AIR_INTAKE.get(); + } + @Override + public RenderShape getRenderShape(BlockState pState) { + return RenderShape.MODEL; + } + + protected void createBlockStateDefinition(StateDefinition.Builder p_55125_) { + p_55125_.add(FACING, INVISIBLE); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java new file mode 100644 index 00000000..b378629a --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java @@ -0,0 +1,564 @@ +package com.drmangotea.tfmg.blocks.engines.intake; + +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.simibubi.create.content.equipment.wrench.IWrenchable; +import com.simibubi.create.content.kinetics.base.KineticBlockEntity; +import com.simibubi.create.foundation.fluid.CombinedTankWrapper; +import com.simibubi.create.foundation.fluid.SmartFluidTank; +import com.simibubi.create.foundation.utility.Lang; +import com.simibubi.create.foundation.utility.LangBuilder; +import com.simibubi.create.foundation.utility.animation.LerpedFloat; +import net.minecraft.ChatFormatting; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.templates.FluidTank; + + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; + +import static com.drmangotea.tfmg.blocks.engines.intake.AirIntakeBlock.INVISIBLE; +import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING; + +public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrenchable { + + + int diameter = 1; + + boolean isController=false; + + public boolean hasShaft=true; + + boolean isUsedByController = false; + + + public BlockPos controller; + + public List blockEntities = new ArrayList<>(); + + public float maxShaftSpeed =0; + + public float angle = 0; + public LerpedFloat visual_angle = LerpedFloat.angular(); + + protected FluidTank tankInventory; + protected LazyOptional fluidCapability; + + + + + + public AirIntakeBlockEntity(BlockEntityType typeIn, BlockPos pos, BlockState state) { + super(typeIn, pos, state); + tankInventory = createInventory(); + fluidCapability = LazyOptional.of(() -> tankInventory); + + + } + + public void tick(){ + super.tick(); + + + int production = ((int)maxShaftSpeed*((diameter*diameter)))/60; + if(tankInventory.getFluidAmount()+production <= tankInventory.getCapacity()) + tankInventory.fill(new FluidStack(TFMGFluids.AIR.getSource(),production), IFluidHandler.FluidAction.EXECUTE); +//////////////// + + + if(diameter == 3){ + visual_angle.chase(angle, 0.1f, LerpedFloat.Chaser.EXP); + visual_angle.tickChaser(); + } + + angle+=maxShaftSpeed/2; + + + angle %= 360; + + + if(isUsedByController) + blockEntities.clear(); + + + + if(!this.getBlockState().getValue(INVISIBLE)){ + if(isController||isUsedByController){ + level.setBlock(this.getBlockPos(),this.getBlockState().setValue(INVISIBLE,true),2); + } + + + } + if(!isController&&!isUsedByController) + level.setBlock(this.getBlockPos(),this.getBlockState().setValue(INVISIBLE,false),2); + + if(controller == null) + controller = this.getBlockPos(); + + diameter =getPossibleDiameter(); + + if(controller == this.getBlockPos()) { + + isUsedByController = false; + } else { + isUsedByController = true; + isController = false; + } + + if(diameter ==1) { + isController = false; + + } + + if(!(level.getBlockEntity(controller) instanceof AirIntakeBlockEntity)) { + isUsedByController = false; + controller = this.getBlockPos(); + + } else { + if(!(((AirIntakeBlockEntity) level.getBlockEntity(controller)).isController)) + isUsedByController = false; + } + //else + // if(!(((AirIntakeBlockEntity) level.getBlockEntity(controller)).isController)) + // controller = this.getBlockPos(); + + if(controller!=null) { + if(((AirIntakeBlockEntity)level.getBlockEntity(controller)).diameter==2) { + int x = Math.abs(this.getBlockPos().getX() - controller.getX()); + int y = Math.abs(this.getBlockPos().getY() - controller.getY()); + int z = Math.abs(this.getBlockPos().getZ() - controller.getZ()); + + int distanceFromController = x + y + z; + if (x > 1 || y > 1 || z > 1) { + isUsedByController = false; + controller = this.getBlockPos(); + } + } + if(((AirIntakeBlockEntity)level.getBlockEntity(controller)).diameter==1) { + isUsedByController = false; + controller = this.getBlockPos(); + } + + } + + + + //////////////////////// + + if(diameter == 1){ + maxShaftSpeed = Math.abs(getSpeed()); + + }else { + maxShaftSpeed = Math.abs(getSpeed()); + List speeds = new ArrayList<>(); +// + for (AirIntakeBlockEntity be : blockEntities) { + speeds.add(Math.abs(be.getSpeed())); +// + } +// + for(float testedSpeed : speeds){ + if(testedSpeed> maxShaftSpeed) + maxShaftSpeed = testedSpeed; + } + // maxShaftSpeed = getSpeed(); + } + + + + if(isUsedByController) + return; + + if(diameter ==2){ + + if(blockEntities.toArray().length!=4) + return; + } + if(diameter ==3){ + if(blockEntities.toArray().length!=9) + return; + } + + + + + } + @Override + public void invalidate() { + super.invalidate(); + + fluidCapability.invalidate(); + } + + public InteractionResult onWrenched(BlockState state, UseOnContext context){ + Direction direction = context.getClickedFace(); + + if(direction == getBlockState().getValue(FACING).getOpposite()) { + hasShaft = !hasShaft; + } + return InteractionResult.SUCCESS; + } + + public void setController(BlockPos controllerPos) { + // isUsedByController = true; + controller = controllerPos; + + } + + + @Nonnull + @Override + @SuppressWarnings("removal") + public LazyOptional getCapability(@Nonnull Capability cap, Direction side) { + + + + if(controller!=null) + refreshCapability(); + + + + if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + return fluidCapability.cast(); + return super.getCapability(cap, side); + } + + private void refreshCapability() { + + if (this.controller == null) { + + + return; + } + + + LazyOptional oldFluidCapability = fluidCapability; + +if(diameter==1&&!isUsedByController){ + + fluidCapability = LazyOptional.of(() -> new CombinedTankWrapper(tankInventory)); + + oldFluidCapability.invalidate(); + + return; +} + + + if(!isController) { + if (controller != getBlockPos()) { + if (level.getBlockEntity(controller) instanceof AirIntakeBlockEntity) + fluidCapability = LazyOptional.of(() -> new CombinedTankWrapper(((AirIntakeBlockEntity) level.getBlockEntity(controller)).tankInventory)); + + } + }else fluidCapability = LazyOptional.of(() -> new CombinedTankWrapper(tankInventory)); + + oldFluidCapability.invalidate(); + + } + + + + + + public int getPossibleDiameter(){ + + if(controller !=this.getBlockPos()) + return 1; + + + + BlockPos checkedPos = this.getBlockPos(); + Direction direction = this.getBlockState().getValue(FACING); + + + + List checkedPosses = new ArrayList<>(); + checkedPos = this.getBlockPos(); + + boolean canBeMedium = true; + for(int x = 0;x < 2; x++){ + for(int z = 0;z < 2; z++){ + checkedPosses.add(checkedPos); + if(direction.getAxis().isHorizontal()) { + checkedPos = checkedPos.above(); + }else checkedPos = checkedPos.east(); + } + if(direction.getAxis().isHorizontal()) { + checkedPos = checkedPos.below(2); + checkedPos = checkedPos.relative(direction.getClockWise()); + } else { + checkedPos = checkedPos.west(2); + checkedPos = checkedPos.south(); + + } + } + List checkedPossesLarge = new ArrayList<>(); + checkedPos = this.getBlockPos(); + + boolean canBeLarge = true; + for(int x = 0;x < 3; x++){ + for(int z = 0;z < 3; z++){ + checkedPossesLarge.add(checkedPos); + if(direction.getAxis().isHorizontal()) { + checkedPos = checkedPos.above(); + }else checkedPos = checkedPos.east(); + } + if(direction.getAxis().isHorizontal()) { + checkedPos = checkedPos.below(3); + checkedPos = checkedPos.relative(direction.getClockWise()); + } else { + checkedPos = checkedPos.west(3); + checkedPos = checkedPos.south(); + + } + } + //LARGE + for(BlockPos pos : checkedPossesLarge){ + if(!(level.getBlockEntity(pos) instanceof AirIntakeBlockEntity)) { + canBeLarge = false; + break; + } + + // ((AirIntakeBlockEntity) level.getBlockEntity(pos)).controller = this.getBlockPos(); + AirIntakeBlockEntity checkedBE = (AirIntakeBlockEntity) level.getBlockEntity(pos); + + //if(checkedBE.diameter<3) + // ((AirIntakeBlockEntity) level.getBlockEntity(pos)).isController = false; + + if(pos!=this.getBlockPos()) + if(checkedBE.isController) { + + + canBeLarge = false; + break; + } + + + + if(checkedBE.getBlockState().getValue(FACING) != this.getBlockState().getValue(FACING)) { + canBeLarge = false; + break; + } + + //if(pos!=this.getBlockPos()) + // ((AirIntakeBlockEntity) level.getBlockEntity(pos)).isUsedByController = true; + + + } + //MEDIUM + for(BlockPos pos : checkedPosses){ + if(!(level.getBlockEntity(pos) instanceof AirIntakeBlockEntity)) { + canBeMedium = false; + break; + } + + // ((AirIntakeBlockEntity) level.getBlockEntity(pos)).controller = this.getBlockPos(); + AirIntakeBlockEntity checkedBE = (AirIntakeBlockEntity) level.getBlockEntity(pos); + + if(pos!=this.getBlockPos()) + if(checkedBE.isController) { + canBeMedium = false; + break; + } + + + if(checkedBE.getBlockState().getValue(FACING) != this.getBlockState().getValue(FACING)) { + canBeMedium = false; + break; + } + + //if(pos!=this.getBlockPos()) + // ((AirIntakeBlockEntity) level.getBlockEntity(pos)).isUsedByController = true; + + + } + + + if(canBeLarge) { + this.blockEntities.clear(); + for(BlockPos pos : checkedPossesLarge) { + //if(((AirIntakeBlockEntity) level.getBlockEntity(pos)).isUsedByController&&((AirIntakeBlockEntity) level.getBlockEntity(pos)).controller!=this.getBlockPos()&&pos!=this.getBlockPos()) { + // controller = this.getBlockPos(); + // isController = false; + // return 1; + //} + + if((((AirIntakeBlockEntity) level.getBlockEntity(pos)).isUsedByController&&((AirIntakeBlockEntity) level.getBlockEntity(pos)).controller!=this.getBlockPos()&&pos!=this.getBlockPos())||isController) { + + ((AirIntakeBlockEntity) level.getBlockEntity(pos)).isUsedByController = true; + ((AirIntakeBlockEntity) level.getBlockEntity(pos)).isController = false; + ((AirIntakeBlockEntity) level.getBlockEntity(pos)).controller =this.getBlockPos(); + + } + + ((AirIntakeBlockEntity) level.getBlockEntity(pos)).setController(this.getBlockPos()); + this.blockEntities.add((AirIntakeBlockEntity) level.getBlockEntity(pos)); + } + + controller = this.getBlockPos(); + isController = true; + return 3; + } + + + if(canBeMedium) { + this.blockEntities.clear(); + + + + for(BlockPos pos : checkedPosses) { + if(((AirIntakeBlockEntity) level.getBlockEntity(pos)).isUsedByController&&((AirIntakeBlockEntity) level.getBlockEntity(pos)).controller!=this.getBlockPos()&&pos!=this.getBlockPos()) { + controller = this.getBlockPos(); + isController = false; + return 1; + } + ((AirIntakeBlockEntity) level.getBlockEntity(pos)).setController(this.getBlockPos()); + this.blockEntities.add((AirIntakeBlockEntity) level.getBlockEntity(pos)); + } + + controller = this.getBlockPos(); + isController = true; + return 2; + } + + controller = this.getBlockPos(); + isController = false; + return 1; + } + @Override + protected AABB createRenderBoundingBox() { + + + return new AABB(this.getBlockPos()).inflate(3); + } + @Override + @SuppressWarnings("removal") + public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { + + + + //--Fluid Info--// + LazyOptional handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY); + Optional resolve = handler.resolve(); + if (!resolve.isPresent()) + return false; + + IFluidHandler tank = resolve.get(); + if (tank.getTanks() == 0) + return false; + + LangBuilder mb = Lang.translate("generic.unit.millibuckets"); + + + boolean isEmpty = true; + for (int i = 0; i < tank.getTanks(); i++) { + FluidStack fluidStack = tank.getFluidInTank(i); + if (fluidStack.isEmpty()) + continue; + + Lang.fluidName(fluidStack) + .style(ChatFormatting.GRAY) + .forGoggles(tooltip, 1); + + Lang.builder() + .add(Lang.number(fluidStack.getAmount()) + .add(mb) + .style(ChatFormatting.DARK_GREEN)) + .text(ChatFormatting.GRAY, " / ") + .add(Lang.number(tank.getTankCapacity(i)) + .add(mb) + .style(ChatFormatting.DARK_GRAY)) + .forGoggles(tooltip, 1); + + isEmpty = false; + } + + if (tank.getTanks() > 1) { + if (isEmpty) + tooltip.remove(tooltip.size() - 1); + return true; + } + + if (!isEmpty) + return true; + + Lang.translate("gui.goggles.fluid_container.capacity") + .add(Lang.number(tank.getTankCapacity(0)) + .add(mb) + .style(ChatFormatting.DARK_GREEN)) + .style(ChatFormatting.DARK_GRAY) + .forGoggles(tooltip, 1); + + + + return true; + } + protected SmartFluidTank createInventory() { + return new SmartFluidTank(8000, this::onFluidStackChanged){ + @Override + public boolean isFluidValid(FluidStack stack) { + return stack.getFluid().isSame(TFMGFluids.AIR.getSource()); + } + @Override + public FluidStack drain(FluidStack resource, FluidAction action) { + return FluidStack.EMPTY; + } + }; + } + + protected void onFluidStackChanged(FluidStack newFluidStack) { + if (!hasLevel()) + return; + + + + if (!level.isClientSide) { + setChanged(); + sendData(); + } + + + } + + + @Override + protected void read(CompoundTag compound, boolean clientPacket) { + super.read(compound, clientPacket); + + diameter = compound.getInt("Diameter"); + isController = compound.getBoolean("IsController"); + isUsedByController = compound.getBoolean("IsUsed"); + hasShaft = compound.getBoolean("HasShaft"); + tankInventory.readFromNBT(compound.getCompound("TankContent")); + + } + + @Override + public void write(CompoundTag compound, boolean clientPacket) { + super.write(compound, clientPacket); + + + compound.putInt("Diameter", diameter); + compound.putBoolean("IsController", isController); + compound.putBoolean("IsUsed", isUsedByController); + compound.putBoolean("HasShaft", hasShaft); + compound.put("TankContent", tankInventory.writeToNBT(new CompoundTag())); + + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeGenerator.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeGenerator.java new file mode 100644 index 00000000..f8824cb6 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeGenerator.java @@ -0,0 +1,36 @@ +package com.drmangotea.tfmg.blocks.engines.intake; + +import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlock; +import com.simibubi.create.content.kinetics.motor.CreativeMotorBlock; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.client.model.generators.ModelFile; + +import static com.simibubi.create.foundation.data.AssetLookup.partialBaseModel; + +public class AirIntakeGenerator extends SpecialBlockStateGen { + @Override + protected int getXRotation(BlockState state) { + Direction facing = state.getValue(MechanicalPistonBlock.FACING); + return facing.getAxis() + .isVertical() ? facing == Direction.DOWN ? 180 : 0 : 90; + } + + @Override + protected int getYRotation(BlockState state) { + Direction facing = state.getValue(MechanicalPistonBlock.FACING); + return facing.getAxis() + .isVertical() ? 0 : horizontalAngle(facing) + 180; + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, BlockState state) { + return state.getValue(AirIntakeBlock.INVISIBLE) ? partialBaseModel(ctx, prov, "empty") + : partialBaseModel(ctx, prov); + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeInstance.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeInstance.java new file mode 100644 index 00000000..80dc8ed9 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeInstance.java @@ -0,0 +1,333 @@ +package com.drmangotea.tfmg.blocks.engines.intake; + +import com.drmangotea.tfmg.registry.TFMGPartialModels; +import com.jozufozu.flywheel.api.InstanceData; +import com.jozufozu.flywheel.api.MaterialManager; +import com.jozufozu.flywheel.api.instance.DynamicInstance; +import com.jozufozu.flywheel.core.materials.model.ModelData; +import com.jozufozu.flywheel.util.transform.TransformStack; +import com.mojang.blaze3d.vertex.PoseStack; +import com.simibubi.create.AllPartialModels; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityInstance; +import com.simibubi.create.content.kinetics.base.flwdata.RotatingData; +import com.simibubi.create.foundation.render.AllMaterialSpecs; +import com.simibubi.create.foundation.utility.AngleHelper; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.util.Mth; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.phys.AABB; + + +import java.util.Optional; + +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING; + +public class AirIntakeInstance extends KineticBlockEntityInstance implements DynamicInstance { + + + private final ModelData frame; + + private final ModelData frameClosed; + + private ModelData chassisMedium; + + private ModelData chassisLarge; + + protected Optional shaft; + protected final RotatingData fan; + protected final ModelData fan_medium; + protected final ModelData fan_large; + + final Direction direction; + private final Direction opposite; + + public AirIntakeInstance(MaterialManager materialManager, AirIntakeBlockEntity blockEntity) { + super(materialManager, blockEntity); + + direction = blockState.getValue(FACING); + + opposite = direction.getOpposite(); + + fan = materialManager.defaultCutout() + .material(AllMaterialSpecs.ROTATING) + .getModel(TFMGPartialModels.AIR_INTAKE_FAN, blockState, opposite) + .createInstance(); + fan_medium = getTransformMaterial() + //.defaultCutout() + //.material(AllMaterialSpecs.ROTATING) + .getModel(TFMGPartialModels.AIR_INTAKE_FAN_MEDIUM, blockState, opposite) + .createInstance(); + fan_large = getTransformMaterial() + //.defaultCutout() + //.material(AllMaterialSpecs.ROTATING) + .getModel(TFMGPartialModels.AIR_INTAKE_FAN_LARGE, blockState, opposite) + .createInstance(); + + + + + setup(fan, getFanSpeed()); + + //setup(fan_large, getFanSpeed()); + + + + frame = getTransformMaterial() + .getModel(TFMGPartialModels.AIR_INTAKE_FRAME,blockState,blockEntity.getBlockState().getValue(FACING)) + .createInstance(); + frameClosed = getTransformMaterial() + .getModel(TFMGPartialModels.AIR_INTAKE_FRAME_CLOSED,blockState,blockEntity.getBlockState().getValue(FACING)) + .createInstance(); + + chassisMedium = getTransformMaterial() + .getModel(TFMGPartialModels.AIR_INTAKE_MEDIUM,blockState,blockEntity.getBlockState().getValue(FACING)) + .createInstance(); + chassisLarge = getTransformMaterial() + .getModel(TFMGPartialModels.AIR_INTAKE_LARGE,blockState,blockEntity.getBlockState().getValue(FACING)) + .createInstance(); + + + + + + + + // if(direction.getAxis().isHorizontal()) { + // float x = 0; + // float z = 0; + // if(direction == Direction.NORTH) + // x=0.5f; + // if(direction == Direction.SOUTH) + // x=-0.5f; + // if(direction == Direction.WEST) + // z=-0.5f; + // if(direction == Direction.EAST) + // z=0.5f; +// +// + // // fan_large.translate(x*2,1,z*2); + // fan_medium.setPosition(getInstancePosition()).nudge(x,0.5f,z); + // }else { + // fan_medium.setPosition(getInstancePosition()).nudge(0.5f, 0, 0.5f); + // //fan_large.translate(1,0,1); + // } + } + @Override + public void init() { + + + + + RotatingData data = setup(getRotatingMaterial().getModel(AllPartialModels.SHAFT_HALF, blockState, blockState.getValue(FACING).getOpposite()) + .createInstance()); + + + shaft = Optional.of(data); + + } + + private float getFanSpeed() { + float speed = blockEntity.getSpeed(); + if (speed > 0) + speed = Mth.clamp(speed, 80, 64 * 20); + if (speed < 0) + speed = Mth.clamp(speed, -64 * 20, -80); + return speed; + } + + @Override + public void update() { + shaft.ifPresent(this::updateRotation); + + + + } + + + @Override + public void beginFrame() { + + + PoseStack msFan = new PoseStack(); + TransformStack msrFan = TransformStack.cast(msFan); + msrFan.translate(getInstancePosition()); + + PoseStack msFanMedium = new PoseStack(); + TransformStack msrFanMedium = TransformStack.cast(msFanMedium); + msrFanMedium.translate(getInstancePosition()); + //msrFan.translate(0,0,0); + + + + + if(direction.getAxis().isHorizontal()) { + float x = 0; + float z = 0; + if(direction == Direction.NORTH) + x=1f; + if(direction == Direction.SOUTH) + x=-1f; + if(direction == Direction.WEST) + z=-1f; + if(direction == Direction.EAST) + z=1f; + + + msrFan.translate(x,1,z); + msrFanMedium.translate(x/2,0.5,z/2); + }else { + msrFanMedium.translate(0.5,0,0.5); + msrFan.translate(1,0,1); + } + msrFan.centre(); + msrFanMedium.centre(); + // msrFan.translateY(3); + //msrFan.translateY(5); + msrFan.rotate((double) blockEntity.angle,direction.getAxis()); + msrFanMedium.rotate((double) blockEntity.angle,direction.getAxis()); + //msrFan.translateY(-5); + // msrFan.translateX(-1); + msrFan.unCentre(); + msrFanMedium.unCentre(); + + + + if(!blockEntity.isUsedByController) { + if(blockEntity.diameter ==1) { + updateRotation(fan, getFanSpeed()); + fan_medium.setEmptyTransform(); + fan_large.setEmptyTransform(); + } + if(blockEntity.diameter ==2) { + //updateRotation(fan_medium, getFanSpeed()); + fan_medium.setTransform(msFanMedium); + fan.delete(); + fan_large.setEmptyTransform(); + + } + if(blockEntity.diameter ==3) { + + fan_large.setTransform(msFan); + + fan.delete(); + fan_medium.setEmptyTransform(); + } + + }else { + fan.delete(); + fan_medium.setEmptyTransform(); + fan_large.setEmptyTransform(); + } + ///////////// + PoseStack ms = new PoseStack(); + TransformStack msr = TransformStack.cast(ms); + + msr.translate(getInstancePosition()); + + + if(direction==Direction.NORTH) + msr.translateZ(0.001); + if(direction==Direction.SOUTH) + msr.translateZ(-0.001); + if(direction==Direction.WEST) + msr.translateX(0.001); + if(direction==Direction.EAST) + msr.translateX(-0.001); + if(direction==Direction.UP) + msr.translateY(-0.001); + if(direction==Direction.DOWN) + msr.translateY(0.001); + + if(blockEntity.hasShaft) { + frame.setTransform(ms); + frameClosed.setEmptyTransform(); + + } else { + frameClosed.setTransform(ms); + frame.setEmptyTransform(); + } + PoseStack ms1 = new PoseStack(); + TransformStack msr1 = TransformStack.cast(ms1); + + msr1.translate(getInstancePosition()); + + PoseStack ms2 = new PoseStack(); + TransformStack msr2 = TransformStack.cast(ms2); + + msr2.translate(getInstancePosition()); + + if(direction.getAxis().isHorizontal()){ + msr1.translateY(1); + if(direction == Direction.NORTH) + msr1.translateX(1); + if(direction == Direction.SOUTH) + msr1.translateX(-1); + if(direction == Direction.EAST) + msr1.translateZ(1); + if(direction == Direction.WEST) + msr1.translateZ(-1); + }else { + + msr1.translateZ(1); + msr1.translateX(1); + if(direction!=Direction.DOWN) + msr2.translateZ(1); + msr2.translateX(1); + + + } + + if(blockEntity.diameter ==2){ + chassisMedium.setTransform(ms2); + chassisLarge.setEmptyTransform(); + } + + if(blockEntity.diameter ==3){ + chassisLarge.setTransform(ms1); + chassisMedium.setEmptyTransform(); + } + + + + + + } + + @Override + public void updateLight() { + BlockPos behind = pos.relative(opposite); + + //AABB a = new AABB(pos); + //a.inflate() + //blockEntity.getLevel().getBlockStates(a); + + + shaft.ifPresent(d -> relight(pos, d)); + relight(pos,frame); + relight(pos,frameClosed); + + relight(pos,chassisLarge); + relight(pos,chassisMedium); + + BlockPos inFront = pos.relative(direction); + relight(pos, fan); + relight(pos, fan_medium); + relight(pos, fan_large); + + + + } + + @Override + public void remove() { + shaft.ifPresent(InstanceData::delete); + fan.delete(); + fan_medium.delete(); + fan_large.delete(); + frame.delete(); + frameClosed.delete(); + chassisMedium.delete(); + chassisLarge.delete(); + } +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeRenderer.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeRenderer.java new file mode 100644 index 00000000..b3e71813 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeRenderer.java @@ -0,0 +1,169 @@ +package com.drmangotea.tfmg.blocks.engines.intake; + +import com.drmangotea.tfmg.blocks.machines.metal_processing.blast_furnace.BlastFurnaceOutputBlockEntity; +import com.drmangotea.tfmg.registry.TFMGPartialModels; +import com.jozufozu.flywheel.backend.Backend; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import com.simibubi.create.AllPartialModels; +import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; +import com.simibubi.create.content.kinetics.fan.EncasedFanBlockEntity; +import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; +import com.simibubi.create.foundation.render.CachedBufferer; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import com.simibubi.create.foundation.utility.AnimationTickHolder; +import net.minecraft.client.renderer.LevelRenderer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.core.Direction; +import net.minecraft.util.Mth; + +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING; + +public class AirIntakeRenderer extends KineticBlockEntityRenderer { + + + + public AirIntakeRenderer(BlockEntityRendererProvider.Context context) { + super(context); + } + + + @Override + protected void renderSafe(AirIntakeBlockEntity be, float partialTicks, PoseStack ms, MultiBufferSource buffer, + int light, int overlay) { + if (Backend.canUseInstancing(be.getLevel())) return; + + + Direction direction = be.getBlockState() + .getValue(FACING); + VertexConsumer vb = buffer.getBuffer(RenderType.cutoutMipped()); + + SuperByteBuffer frame; + if (be.hasShaft) { + frame = CachedBufferer.partialFacing(TFMGPartialModels.AIR_INTAKE_FRAME, be.getBlockState(), direction); + } else + frame = CachedBufferer.partialFacing(TFMGPartialModels.AIR_INTAKE_FRAME_CLOSED, be.getBlockState(), direction); + /// + if (direction == Direction.NORTH) + frame.translateZ(0.001); + if (direction == Direction.SOUTH) + frame.translateZ(-0.001); + if (direction == Direction.WEST) + frame.translateX(0.001); + if (direction == Direction.EAST) + frame.translateX(-0.001); + if (direction == Direction.UP) + frame.translateY(-0.001); + if (direction == Direction.DOWN) + frame.translateY(0.001); + + frame.renderInto(ms, vb); + + /// + if (be.diameter == 2) { + SuperByteBuffer chassisMedium = CachedBufferer.partialFacing(TFMGPartialModels.AIR_INTAKE_MEDIUM, be.getBlockState(), direction); + if(direction == Direction.UP) + chassisMedium.translateZ(1); + if(direction.getAxis().isVertical()) + chassisMedium.translateX(1); + + + chassisMedium.renderInto(ms, vb); + } + + if (be.diameter == 3) { + SuperByteBuffer chassisLarge = CachedBufferer.partialFacing(TFMGPartialModels.AIR_INTAKE_LARGE, be.getBlockState(), direction); + + if (direction.getAxis().isHorizontal()) { + chassisLarge.translateY(1); + if (direction == Direction.NORTH) + chassisLarge.translateX(1); + if (direction == Direction.SOUTH) + chassisLarge.translateX(-1); + if (direction == Direction.EAST) + chassisLarge.translateZ(1); + if (direction == Direction.WEST) + chassisLarge.translateZ(-1); + } else { + chassisLarge.translateZ(1); + + chassisLarge.translateX(1); + + + } + + chassisLarge.renderInto(ms, vb); + + } + + + ///// + int lightBehind = LevelRenderer.getLightColor(be.getLevel(), be.getBlockPos().relative(direction.getOpposite())); + int lightInFront = LevelRenderer.getLightColor(be.getLevel(), be.getBlockPos().relative(direction)); + + SuperByteBuffer shaftHalf = + CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, be.getBlockState(), direction.getOpposite()); + + + + + SuperByteBuffer fanInner = + CachedBufferer.partialFacing(AllPartialModels.ENCASED_FAN_INNER, be.getBlockState(), direction.getOpposite()); + + + + if (be.diameter == 2) { + fanInner = + CachedBufferer.partialFacing(TFMGPartialModels.AIR_INTAKE_FAN_MEDIUM, be.getBlockState(), direction.getOpposite()); + } + + if (be.diameter == 3) { + fanInner = + CachedBufferer.partialFacing(TFMGPartialModels.AIR_INTAKE_FAN_LARGE, be.getBlockState(), direction.getOpposite()); + + } + + + if(direction.getAxis().isHorizontal()) { + float x = 0; + float z = 0; + if(direction == Direction.NORTH) + x=1f; + if(direction == Direction.SOUTH) + x=-1f; + if(direction == Direction.WEST) + z=-1f; + if(direction == Direction.EAST) + z=1f; + + if(be.diameter==3) + fanInner.translate(x,1,z); + if(be.diameter==2) + fanInner.translate(x/2,0.5,z/2); + }else { + if(be.diameter==2) + fanInner.translate(0.5,0,0.5); + if(be.diameter==3) + fanInner.translate(1,0,1); + } + + + float time = AnimationTickHolder.getRenderTime(be.getLevel()); + float speed = be.maxShaftSpeed * 2; + if (speed > 0) + speed = Mth.clamp(speed, 80, 64 * 20); + if (speed < 0) + speed = Mth.clamp(speed, -64 * 20, -80); + float angle = (time * speed * 3 / 10f) % 360; + angle = angle / 180f * (float) Math.PI; + + standardKineticRotationTransform(shaftHalf, be, lightBehind).renderInto(ms, vb); + if(!be.isUsedByController) + kineticRotationTransform(fanInner, be, direction.getAxis(), angle, lightInFront).renderInto(ms, vb); + } + + + } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/AbstractEngineTileEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/AbstractEngineTileEntity.java new file mode 100644 index 00000000..bd540fdc --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/AbstractEngineTileEntity.java @@ -0,0 +1,590 @@ +package com.drmangotea.tfmg.blocks.engines.small; + + +import com.drmangotea.tfmg.blocks.engines.small.turbine.TurbineEngineTileEntity; +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.simibubi.create.AllSoundEvents; +import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; +import com.simibubi.create.content.equipment.wrench.IWrenchable; +import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity; +import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; +import com.simibubi.create.foundation.fluid.SmartFluidTank; +import com.simibubi.create.foundation.utility.Lang; +import com.simibubi.create.foundation.utility.LangBuilder; +import net.minecraft.ChatFormatting; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtUtils; +import net.minecraft.network.chat.Component; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.block.DirectionalBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Fluid; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.templates.FluidTank; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Optional; + +import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING; + +public abstract class AbstractEngineTileEntity extends GeneratingKineticBlockEntity implements IHaveGoggleInformation, IWrenchable { + + protected LazyOptional fluidCapability; + protected FluidTank tankInventory; + + + protected int soundTimer=0; + + protected BlockPos lastKnownPos; + + public int fuelConsumption =0; + + public float stressTotal=0; + public float speed=0; + public float stressBase=0; + + public int efficiency=1; + public final int idealSpeed=12; + + private int consumptionTimer=0; + + + + + private static final int SYNC_RATE = 8; + protected int syncCooldown; + protected boolean queuedSync; + +// +int signal; +boolean signalChanged; +// + + // protected ScrollValueBehaviour generatedSpeed; + + public AbstractEngineTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + tankInventory = createInventory(); + + fluidCapability = LazyOptional.of(() -> tankInventory); + + signal = 0; + setLazyTickRate(40); + refreshCapability(); + } + + @Override + public void addBehaviours(List behaviours) { + } + + @Override + public void initialize() { + super.initialize(); + sendData(); + if (!hasSource() || getGeneratedSpeed() > getTheoreticalSpeed()) + updateGeneratedRotation(); + } + + @Override + public float getGeneratedSpeed() { + + + + if(!hasBackPart()) + return 0; + if(isExhaustTankFull()) + return 0; + + + + + if(!level.isClientSide){ + + + calculateEfficiency(); + fuelConsumption = (int)((speed/(efficiency/10)/6)+1); + if(fuelConsumption<1) + fuelConsumption=0; + if(!tankInventory.isEmpty()) { + + if(consumptionTimer>=5) { + if(signal!=0) + tankInventory.drain(fuelConsumption, IFluidHandler.FluidAction.EXECUTE); + consumptionTimer=0; + } + consumptionTimer++; + + + + + return convertToDirection(signal * signal, getBlockState().getValue(FACING)); + }} + return 0; + + + } + + public boolean isExhaustTankFull(){ + if(!hasBackPart()) + return false; + EngineBackBlockEntity back = (EngineBackBlockEntity) level.getBlockEntity(this.getBlockPos().relative(this.getBlockState().getValue(FACING).getOpposite())); + return back.tankInventory.getFluidAmount()+7>=500; + + } + + + public void calculateEfficiency(){ + + + if(signal==0||tankInventory.isEmpty()) { + efficiency = 0; + return; + } + efficiency=100; + + if(signal>idealSpeed){ + efficiency=(100-(signal-idealSpeed)*5); + } + + if(signal100) + efficiency=100; + + } + + public boolean hasBackPart(){ + BlockPos wantedLocation=this.getBlockPos(); + Direction direction = this.getBlockState().getValue(DirectionalBlock.FACING); + + + if(direction == Direction.UP) + wantedLocation=this.getBlockPos().below(); + if(direction == Direction.DOWN) + wantedLocation=this.getBlockPos().above(); + if(direction == Direction.NORTH) + wantedLocation=this.getBlockPos().south(); + if(direction == Direction.SOUTH) + wantedLocation=this.getBlockPos().north(); + if(direction == Direction.WEST) + wantedLocation=this.getBlockPos().east(); + if(direction == Direction.EAST) + wantedLocation=this.getBlockPos().west(); + + + + if(!level.getBlockState(wantedLocation).is(TFMGBlocks.GASOLINE_ENGINE_BACK.get())) { + return false; + }else { + if ( level.getBlockState(wantedLocation).getValue(DirectionalBlock.FACING) != direction) + return false; + } + return true; + } + + @Override + public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { + // boolean added = super.addToGoggleTooltip(tooltip, isPlayerSneaking); + // if (!IRotate.StressImpact.isEnabled()) + // return added; + // + Lang.translate("goggles.engine_stats") + .forGoggles(tooltip); + if(!hasBackPart()){ + Lang.translate("goggles.engine.backpartmissing") + .style(ChatFormatting.DARK_RED) + .space() + .forGoggles(tooltip); + return true; + } + + + + stressBase = calculateAddedStressCapacity(); + // if (Mth.equal(stressBase, 0)) + // return added; + + + Lang.translate("tooltip.capacityProvided") + .style(ChatFormatting.GRAY) + .space() + .forGoggles(tooltip); + + speed = getTheoreticalSpeed(); + if (speed != getGeneratedSpeed() && speed != 0) + // stressBase *= getGeneratedSpeed() / speed; + speed = Math.abs(speed); + + stressTotal = stressBase * speed; + + Lang.number(stressTotal) + .translate("generic.unit.stress") + .style(ChatFormatting.DARK_AQUA) + + .space() + .add(Lang.translate("gui.goggles.at_current_speed") + .style(ChatFormatting.DARK_GRAY)) + + .forGoggles(tooltip, 1); + + Lang.translate("goggles.engine_redstone_input") + .style(ChatFormatting.GRAY) + .forGoggles(tooltip); + Lang.translate("tooltip.engine_analog_strength", this.signal) + .style(ChatFormatting.DARK_AQUA) + .forGoggles(tooltip,1); + +///// + + Lang.translate("goggles.engine.efficiency") + .style(ChatFormatting.GRAY) + .forGoggles(tooltip); + Lang.translate("goggles.get_engine_efficiency", this.efficiency) + .style(ChatFormatting.DARK_AQUA) + .add(Lang.translate("goggles.units.percent")) + .forGoggles(tooltip,1); + + +//////////////////////////////////////// + LazyOptional handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY); + Optional resolve = handler.resolve(); + if (!resolve.isPresent()) + return false; + + IFluidHandler tank = resolve.get(); + if (tank.getTanks() == 0) + return false; + + LangBuilder mb = Lang.translate("generic.unit.millibuckets"); + Lang.translate("goggles.fuel_container") + .style(ChatFormatting.GRAY) + .forGoggles(tooltip); + + + boolean isEmpty = true; + for (int i = 0; i < tank.getTanks(); i++) { + FluidStack fluidStack = tank.getFluidInTank(i); + if (fluidStack.isEmpty()) + continue; + + Lang.fluidName(fluidStack) + .style(ChatFormatting.GRAY) + .forGoggles(tooltip, 1); + + Lang.builder() + .add(Lang.number(fluidStack.getAmount()) + .add(mb) + .style(ChatFormatting.DARK_AQUA)) + .text(ChatFormatting.GRAY, " / ") + .add(Lang.number(tank.getTankCapacity(i)) + .add(mb) + .style(ChatFormatting.DARK_GRAY)) + .forGoggles(tooltip, 1); + + isEmpty = false; + } + + if (tank.getTanks() > 1) { + if (isEmpty) + tooltip.remove(tooltip.size() - 1); + return true; + } + + if (!isEmpty) + return true; + + Lang.translate("gui.goggles.fluid_container.capacity") + .add(Lang.number(tank.getTankCapacity(0)) + .add(mb) + .style(ChatFormatting.DARK_AQUA)) + .style(ChatFormatting.DARK_GRAY) + .forGoggles(tooltip, 1); + + +return true; + } + + @Override + public InteractionResult onWrenched(BlockState state, UseOnContext context) { + + + + + // this.getBlockState().setValue(EngineBlock.BACKPART,true); + + return InteractionResult.SUCCESS; + } + + +///////////////////////////////////////////// +@Override +public void write(CompoundTag compound, boolean clientPacket) { + compound.putInt("Signal", signal); + if (lastKnownPos != null) + compound.put("LastKnownPos", NbtUtils.writeBlockPos(lastKnownPos)); + + + compound.put("TankContent", tankInventory.writeToNBT(new CompoundTag())); + + + super.write(compound, clientPacket); +} + + @Override + protected void read(CompoundTag compound, boolean clientPacket) { + + + + lastKnownPos = null; + + if (compound.contains("LastKnownPos")) + lastKnownPos = NbtUtils.readBlockPos(compound.getCompound("LastKnownPos")); + + + + + tankInventory.readFromNBT(compound.getCompound("TankContent")); + if (tankInventory.getSpace() < 0) + tankInventory.drain(-tankInventory.getSpace(), IFluidHandler.FluidAction.EXECUTE); + + + + + signal = compound.getInt("Signal"); + super.read(compound, clientPacket); + } + + public float getModifier() { + return getModifierForSignal(signal); + } + + public void neighbourChanged() { + if (!hasLevel()) + return; + int power = level.getBestNeighborSignal(worldPosition); + if (power != signal) + signalChanged = true; + } + + @Override + public void lazyTick() { + super.lazyTick(); + neighbourChanged(); + } + + + @Override + public void tick() { + super.tick(); + + /// + // if(signal!=0&&hasBackPart()&&tankInventory.getFluidAmount()!=0&&!overStressed&&isExhaustTankFull()) { + + + soundTimer++; + + // if(!isExhaustTankFull()) { + if (soundTimer >= ((16-signal)/2)+1) { + if(signal!=0&& + hasBackPart()&& + tankInventory.getFluidAmount()!=0 && + !overStressed + + + ){ + EngineBackBlockEntity back = (EngineBackBlockEntity) level.getBlockEntity(this.getBlockPos().relative(this.getBlockState().getValue(FACING).getOpposite())); + if(back.tankInventory.getFluidAmount()+4<=500){ + + // if(this.getGeneratedSpeed()!=0) { + if (level.isClientSide) + makeSound(); + } + } + } + // } + + + /// + + if(!hasBackPart()) + return; + if(!isExhaustTankFull()) { + if(tankInventory.getFluidAmount()!=0) { + + EngineBackBlockEntity back = (EngineBackBlockEntity) level.getBlockEntity(this.getBlockPos().relative(this.getBlockState().getValue(FACING).getOpposite())); + if(back!=null) { + if (efficiency != 0 && signal != 0 && !overStressed && !isExhaustTankFull()) + back.tankInventory.setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(), back.tankInventory.getFluidAmount() + 6)); + } + } + } + updateGeneratedRotation(); + calculateEfficiency(); + + //if(signalChanged) + + + stressBase = calculateAddedStressCapacity(); + speed = getTheoreticalSpeed(); + if (speed != getGeneratedSpeed() && speed != 0) + stressBase *= getGeneratedSpeed() / speed; + speed = Math.abs(speed); + + stressTotal = stressBase * speed; + // if (level.isClientSide) + // return; + if (signalChanged) { + signalChanged = false; + analogSignalChanged(level.getBestNeighborSignal(worldPosition)); + } + if (syncCooldown > 0) { + syncCooldown--; + if (syncCooldown == 0 && queuedSync) + sendData(); + } + + if (lastKnownPos == null) + lastKnownPos = getBlockPos(); + else if (!lastKnownPos.equals(worldPosition) && worldPosition != null) { + onPositionChanged(); + } + + } + + @OnlyIn(Dist.CLIENT) + private void makeSound(){ + soundTimer=0; + if(this instanceof TurbineEngineTileEntity){ + AllSoundEvents.WHISTLE_CHIFF.playAt(level, worldPosition, 0.03f, .2f, false); + } + //else + + // CISoundEvents.DIESEL_ENGINE_SOUNDS.playAt(level, worldPosition, 0.9f, .1f, false); + + + } + + protected void analogSignalChanged(int newSignal) { + //removeSource(); + signal = newSignal; + } + + protected float getModifierForSignal(int newPower) { + if (newPower == 0) + return 1; + return 1 + ((newPower + 1) / 16f); + } + ///////////////////// + + protected SmartFluidTank createInventory() { + return new SmartFluidTank(1000, this::onFluidStackChanged){ + @Override + public boolean isFluidValid(FluidStack stack) { + return stack.getFluid().isSame(validFuel()); + } + }; + } + + + + + + + + + + + private void onPositionChanged() { + lastKnownPos = worldPosition; + } + + protected void onFluidStackChanged(FluidStack newFluidStack) {} + + + + + + @Override + public void sendData() { + if (syncCooldown > 0) { + queuedSync = true; + return; + } + super.sendData(); + queuedSync = false; + syncCooldown = SYNC_RATE; + } + + + + + + private void refreshCapability() { + LazyOptional oldCap = fluidCapability; + fluidCapability = LazyOptional.of(() -> handlerForCapability()); + oldCap.invalidate(); + } + + private IFluidHandler handlerForCapability() { + return tankInventory; + } + + + + + + + + + + + public float getFillState() { + return (float) tankInventory.getFluidAmount() / tankInventory.getCapacity(); + } + + + + @Nonnull + @Override + public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { + if (!fluidCapability.isPresent()) + refreshCapability(); + if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + return fluidCapability.cast(); + return super.getCapability(cap, side); + } + + @Override + public void invalidate() { + super.invalidate(); + } + + + + public IFluidTank getTankInventory() { + return tankInventory; + } + + public Fluid validFuel(){ + return TFMGFluids.GASOLINE.get(); + }; + +} + diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackBlockEntity.java new file mode 100644 index 00000000..c24c2206 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackBlockEntity.java @@ -0,0 +1,260 @@ +package com.drmangotea.tfmg.blocks.engines.small; + +import com.drmangotea.createindustry.content.oil.exhaust.ExhaustBlock; +import com.drmangotea.createindustry.registry.CIFluids; +import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; +import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; +import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; +import com.simibubi.create.foundation.fluid.SmartFluidTank; +import com.simibubi.create.foundation.utility.Lang; +import com.simibubi.create.foundation.utility.LangBuilder; +import net.minecraft.ChatFormatting; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +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.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.templates.FluidTank; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Optional; + + public class EngineBackBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { + + + + public int consumptionTimer=0; + + protected LazyOptional fluidCapability; + public FluidTank tankInventory; + + + + private static final int SYNC_RATE = 8; + protected int syncCooldown; + protected boolean queuedSync; + + + + public EngineBackBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + tankInventory = createInventory(); + fluidCapability = LazyOptional.of(() -> tankInventory); + + refreshCapability(); + } + + + @Override + public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { + + LangBuilder mb = Lang.translate("generic.unit.millibuckets"); + Lang.translate("goggles.engine_exhaust_stats") + .forGoggles(tooltip); + + + ///////// + LazyOptional handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY); + Optional resolve = handler.resolve(); + if (!resolve.isPresent()) + return false; + + IFluidHandler tank = resolve.get(); + if (tank.getTanks() == 0) + return false; + + Lang.translate("goggles.pumpjack_fluid_storage") + .style(ChatFormatting.GRAY) + .forGoggles(tooltip); + + + boolean isEmpty = true; + for (int i = 0; i < tank.getTanks(); i++) { + FluidStack fluidStack = tank.getFluidInTank(i); + if (fluidStack.isEmpty()) + continue; + + Lang.fluidName(fluidStack) + .style(ChatFormatting.GRAY) + .forGoggles(tooltip, 1); + + Lang.builder() + .add(Lang.number(fluidStack.getAmount()) + .add(mb) + .style(ChatFormatting.GOLD)) + .text(ChatFormatting.GRAY, " / ") + .add(Lang.number(tank.getTankCapacity(i)) + .add(mb) + .style(ChatFormatting.DARK_GRAY)) + .forGoggles(tooltip, 1); + + isEmpty = false; + } + + if (tank.getTanks() > 1) { + if (isEmpty) + tooltip.remove(tooltip.size() - 1); + return true; + } + + if (!isEmpty) + return true; + + Lang.translate("gui.goggles.fluid_container.capacity") + .add(Lang.number(tank.getTankCapacity(0)) + .add(mb) + .style(ChatFormatting.GOLD)) + .style(ChatFormatting.DARK_GRAY) + .forGoggles(tooltip, 1); + + + return true; + + + + } + + + + + + + protected SmartFluidTank createInventory() { + return new SmartFluidTank(1000, this::onFluidStackChanged){ + @Override + public boolean isFluidValid(FluidStack stack) { + return stack.getFluid().isSame(CIFluids.CARBON_DIOXIDE.getSource()); + } + }; + } + + protected void onFluidStackChanged(FluidStack newFluidStack) { + sendData(); + } + public BlockEntity getFrontPart(){ + Direction direction = this.getBlockState().getValue(ExhaustBlock.FACING); + + if(direction == Direction.UP) + return level.getBlockEntity(this.getBlockPos().above()); + if(direction == Direction.DOWN) + return level.getBlockEntity(this.getBlockPos().below()); + if(direction == Direction.NORTH) + return level.getBlockEntity(this.getBlockPos().north()); + if(direction == Direction.SOUTH) + return level.getBlockEntity(this.getBlockPos().south()); + if(direction == Direction.WEST) + return level.getBlockEntity(this.getBlockPos().west()); + if(direction == Direction.EAST) + return level.getBlockEntity(this.getBlockPos().east()); + + return this; + } + @Override + public void tick() { + super.tick(); + if (syncCooldown > 0) { + syncCooldown--; + if (syncCooldown == 0 && queuedSync) + sendData(); + } + + + } + + + + @Override + public void initialize() { + super.initialize(); + sendData(); + if (level.isClientSide) + invalidateRenderBoundingBox(); + } + + + + @Override + public void sendData() { + if (syncCooldown > 0) { + queuedSync = true; + return; + } + super.sendData(); + queuedSync = false; + syncCooldown = SYNC_RATE; + } + + + private void refreshCapability() { + LazyOptional oldCap = fluidCapability; + fluidCapability = LazyOptional.of(() -> handlerForCapability()); + oldCap.invalidate(); + } + + private IFluidHandler handlerForCapability() { + + return tankInventory; + } + + + + + @Override + protected void read(CompoundTag compound, boolean clientPacket) { + super.read(compound, clientPacket); + + tankInventory.setCapacity(500); + tankInventory.readFromNBT(compound.getCompound("TankContent")); + } + + + + + + @Override + public void write(CompoundTag compound, boolean clientPacket) { + + compound.put("TankContent", tankInventory.writeToNBT(new CompoundTag())); + super.write(compound, clientPacket); + + + } + + @Nonnull + @Override + public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { + if (!fluidCapability.isPresent()) + refreshCapability(); + if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + return fluidCapability.cast(); + return super.getCapability(cap, side); + } + + + + @Override + public void addBehaviours(List behaviours) { + + } + + public IFluidTank getTankInventory() { + return tankInventory; + } + + + + + + +} + diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackPartBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackPartBlock.java new file mode 100644 index 00000000..8d7bef4f --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackPartBlock.java @@ -0,0 +1,48 @@ +package com.drmangotea.tfmg.blocks.engines.small; + + + +import com.drmangotea.tfmg.registry.TFMGShapes; +import com.simibubi.create.content.equipment.wrench.IWrenchable; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.DirectionalBlock; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; + +abstract public class EngineBackPartBlock extends DirectionalBlock implements IWrenchable { + public EngineBackPartBlock(Properties p_52591_) { + super(p_52591_); + this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.SOUTH)); + } + protected void createBlockStateDefinition(StateDefinition.Builder p_55125_) { + p_55125_.add(FACING); + } + @Override + public VoxelShape getShape(BlockState pState, BlockGetter worldIn, BlockPos pos, CollisionContext context) { + + if(pState.getValue(FACING).getAxis()== Direction.Axis.Y) { + return TFMGShapes.ENGINE_BACK_VERTICAL.get(pState.getValue(FACING)); + }else + return TFMGShapes.ENGINE_BACK.get(pState.getValue(FACING)); + } + public BlockState rotate(BlockState p_55115_, Rotation p_55116_) { + return p_55115_.setValue(FACING, p_55116_.rotate(p_55115_.getValue(FACING))); + } + + public BlockState mirror(BlockState p_55112_, Mirror p_55113_) { + return p_55112_.rotate(p_55113_.getRotation(p_55112_.getValue(FACING))); + } + public BlockState getStateForPlacement(BlockPlaceContext p_55087_) { + return this.defaultBlockState().setValue(FACING, p_55087_.getNearestLookingDirection().getOpposite().getOpposite()); + } + + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackRenderer.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackRenderer.java new file mode 100644 index 00000000..1e512333 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBackRenderer.java @@ -0,0 +1,18 @@ +package com.drmangotea.tfmg.blocks.engines.small; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; + +public class EngineBackRenderer extends SafeBlockEntityRenderer { + + public EngineBackRenderer(BlockEntityRendererProvider.Context context) {} + + + @Override + protected void renderSafe(EngineBackBlockEntity te, float partialTicks, PoseStack ms, MultiBufferSource bufferSource, int light, int overlay) { + + } +} + diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBlock.java new file mode 100644 index 00000000..93561cf4 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/EngineBlock.java @@ -0,0 +1,79 @@ +package com.drmangotea.tfmg.blocks.engines.small; + + +import com.drmangotea.createindustry.registry.CIShapes; +import com.simibubi.create.content.kinetics.base.DirectionalKineticBlock; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.Direction.Axis; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.pathfinder.PathComputationType; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; + +abstract public class EngineBlock extends DirectionalKineticBlock { + + + public EngineBlock(Properties properties) { + super(properties); + + + } + + +/* + @Override + public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) { + return AllShapes.MOTOR_BLOCK.get(state.getValue(FACING)); + } + + */ @Override +public VoxelShape getShape(BlockState pState, BlockGetter worldIn, BlockPos pos, CollisionContext context) { + + if(pState.getValue(FACING).getAxis()==Axis.Y) { + return CIShapes.ENGINE_VERTICAL.get(pState.getValue(FACING)); + }else + return CIShapes.ENGINE.get(pState.getValue(FACING)); +} + + + @Override + public BlockState getStateForPlacement(BlockPlaceContext context) { + Direction preferred = getPreferredFacing(context); + if ((context.getPlayer() != null && context.getPlayer() + .isShiftKeyDown()) || preferred == null) + return super.getStateForPlacement(context); + return defaultBlockState() + .setValue(FACING, preferred) + //.setValue(BACK_PART,false) + ; + } + + // IRotate: + + @Override + public boolean hasShaftTowards(LevelReader world, BlockPos pos, BlockState state, Direction face) { + return face == state.getValue(FACING); + } + + @Override + public Axis getRotationAxis(BlockState state) { + return state.getValue(FACING) + .getAxis(); + } + + @Override + public boolean hideStressImpact() { + return true; + } + + @Override + public boolean isPathfindable(BlockState state, BlockGetter reader, BlockPos pos, PathComputationType type) { + return false; + } + + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/UniversalEngineRenderer.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/UniversalEngineRenderer.java new file mode 100644 index 00000000..45688ed8 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/UniversalEngineRenderer.java @@ -0,0 +1,21 @@ +package com.drmangotea.tfmg.blocks.engines.small; + +import com.simibubi.create.AllPartialModels; +import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; +import com.simibubi.create.foundation.render.CachedBufferer; +import com.simibubi.create.foundation.render.SuperByteBuffer; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.world.level.block.state.BlockState; + +public class UniversalEngineRenderer extends KineticBlockEntityRenderer { + + public UniversalEngineRenderer(BlockEntityRendererProvider.Context context) { + super(context); + } + + @Override + protected SuperByteBuffer getRotatedModel(AbstractEngineTileEntity be, BlockState state) { + return CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, state); + } + +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBackBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBackBlock.java new file mode 100644 index 00000000..666a9fef --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBackBlock.java @@ -0,0 +1,23 @@ +package com.drmangotea.tfmg.blocks.engines.small.gasoline; + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBackPartBlock; +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public class GasolineEngineBackBlock extends EngineBackPartBlock implements IBE { + public GasolineEngineBackBlock(Properties properties) { + super(properties); + + } + @Override + public Class getBlockEntityClass() { + return GasolineEngineBackTileEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.GASOLINE_ENGINE_BACK.get(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBackTileEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBackTileEntity.java new file mode 100644 index 00000000..a917fd14 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBackTileEntity.java @@ -0,0 +1,18 @@ +package com.drmangotea.tfmg.blocks.engines.small.gasoline; + + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBackBlockEntity; +import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +public class GasolineEngineBackTileEntity extends EngineBackBlockEntity implements IHaveGoggleInformation { + + + public GasolineEngineBackTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } +} + diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBlock.java new file mode 100644 index 00000000..627800c4 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineBlock.java @@ -0,0 +1,25 @@ +package com.drmangotea.tfmg.blocks.engines.small.gasoline; + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBlock; +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public class GasolineEngineBlock extends EngineBlock implements IBE { + public GasolineEngineBlock(Properties properties) { + super(properties); + + } + + + @Override + public Class getBlockEntityClass() { + return GasolineEngineTileEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.GASOLINE_ENGINE.get(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineGenerator.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineGenerator.java new file mode 100644 index 00000000..c0b80203 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineGenerator.java @@ -0,0 +1,38 @@ +package com.drmangotea.tfmg.blocks.engines.small.gasoline; + +import com.drmangotea.createindustry.content.blocks.engines.EngineBlock; +import com.simibubi.create.foundation.data.AssetLookup; +import com.simibubi.create.foundation.data.SpecialBlockStateGen; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.client.model.generators.ModelFile; + +; + +public class GasolineEngineGenerator extends SpecialBlockStateGen { + + @Override + protected int getXRotation(BlockState state) { + return state.getValue(EngineBlock.FACING) == Direction.DOWN ? 180 : 0; + } + + @Override + protected int getYRotation(BlockState state) { + return state.getValue(EngineBlock.FACING) + .getAxis() + .isVertical() ? 0 : horizontalAngle(state.getValue(EngineBlock.FACING)); + } + + @Override + public ModelFile getModel(DataGenContext ctx, RegistrateBlockstateProvider prov, + BlockState state) { + return state.getValue(EngineBlock.FACING) + .getAxis() + .isVertical() ? AssetLookup.partialBaseModel(ctx, prov, "vertical") + : AssetLookup.partialBaseModel(ctx, prov); + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineTileEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineTileEntity.java new file mode 100644 index 00000000..a0ddcaa4 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/gasoline/GasolineEngineTileEntity.java @@ -0,0 +1,23 @@ +package com.drmangotea.tfmg.blocks.engines.small.gasoline; + + +import com.drmangotea.tfmg.blocks.engines.small.AbstractEngineTileEntity; +import com.drmangotea.tfmg.registry.TFMGFluids; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Fluid; + +public class GasolineEngineTileEntity extends AbstractEngineTileEntity { + + + public GasolineEngineTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + + } + + @Override + public Fluid validFuel() { + return TFMGFluids.GASOLINE.getSource(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBackBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBackBlock.java new file mode 100644 index 00000000..7fbf4d43 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBackBlock.java @@ -0,0 +1,23 @@ +package com.drmangotea.tfmg.blocks.engines.small.lpg; + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBackPartBlock; +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public class LPGEngineBackBlock extends EngineBackPartBlock implements IBE { + public LPGEngineBackBlock(Properties properties) { + super(properties); + + } + @Override + public Class getBlockEntityClass() { + return LPGEngineBackTileEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.LPG_ENGINE_BACK.get(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBackTileEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBackTileEntity.java new file mode 100644 index 00000000..5476a977 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBackTileEntity.java @@ -0,0 +1,31 @@ +package com.drmangotea.tfmg.blocks.engines.small.lpg; + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBackBlockEntity; +import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +public class LPGEngineBackTileEntity extends EngineBackBlockEntity implements IHaveGoggleInformation { + + + public LPGEngineBackTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + + @Override + public void tick() { + super.tick(); + if (syncCooldown > 0) { + syncCooldown--; + if (syncCooldown == 0 && queuedSync) + sendData(); + } + + + + } +} + diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBlock.java new file mode 100644 index 00000000..f47fd27e --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineBlock.java @@ -0,0 +1,23 @@ +package com.drmangotea.tfmg.blocks.engines.small.lpg; + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBlock; +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public class LPGEngineBlock extends EngineBlock implements IBE { + public LPGEngineBlock(Properties properties) { + super(properties); + + } + @Override + public Class getBlockEntityClass() { + return LPGEngineTileEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.LPG_ENGINE.get(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineTileEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineTileEntity.java new file mode 100644 index 00000000..4dac1000 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/lpg/LPGEngineTileEntity.java @@ -0,0 +1,54 @@ +package com.drmangotea.tfmg.blocks.engines.small.lpg; + + +import com.drmangotea.tfmg.blocks.engines.small.AbstractEngineTileEntity; +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.DirectionalBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Fluid; + +public class LPGEngineTileEntity extends AbstractEngineTileEntity { + + + public LPGEngineTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + + } + @Override + public boolean hasBackPart(){ + BlockPos wantedLocation=this.getBlockPos(); + Direction direction = this.getBlockState().getValue(DirectionalBlock.FACING); + + + if(direction == Direction.UP) + wantedLocation=this.getBlockPos().below(); + if(direction == Direction.DOWN) + wantedLocation=this.getBlockPos().above(); + if(direction == Direction.NORTH) + wantedLocation=this.getBlockPos().south(); + if(direction == Direction.SOUTH) + wantedLocation=this.getBlockPos().north(); + if(direction == Direction.WEST) + wantedLocation=this.getBlockPos().east(); + if(direction == Direction.EAST) + wantedLocation=this.getBlockPos().west(); + + + + if(!level.getBlockState(wantedLocation).is(TFMGBlocks.LPG_ENGINE_BACK.get())) { + return false; + }else { + if ( level.getBlockState(wantedLocation).getValue(DirectionalBlock.FACING) != direction) + return false; + } + return true; + } + @Override + public Fluid validFuel() { + return TFMGFluids.LPG.getSource(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBackBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBackBlock.java new file mode 100644 index 00000000..9cbb3d5c --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBackBlock.java @@ -0,0 +1,23 @@ +package com.drmangotea.tfmg.blocks.engines.small.turbine; + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBackPartBlock; +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public class TurbineEngineBackBlock extends EngineBackPartBlock implements IBE { + public TurbineEngineBackBlock(Properties properties) { + super(properties); + + } + @Override + public Class getBlockEntityClass() { + return TurbineEngineBackTileEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.TURBINE_ENGINE_BACK.get(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBackTileEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBackTileEntity.java new file mode 100644 index 00000000..b241260b --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBackTileEntity.java @@ -0,0 +1,31 @@ +package com.drmangotea.tfmg.blocks.engines.small.turbine; + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBackBlockEntity; +import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +public class TurbineEngineBackTileEntity extends EngineBackBlockEntity implements IHaveGoggleInformation { + + + public TurbineEngineBackTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + @Override + public void tick() { + super.tick(); + if (syncCooldown > 0) { + syncCooldown--; + if (syncCooldown == 0 && queuedSync) + sendData(); + } + + + + + + } +} + diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBlock.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBlock.java new file mode 100644 index 00000000..3140a23e --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineBlock.java @@ -0,0 +1,23 @@ +package com.drmangotea.tfmg.blocks.engines.small.turbine; + + +import com.drmangotea.tfmg.blocks.engines.small.EngineBlock; +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public class TurbineEngineBlock extends EngineBlock implements IBE { + public TurbineEngineBlock(Properties properties) { + super(properties); + + } + @Override + public Class getBlockEntityClass() { + return TurbineEngineTileEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.TURBINE_ENGINE.get(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineTileEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineTileEntity.java new file mode 100644 index 00000000..bb5dc724 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/turbine/TurbineEngineTileEntity.java @@ -0,0 +1,55 @@ +package com.drmangotea.tfmg.blocks.engines.small.turbine; + + +import com.drmangotea.tfmg.blocks.engines.small.AbstractEngineTileEntity; +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.DirectionalBlock; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Fluid; + +public class TurbineEngineTileEntity extends AbstractEngineTileEntity { + + + public TurbineEngineTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + + } + + @Override + public boolean hasBackPart(){ + BlockPos wantedLocation=this.getBlockPos(); + Direction direction = this.getBlockState().getValue(DirectionalBlock.FACING); + + + if(direction == Direction.UP) + wantedLocation=this.getBlockPos().below(); + if(direction == Direction.DOWN) + wantedLocation=this.getBlockPos().above(); + if(direction == Direction.NORTH) + wantedLocation=this.getBlockPos().south(); + if(direction == Direction.SOUTH) + wantedLocation=this.getBlockPos().north(); + if(direction == Direction.WEST) + wantedLocation=this.getBlockPos().east(); + if(direction == Direction.EAST) + wantedLocation=this.getBlockPos().west(); + + + + if(!level.getBlockState(wantedLocation).is(TFMGBlocks.TURBINE_ENGINE_BACK.get())) { + return false; + }else { + if ( level.getBlockState(wantedLocation).getValue(DirectionalBlock.FACING) != direction) + return false; + } + return true; + } + @Override + public Fluid validFuel() { + return TFMGFluids.KEROSENE.getSource(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ChemicalColor.java b/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ChemicalColor.java deleted file mode 100644 index 724a6586..00000000 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ChemicalColor.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades; - -public enum ChemicalColor { - BASE, - GREEN, - BLUE -} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java index d51453d5..3c49a98b 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java @@ -260,41 +260,7 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); } - // if (timer<=0) { - // posToSpawn = this.getBlockPos().relative(outputFacing.getOpposite()).above(); - // posToSpawn1 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above(); - // posToSpawn2 = this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getClockWise()); - // posToSpawn3 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above().relative(outputFacing.getClockWise()); - // posToSpawn4 = this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getCounterClockWise()); - // posToSpawn5 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above().relative(outputFacing.getCounterClockWise()); - // if(level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn, Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn1).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn1, Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn2).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn2, Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn3).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn3, Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn4).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn4, Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn5).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn5, Blocks.AIR.defaultBlockState(),3); -// - // if(level.getBlockState(posToSpawn.above()).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn.above(), Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn1.above()).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn1.above(), Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn2.above()).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn2.above(), Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn3.above()).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn3.above(), Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn4.above()).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn4.above(), Blocks.AIR.defaultBlockState(),3); - // if(level.getBlockState(posToSpawn5.above()).is(TFMGBlocks.MOLTEN_METAL.get())) - // level.setBlock(posToSpawn5.above(), Blocks.AIR.defaultBlockState(),3); - - // } } @Override protected AABB createRenderBoundingBox() { @@ -310,13 +276,6 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem if (level.isClientSide) return; - // RecipeWrapper inventoryIn = new RecipeWrapper(inputInventory); - // if (recipe == null || !recipe.matches(inventoryIn, level)) { - // Optional recipe = TFMGRecipeTypes.INDUSTRIAL_BLASTING.find(inventoryIn, level); - // if (!recipe.isPresent()) - // return; - // this.recipe = recipe.get(); - // } tank1.getPrimaryHandler().setFluid(new FluidStack(recipe.getFluidResults().get(0).getFluid(), tank1.getPrimaryHandler().getFluidAmount()+recipe.getFluidResults().get(0).getAmount())); tank2.getPrimaryHandler().setFluid(new FluidStack(recipe.getFluidResults().get(1).getFluid(), tank2.getPrimaryHandler().getFluidAmount()+recipe.getFluidResults().get(1).getAmount())); diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombBlock.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombBlock.java similarity index 98% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombBlock.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombBlock.java index 7121c499..7b0e4a9c 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombBlock.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombBlock.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.napalm; +package com.drmangotea.tfmg.items.gadgets.explosives.napalm; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombEntity.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombEntity.java similarity index 98% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombEntity.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombEntity.java index f3d762aa..d3e2d7f3 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombEntity.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombEntity.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.napalm; +package com.drmangotea.tfmg.items.gadgets.explosives.napalm; import com.drmangotea.tfmg.base.spark.Spark; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombRenderer.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombRenderer.java similarity index 97% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombRenderer.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombRenderer.java index cda10b1a..60398cac 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/napalm/NapalmBombRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/napalm/NapalmBombRenderer.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.napalm; +package com.drmangotea.tfmg.items.gadgets.explosives.napalm; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ChemicalColor.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ChemicalColor.java new file mode 100644 index 00000000..1a72e82c --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ChemicalColor.java @@ -0,0 +1,7 @@ +package com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades; + +public enum ChemicalColor { + BASE, + GREEN, + BLUE +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenade.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenade.java similarity index 98% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenade.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenade.java index 48ff8f04..fb21fe56 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenade.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenade.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades; +package com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades; import com.drmangotea.tfmg.base.spark.BlueSpark; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenadeItem.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenadeItem.java similarity index 96% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenadeItem.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenadeItem.java index 81ed39c8..627ff570 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenadeItem.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenadeItem.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades; +package com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades; import com.drmangotea.tfmg.registry.TFMGEntityTypes; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenadeRenderer.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenadeRenderer.java similarity index 97% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenadeRenderer.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenadeRenderer.java index d72f2c61..407f2655 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/ThermiteGrenadeRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/ThermiteGrenadeRenderer.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades; +package com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades; import com.drmangotea.tfmg.registry.TFMGItems; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/BlueFireBlock.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/BlueFireBlock.java similarity index 99% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/BlueFireBlock.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/BlueFireBlock.java index a3d6fbb8..bf2d833d 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/BlueFireBlock.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/BlueFireBlock.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.fire; +package com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.fire; import com.google.common.collect.ImmutableMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/GreenFireBlock.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/GreenFireBlock.java similarity index 99% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/GreenFireBlock.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/GreenFireBlock.java index 3e6b820c..a62111dd 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/GreenFireBlock.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/GreenFireBlock.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.fire; +package com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.fire; import com.google.common.collect.ImmutableMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/TFMGColoredFires.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/TFMGColoredFires.java similarity index 94% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/TFMGColoredFires.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/TFMGColoredFires.java index 674de4ef..d518de3c 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/explosives/thermite_grenades/fire/TFMGColoredFires.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/explosives/thermite_grenades/fire/TFMGColoredFires.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.fire; +package com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.fire; import com.drmangotea.tfmg.CreateTFMG; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonItem.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonItem.java similarity index 99% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonItem.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonItem.java index f9e3e3b8..9cc71b4b 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonItem.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonItem.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.quad_potato_cannon; +package com.drmangotea.tfmg.items.gadgets.quad_potato_cannon; import com.drmangotea.tfmg.CreateTFMGClient; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonItemRenderer.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonItemRenderer.java similarity index 97% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonItemRenderer.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonItemRenderer.java index 8dc68cd3..4807b2a0 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonItemRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonItemRenderer.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.quad_potato_cannon; +package com.drmangotea.tfmg.items.gadgets.quad_potato_cannon; import com.drmangotea.tfmg.CreateTFMGClient; diff --git a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonRenderHandler.java b/src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonRenderHandler.java similarity index 97% rename from src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonRenderHandler.java rename to src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonRenderHandler.java index 01a88b3f..d49ddaf1 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/gadgets/quad_potato_cannon/QuadPotatoCannonRenderHandler.java +++ b/src/main/java/com/drmangotea/tfmg/items/gadgets/quad_potato_cannon/QuadPotatoCannonRenderHandler.java @@ -1,4 +1,4 @@ -package com.drmangotea.tfmg.blocks.gadgets.quad_potato_cannon; +package com.drmangotea.tfmg.items.gadgets.quad_potato_cannon; import com.drmangotea.tfmg.registry.TFMGItems; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java index 6c318c53..c28ac586 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java @@ -7,6 +7,18 @@ import com.drmangotea.tfmg.blocks.decoration.doors.TFMGSlidingDoorRenderer; import com.drmangotea.tfmg.blocks.deposits.FluidDepositBlockEntity; import com.drmangotea.tfmg.blocks.deposits.surface_scanner.SurfaceScannerBlockEntity; import com.drmangotea.tfmg.blocks.deposits.surface_scanner.SurfaceScannerRenderer; +import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineBlockEntity; +import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineInstance; +import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineRenderer; +import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeBlockEntity; +import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeInstance; +import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeRenderer; +import com.drmangotea.tfmg.blocks.engines.small.gasoline.GasolineEngineBackTileEntity; +import com.drmangotea.tfmg.blocks.engines.small.gasoline.GasolineEngineTileEntity; +import com.drmangotea.tfmg.blocks.engines.small.lpg.LPGEngineBackTileEntity; +import com.drmangotea.tfmg.blocks.engines.small.lpg.LPGEngineTileEntity; +import com.drmangotea.tfmg.blocks.engines.small.turbine.TurbineEngineBackTileEntity; +import com.drmangotea.tfmg.blocks.engines.small.turbine.TurbineEngineTileEntity; import com.drmangotea.tfmg.blocks.machines.metal_processing.blast_furnace.BlastFurnaceOutputBlockEntity; import com.drmangotea.tfmg.blocks.machines.metal_processing.blast_furnace.BlastFurnaceRenderer; import com.drmangotea.tfmg.blocks.machines.metal_processing.blast_furnace.MoltenMetalBlockEntity; @@ -32,6 +44,7 @@ import com.drmangotea.tfmg.blocks.machines.oil_processing.pumpjack.machine_input import com.drmangotea.tfmg.blocks.pipes.normal.LockablePipeBlockEntity; import com.drmangotea.tfmg.blocks.tanks.SteelFluidTankRenderer; import com.drmangotea.tfmg.blocks.tanks.SteelTankBlockEntity; +import com.drmangotea.tfmg.blocks.engines.small.UniversalEngineRenderer; import com.simibubi.create.content.fluids.pipes.SmartFluidPipeBlockEntity; import com.simibubi.create.content.fluids.pipes.StraightPipeBlockEntity; import com.simibubi.create.content.fluids.pipes.TransparentStraightPipeRenderer; @@ -198,6 +211,55 @@ public class TFMGBlockEntities { .validBlocks(TFMGBlocks.CASTING_SPOUT) .register(); + public static final BlockEntityEntry AIR_INTAKE = REGISTRATE + .blockEntity("air_intake", AirIntakeBlockEntity::new) + .instance(() -> AirIntakeInstance::new, true) + .renderer(()-> AirIntakeRenderer::new) + .validBlocks(TFMGBlocks.AIR_INTAKE) + .register(); + public static final BlockEntityEntry DIESEL_ENGINE = REGISTRATE + .blockEntity("diesel_engine", DieselEngineBlockEntity::new) + .instance(() -> DieselEngineInstance::new, false) + .validBlocks(TFMGBlocks.DIESEL_ENGINE) + .renderer(() -> DieselEngineRenderer::new) + .register(); + + public static final BlockEntityEntry GASOLINE_ENGINE = REGISTRATE + .blockEntity("gasoline_engine", GasolineEngineTileEntity::new) + .instance(() -> HalfShaftInstance::new, false) + .validBlocks(TFMGBlocks.GASOLINE_ENGINE) + .renderer(() -> UniversalEngineRenderer::new) + .register(); + + public static final BlockEntityEntry GASOLINE_ENGINE_BACK = REGISTRATE + .blockEntity("gasoline_engine_back", GasolineEngineBackTileEntity::new) + .validBlocks(TFMGBlocks.GASOLINE_ENGINE_BACK) + .register(); + + public static final BlockEntityEntry LPG_ENGINE = REGISTRATE + .blockEntity("lpg_engine", LPGEngineTileEntity::new) + .instance(() -> HalfShaftInstance::new, false) + .validBlocks(TFMGBlocks.LPG_ENGINE) + .renderer(() -> UniversalEngineRenderer::new) + .register(); + public static final BlockEntityEntry LPG_ENGINE_BACK = REGISTRATE + .blockEntity("lpg_engine_back", LPGEngineBackTileEntity::new) + .validBlocks(TFMGBlocks.LPG_ENGINE_BACK) + .register(); + + public static final BlockEntityEntry TURBINE_ENGINE = REGISTRATE + .blockEntity("turbine_engine", TurbineEngineTileEntity::new) + .instance(() -> HalfShaftInstance::new, false) + .validBlocks(TFMGBlocks.TURBINE_ENGINE) + .renderer(() -> UniversalEngineRenderer::new) + .register(); + public static final BlockEntityEntry TURBINE_ENGINE_BACK = REGISTRATE + .blockEntity("turbine_engine_back", TurbineEngineBackTileEntity::new) + .validBlocks(TFMGBlocks.TURBINE_ENGINE_BACK) + .register(); + + + public static void register() {} } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java index 489e0602..5c8595d4 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java @@ -7,7 +7,17 @@ import com.drmangotea.tfmg.blocks.concrete.formwork.FormWorkBlock; import com.drmangotea.tfmg.blocks.concrete.formwork.FormWorkGenerator; import com.drmangotea.tfmg.blocks.decoration.doors.TFMGSlidingDoorBlock; import com.drmangotea.tfmg.blocks.deposits.FluidDepositBlock; -import com.drmangotea.tfmg.blocks.gadgets.explosives.napalm.NapalmBombBlock; +import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineBlock; +import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeBlock; +import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeGenerator; +import com.drmangotea.tfmg.blocks.engines.small.gasoline.GasolineEngineBackBlock; +import com.drmangotea.tfmg.blocks.engines.small.gasoline.GasolineEngineBlock; +import com.drmangotea.tfmg.blocks.engines.small.gasoline.GasolineEngineGenerator; +import com.drmangotea.tfmg.blocks.engines.small.lpg.LPGEngineBackBlock; +import com.drmangotea.tfmg.blocks.engines.small.lpg.LPGEngineBlock; +import com.drmangotea.tfmg.blocks.engines.small.turbine.TurbineEngineBackBlock; +import com.drmangotea.tfmg.blocks.engines.small.turbine.TurbineEngineBlock; +import com.drmangotea.tfmg.items.gadgets.explosives.napalm.NapalmBombBlock; import com.drmangotea.tfmg.blocks.machines.metal_processing.casting_basin.CastingBasinBlock; import com.drmangotea.tfmg.blocks.machines.metal_processing.casting_spout.CastingSpoutBlock; import com.drmangotea.tfmg.items.CoalCokeBlockItem; @@ -37,7 +47,9 @@ import com.drmangotea.tfmg.blocks.tanks.SteelTankBlock; import com.drmangotea.tfmg.blocks.tanks.SteelTankGenerator; import com.drmangotea.tfmg.blocks.tanks.SteelTankItem; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllItems; import com.simibubi.create.AllSpriteShifts; +import com.simibubi.create.AllTags; import com.simibubi.create.content.decoration.encasing.CasingBlock; import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour; import com.simibubi.create.content.decoration.encasing.EncasingRegistry; @@ -47,14 +59,13 @@ import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlock; import com.simibubi.create.content.kinetics.BlockStressDefaults; import com.simibubi.create.content.processing.AssemblyOperatorBlockItem; import com.simibubi.create.foundation.data.*; +import com.simibubi.create.foundation.utility.Couple; import com.tterrag.registrate.util.entry.BlockEntry; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction; import net.minecraft.tags.BlockTags; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.WallBlock; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.material.Material; @@ -418,7 +429,16 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU /////// - + public static final BlockEntry AIR_INTAKE = REGISTRATE.block("air_intake", AirIntakeBlock::new) + .initialProperties(SharedProperties::copperMetal) + .properties(BlockBehaviour.Properties::noOcclusion) + .transform(pickaxeOnly()) + .addLayer(() -> RenderType::cutoutMipped) + .blockstate(new AirIntakeGenerator()::generate) + .item() + .transform(customItemModel()) + .lang("Air Intake") + .register(); @@ -536,6 +556,110 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .noOcclusion()) .register(); + //-----------------------ENGINES---------------------------// + public static final BlockEntry GASOLINE_ENGINE = + REGISTRATE.block("gasoline_engine", GasolineEngineBlock::new) + .initialProperties(SharedProperties::stone) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .tag(AllTags.AllBlockTags.SAFE_NBT.tag) + .properties(BlockBehaviour.Properties::noOcclusion) + .transform(pickaxeOnly()) + .blockstate(new GasolineEngineGenerator()::generate) + .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) + .item() + .properties(p -> p.rarity(Rarity.UNCOMMON)) + .transform(customItemModel()) + .register(); + + public static final BlockEntry GASOLINE_ENGINE_BACK = + REGISTRATE.block("gasoline_engine_back", GasolineEngineBackBlock::new) + .initialProperties(SharedProperties::stone) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .tag(AllTags.AllBlockTags.SAFE_NBT.tag) + .properties(BlockBehaviour.Properties::noOcclusion) + .transform(pickaxeOnly()) + .blockstate(new GasolineEngineGenerator()::generate) + .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) + .item() + .properties(p -> p.rarity(Rarity.UNCOMMON)) + .transform(customItemModel()) + .register(); + + + public static final BlockEntry LPG_ENGINE = + REGISTRATE.block("lpg_engine", LPGEngineBlock::new) + .initialProperties(SharedProperties::stone) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .tag(AllTags.AllBlockTags.SAFE_NBT.tag) + .properties(BlockBehaviour.Properties::noOcclusion) + .transform(pickaxeOnly()) + .blockstate(new GasolineEngineGenerator()::generate) + .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) + .item() + .properties(p -> p.rarity(Rarity.UNCOMMON)) + .transform(customItemModel()) + .register(); + + public static final BlockEntry LPG_ENGINE_BACK = + REGISTRATE.block("lpg_engine_back", LPGEngineBackBlock::new) + .initialProperties(SharedProperties::stone) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .tag(AllTags.AllBlockTags.SAFE_NBT.tag) + .properties(BlockBehaviour.Properties::noOcclusion) + .transform(pickaxeOnly()) + .blockstate(new GasolineEngineGenerator()::generate) + .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) + .item() + .properties(p -> p.rarity(Rarity.UNCOMMON)) + .transform(customItemModel()) + .register(); + + public static final BlockEntry TURBINE_ENGINE = + REGISTRATE.block("turbine_engine", TurbineEngineBlock::new) + .initialProperties(SharedProperties::stone) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .tag(AllTags.AllBlockTags.SAFE_NBT.tag) + .properties(BlockBehaviour.Properties::noOcclusion) + .transform(pickaxeOnly()) + .blockstate(new GasolineEngineGenerator()::generate) + .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) + .item() + .properties(p -> p.rarity(Rarity.UNCOMMON)) + .transform(customItemModel()) + .register(); + + public static final BlockEntry TURBINE_ENGINE_BACK = + REGISTRATE.block("turbine_engine_back", TurbineEngineBackBlock::new) + .initialProperties(SharedProperties::stone) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .tag(AllTags.AllBlockTags.SAFE_NBT.tag) + .properties(BlockBehaviour.Properties::noOcclusion) + .transform(pickaxeOnly()) + .blockstate(new GasolineEngineGenerator()::generate) + .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) + .item() + .properties(p -> p.rarity(Rarity.UNCOMMON)) + .transform(customItemModel()) + .register(); + + + + public static final BlockEntry DIESEL_ENGINE = + REGISTRATE.block("diesel_engine", DieselEngineBlock::new) + .initialProperties(SharedProperties::copperMetal) + .transform(pickaxeOnly()) + .blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p))) + .transform(BlockStressDefaults.setCapacity(14.0)) + .transform(BlockStressDefaults.setGeneratorSpeed(DieselEngineBlock::getSpeedRange)) + .item() + .transform(customItemModel()) + .register(); @@ -543,17 +667,121 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU static { REGISTRATE.creativeModeTab(() -> TFMGCreativeModeTabs.TFMG_BUILDING_BLOCKS); } - public static final BlockEntry CONCRETE = REGISTRATE.block("concrete", Block::new) - .initialProperties(() -> Blocks.STONE) - .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) - .properties(p -> p.requiresCorrectToolForDrops()) - .transform(pickaxeOnly()) - .blockstate(simpleCubeAll("concrete")) - .tag(BlockTags.NEEDS_STONE_TOOL) - .transform(tagBlockAndItem("concrete")) - .build() - .lang("Concrete") - .register(); + //public static final BlockEntry CONCRETE = REGISTRATE.block("concrete", Block::new) + // .initialProperties(() -> Blocks.STONE) + // .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + // .properties(p -> p.requiresCorrectToolForDrops()) + // .transform(pickaxeOnly()) + // .blockstate(simpleCubeAll("concrete")) + // .tag(BlockTags.NEEDS_STONE_TOOL) + // .transform(tagBlockAndItem("concrete")) + // .build() + // .lang("Concrete") + // .register(); + + + public static final BlockEntry CONCRETE_TEST = generateConcrete(); + + + public static BlockEntry generateConcrete(){ + + + generateColoredConcrete(); + + + + return REGISTRATE.block("concrete", Block::new) + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(simpleCubeAll("concrete")) + .tag(BlockTags.NEEDS_STONE_TOOL) + .transform(tagBlockAndItem("concrete")) + .build() + .lang("Concrete") + .register(); + } + //this saved so much time + public static void generateColoredConcrete() { + String[] colours = {"black", "white", "blue", "light_blue", "red", "green", "lime", "pink", "magenta", "yellow", "gray", "light_gray", "brown", "cyan", "purple", "orange"}; + + + for (String color : colours) { + String firstLetter = color.substring(0, 1).toUpperCase(); + String colorWithoutC = color.substring(1); + + String upperCaseColor = firstLetter + colorWithoutC; + String light = "Light"; + if(upperCaseColor.contains(light)){ + String nameWithoutLight = upperCaseColor.substring(6); + + String firstLetter2 = nameWithoutLight.substring(0, 1).toUpperCase(); + String colorWithoutC2 = nameWithoutLight.substring(1); + + upperCaseColor = light+" "+firstLetter2+colorWithoutC2; + + + } + REGISTRATE.block(color + "_concrete", Block::new) + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(simpleCubeAll(color + "_concrete")) + .tag(BlockTags.NEEDS_STONE_TOOL) + .item() + .build() + .lang(upperCaseColor + " Concrete") + .register(); + + + REGISTRATE.block(color + "_concrete_wall", WallBlock::new) + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, color + "_concrete")) + .tag(BlockTags.NEEDS_STONE_TOOL) + .tag(BlockTags.WALLS) + .item() + .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, color + "_concrete")) + .build() + .lang(upperCaseColor + " Concrete Wall") + .register(); + + REGISTRATE.block(color + "_concrete_stairs", p -> new StairBlock(()-> TFMGBlocks.CONCRETE_TEST.get().defaultBlockState(),p)) + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate((c, p) -> TFMGVanillaBlockStates.generateStairBlockState(c, p, color + "_concrete")) + .tag(BlockTags.NEEDS_STONE_TOOL) + .tag(BlockTags.STAIRS) + .item() + .transform(b -> TFMGVanillaBlockStates.transformStairItem(b, color + "_concrete")) + .build() + .lang(upperCaseColor + " Concrete Stairs") + .register(); + + + + REGISTRATE.block(color + "_concrete_slab", SlabBlock::new) + .initialProperties(() -> Blocks.STONE) + .properties(p -> p.color(MaterialColor.COLOR_LIGHT_GRAY)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, color + "_concrete")) + .tag(BlockTags.NEEDS_STONE_TOOL) + .tag(BlockTags.WALLS) + .item() + .transform(customItemModel(color+"_concrete_bottom")) + .lang(upperCaseColor + " Concrete Slab") + .register(); + + + } + } public static void register() {} } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java index f1f5b51e..a15373ed 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java @@ -2,10 +2,10 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.CreateTFMG; import com.drmangotea.tfmg.base.spark.*; -import com.drmangotea.tfmg.blocks.gadgets.explosives.napalm.NapalmBombEntity; -import com.drmangotea.tfmg.blocks.gadgets.explosives.napalm.NapalmBombRenderer; -import com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.ThermiteGrenade; -import com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.ThermiteGrenadeRenderer; +import com.drmangotea.tfmg.items.gadgets.explosives.napalm.NapalmBombEntity; +import com.drmangotea.tfmg.items.gadgets.explosives.napalm.NapalmBombRenderer; +import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ThermiteGrenade; +import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ThermiteGrenadeRenderer; import com.simibubi.create.foundation.data.CreateEntityBuilder; import com.simibubi.create.foundation.utility.Lang; import com.tterrag.registrate.util.entry.EntityEntry; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java index df1b4fe4..02724e6e 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java @@ -68,6 +68,11 @@ public class TFMGFluids { .lang("LPG") .register(); + public static final FluidEntry AIR = + REGISTRATE.virtualFluid("air",LPG_RL,LPG_RL) + .lang("Air") + .register(); + public static final FluidEntry PROPANE = REGISTRATE.virtualFluid("propane",PROPANE_RL,PROPANE_RL) .lang("Propane") diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java index c4cce748..476376fc 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java @@ -1,8 +1,8 @@ package com.drmangotea.tfmg.registry; -import com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.ChemicalColor; -import com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.ThermiteGrenadeItem; -import com.drmangotea.tfmg.blocks.gadgets.quad_potato_cannon.QuadPotatoCannonItem; +import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ChemicalColor; +import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ThermiteGrenadeItem; +import com.drmangotea.tfmg.items.gadgets.quad_potato_cannon.QuadPotatoCannonItem; import com.drmangotea.tfmg.blocks.machines.metal_processing.casting_basin.CastingBasinBlockEntity; import com.drmangotea.tfmg.blocks.machines.metal_processing.casting_basin.CastingMoldItem; import com.drmangotea.tfmg.items.CoalCokeItem; @@ -13,7 +13,7 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import static com.drmangotea.tfmg.CreateTFMG.REGISTRATE; -import static com.drmangotea.tfmg.blocks.gadgets.explosives.thermite_grenades.ChemicalColor.*; +import static com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ChemicalColor.*; import static com.simibubi.create.AllTags.AllItemTags.CREATE_INGOTS; import static com.simibubi.create.AllTags.forgeItemTag; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java index dd6cb3ea..587b9c07 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java @@ -18,7 +18,13 @@ import java.util.Map; public class TFMGPartialModels { public static final PartialModel - + AIR_INTAKE_FAN = block("air_intake/fan"), + AIR_INTAKE_FAN_MEDIUM = block("air_intake/fan_medium"), + AIR_INTAKE_FAN_LARGE = block("air_intake/fan_large"), + AIR_INTAKE_FRAME = block("air_intake/frame"), + AIR_INTAKE_FRAME_CLOSED = block("air_intake/frame_closed"), + AIR_INTAKE_MEDIUM = block("air_intake/block_medium"), + AIR_INTAKE_LARGE = block("air_intake/block_large"), CASTING_SPOUT_CONNECTOR = block("casting_spout/connector"), CASTING_SPOUT_BOTTOM = block("casting_spout/bottom"), COKE_OVEN_DOOR_LEFT = block("coke_oven/door_left"), diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGLayeredPatterns.java b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGLayeredPatterns.java index 8edb9f88..d5c89ef3 100644 --- a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGLayeredPatterns.java +++ b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGLayeredPatterns.java @@ -35,7 +35,7 @@ public class TFMGLayeredPatterns { .layer(l -> l.weight(1) .passiveBlock()) .layer(l -> l.weight(2) - .block(TFMGBlocks.CONCRETE.get()) + .block(TFMGBlocks.CONCRETE_TEST.get()) .size(1, 3)) .layer(l -> l.weight(1) .block(Blocks.SMOOTH_BASALT) @@ -53,7 +53,7 @@ public class TFMGLayeredPatterns { .layer(l -> l.weight(1) .passiveBlock()) .layer(l -> l.weight(2) - .block(TFMGBlocks.CONCRETE.get()) + .block(TFMGBlocks.CONCRETE_TEST.get()) .size(1, 3)) .layer(l -> l.weight(1) .block(Blocks.TUFF) @@ -73,7 +73,7 @@ public class TFMGLayeredPatterns { .layer(l -> l.weight(2) .passiveBlock()) .layer(l -> l.weight(2) - .block(TFMGBlocks.CONCRETE.get()) + .block(TFMGBlocks.CONCRETE_TEST.get()) .size(1, 2)) .layer(l -> l.weight(3) .block(AllPaletteStoneTypes.SCORCHIA.getBaseBlock()) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index d6012dd4..e1c79333 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -14,9 +14,7 @@ displayName="Create: The Factory Must Grow" logoFile="logo.png" -#credits="Thanks for this example mod goes to Java" - -authors="DrMangoTea, Pepagg, MilkFur" +authors="DrMangoTea, Pepa, Milky" description=''' description soon diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/block.json b/src/main/resources/assets/tfmg/models/block/air_intake/block.json new file mode 100644 index 00000000..0d3cce20 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/block.json @@ -0,0 +1,80 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/air_intake/air_intake_small", + "particle": "tfmg:block/air_intake/air_intake_small" + }, + "elements": [ + { + "from": [0, 1, 0], + "to": [16, 16, 2], + "faces": { + "north": {"uv": [8, 0, 16, 7.5], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 7.5], "texture": "#0"}, + "south": {"uv": [8, 0, 16, 7.5], "texture": "#0"}, + "west": {"uv": [8, 0, 9, 7.5], "texture": "#0"}, + "up": {"uv": [0, 8, 8, 9], "texture": "#0"}, + "down": {"uv": [0, 7, 8, 8], "texture": "#0"} + } + }, + { + "from": [0, 1, 14], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [8, 0, 16, 7.5], "texture": "#0"}, + "east": {"uv": [8, 0, 9, 7.5], "texture": "#0"}, + "south": {"uv": [8, 0, 16, 7.5], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 7.5], "texture": "#0"}, + "up": {"uv": [0, 8, 8, 9], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 7, 8, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, 1, 2], + "to": [2, 16, 14], + "faces": { + "north": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [9, 0, 15, 8], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 8], "texture": "#0"}, + "west": {"uv": [9, 0, 15, 7.5], "texture": "#0"}, + "up": {"uv": [1, 8, 7, 9], "rotation": 270, "texture": "#0"}, + "down": {"uv": [1, 7, 7, 8], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [14, 1, 2], + "to": [16, 16, 14], + "faces": { + "north": {"uv": [8, 0, 9, 7.5], "texture": "#0"}, + "east": {"uv": [9, 0, 15, 7.5], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 7.5], "texture": "#0"}, + "west": {"uv": [9, 0, 15, 7.5], "texture": "#0"}, + "up": {"uv": [1, 8, 7, 9], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 7, 7, 8], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [2, 1, 2], + "to": [14, 3, 14], + "faces": { + "north": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [1, 1, 7, 7], "texture": "#0"}, + "down": {"uv": [1, 1, 7, 7], "texture": "#0"} + } + }, + { + "from": [2, 16, 2], + "to": [14, 16, 14], + "faces": { + "north": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [1, 9, 7, 15], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/block_empty.json b/src/main/resources/assets/tfmg/models/block/air_intake/block_empty.json new file mode 100644 index 00000000..0716da87 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/block_empty.json @@ -0,0 +1,3 @@ +{ + "parent": "block/air" +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/block_large.json b/src/main/resources/assets/tfmg/models/block/air_intake/block_large.json new file mode 100644 index 00000000..904b9041 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/block_large.json @@ -0,0 +1,84 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/air_intake/air_intake_large", + "1": "tfmg:block/air_intake/inside_large", + "2": "tfmg:block/air_intake/inputs", + "particle": "tfmg:block/air_intake/air_intake_large" + }, + "elements": [ + { + "from": [-16, -16, 1], + "to": [32, 32, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 0, 16, 0], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 16, 0], "texture": "#1"} + } + }, + { + "from": [31.999, -16, 1], + "to": [31.999, 32, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [8, 5.33333, 16, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 15], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 15], "texture": "#0"} + } + }, + { + "from": [-16, -15.999, 1], + "to": [32, -15.999, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 0, 15], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0, 15], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 5.33333, 16, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [-16, 31.99, 1], + "to": [32, 31.99, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 0, 15], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0, 15], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 5.33333, 16, 8], "texture": "#0"} + } + }, + { + "from": [-15.999, -16, 1], + "to": [-15.999, 32, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, + "east": {"uv": [8, 5.33333, 16, 8], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 0, 16], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 15], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 15], "texture": "#0"} + } + }, + { + "from": [-16, -16, 1], + "to": [32, 32, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "east": {"uv": [8, 5.33333, 16, 8], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 8, 8, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [8, 5.33333, 16, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 5.33333, 16, 8], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 5.33333, 16, 8], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/block_medium.json b/src/main/resources/assets/tfmg/models/block/air_intake/block_medium.json new file mode 100644 index 00000000..1a30d1c9 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/block_medium.json @@ -0,0 +1,84 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/air_intake/air_intake_medium", + "1": "tfmg:block/air_intake/inputs", + "2": "tfmg:block/air_intake/inside_medium", + "particle": "tfmg:block/air_intake/air_intake_medium" + }, + "elements": [ + { + "from": [-16, 0, 1], + "to": [16, 32, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [5.33333, 5.33333, 16, 16], "texture": "#1"}, + "east": {"uv": [8, 4, 16, 7.75], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 8, 8, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [8, 4, 16, 7.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 4, 16, 7.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 4, 16, 7.75], "texture": "#0"} + } + }, + { + "from": [-16, 0, 1], + "to": [16, 32, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#2"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#2"}, + "west": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 0, 16, 0], "rotation": 180, "texture": "#2"}, + "down": {"uv": [0, 0, 16, 0], "texture": "#2"} + } + }, + { + "from": [-15.99, 0, 1], + "to": [-15.99, 32, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 4, 16, 7.75], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 14], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 14], "texture": "#0"} + } + }, + { + "from": [15.99, 0, 1], + "to": [15.99, 32, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 4, 16, 7.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 0, 14], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 0, 14], "texture": "#0"} + } + }, + { + "from": [-16, 31.999, 1], + "to": [16, 31.999, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 14], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 16, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 0, 0, 14], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 4, 16, 7.75], "texture": "#0"} + } + }, + { + "from": [-16, 0.001, 1], + "to": [16, 0.001, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 14], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 16, 0], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 0, 0, 14], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 4, 16, 7.75], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/fan.json b/src/main/resources/assets/tfmg/models/block/air_intake/fan.json new file mode 100644 index 00000000..b50ef7ca --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/fan.json @@ -0,0 +1,32 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "axis_top": "create:block/axis_top", + "fan_blades": "create:block/fan_blades", + "axis": "create:block/axis" + }, + "elements": [ + { + "name": "Shaft", + "from": [6, 6, 1.2], + "to": [10, 10, 8], + "faces": { + "north": {"uv": [6, 6, 10, 10], "texture": "#axis_top"}, + "east": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "south": {"uv": [6, 6, 10, 10], "texture": "#axis_top"}, + "west": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "up": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "down": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"} + } + }, + { + "name": "Fan", + "from": [1, 1, 4], + "to": [15, 15, 12], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#fan_blades"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/fan_large.json b/src/main/resources/assets/tfmg/models/block/air_intake/fan_large.json new file mode 100644 index 00000000..1d49a8b1 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/fan_large.json @@ -0,0 +1,33 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/air_intake/air_intake_large", + "particle": "tfmg:block/air_intake/air_intake_large", + "axis": "create:block/axis", + "axis_top": "create:block/axis_top" + }, + "elements": [ + { + "name": "Fan", + "from": [-12, -12, 4], + "to": [28, 28, 12], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8.5, 8.5, 15.5, 15.5], "texture": "#0"} + } + }, + { + "name": "Shaft", + "from": [6, 6, 1.2], + "to": [10, 10, 8], + "faces": { + "north": {"uv": [6, 6, 10, 10], "texture": "#axis_top"}, + "east": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "south": {"uv": [6, 6, 10, 10], "texture": "#axis_top"}, + "west": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "up": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "down": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/fan_medium.json b/src/main/resources/assets/tfmg/models/block/air_intake/fan_medium.json new file mode 100644 index 00000000..19180a25 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/fan_medium.json @@ -0,0 +1,33 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/air_intake/air_intake_medium", + "particle": "tfmg:block/air_intake/air_intake_medium", + "axis": "create:block/axis", + "axis_top": "create:block/axis_top" + }, + "elements": [ + { + "name": "Fan", + "from": [-6, -6, 4], + "to": [22, 22, 12], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8.5, 8.5, 15.5, 15.5], "texture": "#0"} + } + }, + { + "name": "Shaft", + "from": [6, 6, 1.2], + "to": [10, 10, 8], + "faces": { + "north": {"uv": [6, 6, 10, 10], "texture": "#axis_top"}, + "east": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "south": {"uv": [6, 6, 10, 10], "texture": "#axis_top"}, + "west": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "up": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"}, + "down": {"uv": [6, 0, 10, 6.8], "rotation": 90, "texture": "#axis"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/frame.json b/src/main/resources/assets/tfmg/models/block/air_intake/frame.json new file mode 100644 index 00000000..5757a7b6 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/frame.json @@ -0,0 +1,53 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/air_intake/inputs", + "particle": "tfmg:block/air_intake/inputs" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 2, 1], + "faces": { + "north": {"uv": [0, 0, 5.33333, 0.66666], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 0, 0.33333, 0.33333], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0.33333, 0.33333], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 5.33333, 0.33333], "texture": "#0"}, + "down": {"uv": [0, 0, 5.33333, 0.33333], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 4.66667, 5.33333, 5.33333], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 0, 0.33333, 0.33333], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0.33333, 0.33333], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 5.33333, 0.33333], "texture": "#0"}, + "down": {"uv": [0, 0, 5.33333, 0.33333], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, 2, 0], + "to": [2, 14, 1], + "faces": { + "north": {"uv": [0.66667, 0, 4.66667, 0.66666], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0.66667, 0, 4.66667, 0.33333], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0.66667, 0, 4.66667, 0.33333], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 0.33333, 0.33333], "texture": "#0"}, + "down": {"uv": [0, 0, 0.33333, 0.33333], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [14, 2, 0], + "to": [16, 14, 1], + "faces": { + "north": {"uv": [0.66667, 0, 4.66667, 0.66666], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0.66667, 0, 4.66667, 0.33333], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0.66667, 0, 4.66667, 0.33333], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 0.33333, 0.33333], "texture": "#0"}, + "down": {"uv": [0, 0, 0.33333, 0.33333], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/frame_closed.json b/src/main/resources/assets/tfmg/models/block/air_intake/frame_closed.json new file mode 100644 index 00000000..b9731cbc --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/frame_closed.json @@ -0,0 +1,20 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/air_intake/air_intake_small", + "particle": "tfmg:block/air_intake/air_intake_small" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 0], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 8, 0.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 8, 0.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 8, 0.5], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/item.json b/src/main/resources/assets/tfmg/models/block/air_intake/item.json new file mode 100644 index 00000000..3a977db3 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/air_intake/item.json @@ -0,0 +1,81 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "tfmg:block/air_intake/air_intake_small", + "particle": "tfmg:block/air_intake/air_intake_small" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 2], + "faces": { + "north": {"uv": [8, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [8, 0, 9, 8], "texture": "#0"}, + "up": {"uv": [0, 8, 8, 9], "texture": "#0"}, + "down": {"uv": [0, 7, 8, 8], "texture": "#0"} + } + }, + { + "from": [0, 0, 14], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [8, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [8, 0, 9, 8], "texture": "#0"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "up": {"uv": [0, 8, 8, 9], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 7, 8, 8], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, 0, 2], + "to": [2, 16, 14], + "faces": { + "north": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [9, 0, 15, 8], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 8], "texture": "#0"}, + "west": {"uv": [9, 0, 15, 8], "texture": "#0"}, + "up": {"uv": [1, 8, 7, 9], "rotation": 270, "texture": "#0"}, + "down": {"uv": [1, 7, 7, 8], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [14, 0, 2], + "to": [16, 16, 14], + "faces": { + "north": {"uv": [8, 0, 9, 8], "texture": "#0"}, + "east": {"uv": [9, 0, 15, 8], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 8], "texture": "#0"}, + "west": {"uv": [9, 0, 15, 8], "texture": "#0"}, + "up": {"uv": [1, 8, 7, 9], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 7, 7, 8], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [2, 1, 2], + "to": [14, 3, 14], + "faces": { + "north": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [1, 1, 7, 7], "texture": "#0"}, + "down": {"uv": [1, 1, 7, 7], "texture": "#0"} + } + }, + { + "from": [2, 16, 2], + "to": [14, 16, 14], + "faces": { + "north": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [1, 9, 7, 15], "texture": "#0"} + } + } + ] +} \ 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 new file mode 100644 index 00000000..5929e18a Binary files /dev/null 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_medium.png b/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_medium.png new file mode 100644 index 00000000..4d30dd41 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_medium.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 new file mode 100644 index 00000000..ac1b41f4 Binary files /dev/null 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/front.png b/src/main/resources/assets/tfmg/textures/block/air_intake/front.png new file mode 100644 index 00000000..bb84ecff Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/front.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 new file mode 100644 index 00000000..6b430912 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/inputs.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/inside_large.png b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_large.png new file mode 100644 index 00000000..610a230e Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_large.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/inside_medium.png b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_medium.png new file mode 100644 index 00000000..d65a191c Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_medium.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/inside_small.png b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_small.png new file mode 100644 index 00000000..994fddd1 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_small.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_large.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_large.png new file mode 100644 index 00000000..3b2609f1 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_large.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_medium.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_medium.png new file mode 100644 index 00000000..a4e27ba2 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_medium.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_small.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_small.png new file mode 100644 index 00000000..32a989dc Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/air_intake_small.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/back.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/back.png new file mode 100644 index 00000000..d1bea582 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/back.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan.png new file mode 100644 index 00000000..b04990c3 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan_large.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan_large.png new file mode 100644 index 00000000..64441007 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan_large.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan_medium.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan_medium.png new file mode 100644 index 00000000..903235a3 Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/fan_medium.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/front.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/front.png new file mode 100644 index 00000000..bb84ecff Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/front.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/test/sides.png b/src/main/resources/assets/tfmg/textures/block/air_intake/test/sides.png new file mode 100644 index 00000000..cffd663d Binary files /dev/null and b/src/main/resources/assets/tfmg/textures/block/air_intake/test/sides.png differ diff --git a/src/main/resources/assets/tfmg/textures/block/black_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/black_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/black_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/black_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/blue_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/blue_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/blue_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/blue_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/brown_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/brown_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/brown_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/brown_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/cyan_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/cyan_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/cyan_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/cyan_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/gray_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/gray_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/gray_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/gray_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/green_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/green_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/green_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/green_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/light_blue_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/light_blue_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/light_blue_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/light_blue_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/light_gray_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/light_gray_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/light_gray_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/light_gray_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/lime_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/lime_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/lime_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/lime_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/magenta_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/magenta_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/magenta_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/magenta_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/orange_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/orange_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/orange_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/orange_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/pink_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/pink_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/pink_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/pink_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/purple_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/purple_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/purple_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/purple_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/red_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/red_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/red_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/red_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/white_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/white_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/white_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/white_concrete.png diff --git a/src/main/resources/assets/tfmg/textures/block/yellow_concrete_stage0.png b/src/main/resources/assets/tfmg/textures/block/yellow_concrete.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/block/yellow_concrete_stage0.png rename to src/main/resources/assets/tfmg/textures/block/yellow_concrete.png