maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
DrMangoTea
2025-05-25 16:46:22 +02:00
parent fe9986f06b
commit 8b566a64f5
95 changed files with 19053 additions and 21152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/generated/resources/.cache/5b8c0f5df972d0059948e36f3c0712dca4487541
View File

@@ -1,9 +1,9 @@
// 1.20.1 2025-05-21T20:34:33.0529958 TFMG's Processing Recipes
// 1.20.1 2025-05-25T12:54:48.7554292 TFMG's Processing Recipes
ae24d73a2ef5b8059806e660641bcb9dff2a15f4 data/tfmg/recipes/coking/charcoal.json
9000fbf96dc2c2b822aa4e526b1c8686d5413e5a data/tfmg/recipes/coking/coal.json
0615633ddeaab98905fba9020ecb9d0fbac32fcc data/tfmg/recipes/compacting/aluminum_ingot.json
2b33a020ed88511979447005053ceea2b3ff3c08 data/tfmg/recipes/compacting/bitumen.json
c67f3b7e3f8560b4bf16b03cb4fe6bd63ea57201 data/tfmg/recipes/compacting/cast_iron.json
6fdc2097dc379dd620ffec21797bbf03f38774fa data/tfmg/recipes/compacting/cast_iron.json
528ca7bc4ba7958bc3295ed53b1ae97f5628f5dd data/tfmg/recipes/compacting/cast_iron_ingot.json
3e2f2dd950bd134c331a9cbf0a17e82713f11249 data/tfmg/recipes/compacting/cinderflourblock.json
b0b8677040f2093573fc9ee074d3f29f70b440b3 data/tfmg/recipes/compacting/lead_ingot.json
@@ -24,18 +24,16 @@ c53735f5bedbc3e6fd8c03f2dcc18047e9391d6a data/tfmg/recipes/distillation/crude_oi
34371023823fc0686c5e6e3d074c7b723a7c5cd7 data/tfmg/recipes/distillation/heavy_oil.json
001bc3e8ddeb2fc3d633faf873553157b5c1878c data/tfmg/recipes/distillation/heavy_oil_light_distillation.json
cfd0a4e4e86ad9698e251e16aa952c951c6ed1c3 data/tfmg/recipes/distillation/heavy_oil_no_naphtha.json
e052823b5acf7fb35f4526f0b5b4b641e9b2881b data/tfmg/recipes/filling/air_tank.json
df37b08fdb78d6dd8bd514dc4f9118fad19a8e3d data/tfmg/recipes/filling/butane_tank.json
c44e553c1e6dfb3469b345a22582015f845aa842 data/tfmg/recipes/filling/carbon_dioxide_tank.json
44318fb2c90ead0678f6593786c892fbdb03cfbf data/tfmg/recipes/filling/ethylene_tank.json
a97e68d41416d79a9a2ef3ceeb05f1802b448a48 data/tfmg/recipes/filling/furnace_gas_tank.json
c4276f21b4ddc95d7295612cd7846cb23ba4bdbf data/tfmg/recipes/filling/hardened_planks.json
0c682acd4142a4282a8790942148b24388abf3fb data/tfmg/recipes/filling/hot_air_tank.json
c06cee5afb2630382fc2cd3abde09c73aaba55d5 data/tfmg/recipes/filling/hydrogen_tank.json
bd8c9a47c57cf549abb599eb4123c40d71580faf data/tfmg/recipes/filling/lpg_tank.json
62b327a16d91049674afa809119a7b48ca526b73 data/tfmg/recipes/filling/neon_tank.json
0e02a51b30c5ad04ce129e250378f8ec576c3e68 data/tfmg/recipes/filling/propane_tank.json
50c917d9033023657f0417985b032231a5862397 data/tfmg/recipes/filling/propylene_tank.json
60b3c615bddea5ac236ffb51dc48bb60b3946e9b data/tfmg/recipes/filling/air_tank.json
5953fc8c14d681e64aad3cba2bc9d0e41e35bc7c data/tfmg/recipes/filling/carbon_dioxide_tank.json
0e2bdbcb9b7b30f5643b0b639d9ea26f232079c2 data/tfmg/recipes/filling/ethylene_tank.json
4772e8177d5c6fcc9771c6d77a0db070ba614106 data/tfmg/recipes/filling/furnace_gas_tank.json
dcc60da72dd0f818ea6c5d7a29e60aec0c710bab data/tfmg/recipes/filling/hardened_planks.json
459633e9d11afdbc30f720a6842e61454b4d42dc data/tfmg/recipes/filling/hot_air_tank.json
5c33148691a2b761787d56052c25420e81e06eb7 data/tfmg/recipes/filling/hydrogen_tank.json
54efef6523a39d8fcb48796d659a3390007b1421 data/tfmg/recipes/filling/lpg_tank.json
e9287ed78b8ddba564751a2974306eea83e77ab4 data/tfmg/recipes/filling/neon_tank.json
83b959dcd319de129fbf76bd967d6d4c3ada9852 data/tfmg/recipes/filling/propylene_tank.json
35a1de08776b5725ae21dd4220549bde14d631a3 data/tfmg/recipes/hot_blast/hot_air.json
3385f19114ca69a40efaf7124bde2a978fee77a4 data/tfmg/recipes/item_application/aluminum_casing.json
012e7cdfed6d921cb6a032c2997e8e0c598e6f78 data/tfmg/recipes/item_application/coated_circuit_board.json

4
src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View File

@@ -1,7 +1,7 @@
// 1.20.1 2025-05-18T19:10:00.8597715 Recipes
// 1.20.1 2025-05-25T12:37:45.2883043 Recipes
8e18331462285f0f09e5897f4cd797c89b6ffc23 data/tfmg/recipes/sequenced_assembly/capacitor.json
782800c146c9d0485149cf0c1c552274ca6e78da data/tfmg/recipes/sequenced_assembly/generator.json
dccab49e30da3844d2cb20876c3269e675fad5c1 data/tfmg/recipes/sequenced_assembly/heavy_plate.json
1ec9510103d905de21001b87c64f4d4db0a9299f data/tfmg/recipes/sequenced_assembly/heavy_plate.json
5813e728507b3c3e11868f8e8ea7771f002ca54b data/tfmg/recipes/sequenced_assembly/motor.json
6943441658b1aa9175e6dce859896609b2d7aa28 data/tfmg/recipes/sequenced_assembly/potentiometer.json
fa180f8f12a0e27125b0eae636afdd7c0309b1be data/tfmg/recipes/sequenced_assembly/steel_mechanism.json

54
src/generated/resources/.cache/a4f054e33f64259067ca26a447a1fd4d4705e7dd
View File

@@ -1,4 +1,4 @@
// 1.20.1 2025-05-21T20:34:33.0539012 TFMG's Recipes
// 1.20.1 2025-05-25T16:45:33.7046035 TFMG's Recipes
d779aa2cf2fca905473c494073443d0289484311 data/create/recipes/mechanical_crafting/engine_controller.json
dd795cb8dd376f621afb3773cadb99c409aaf875 data/create/recipes/mechanical_crafting/flamethrower.json
e4cd8dd7ad658d3c2d5785fe659aba0e1b9d4f31 data/create/recipes/mechanical_crafting/large_engine.json
@@ -7,6 +7,11 @@ e4cd8dd7ad658d3c2d5785fe659aba0e1b9d4f31 data/create/recipes/mechanical_crafting
a85290d96da4668b5f05e4e20499fbe70c55e8ed data/create/recipes/mechanical_crafting/simple_large_engine.json
bf785bb02ce59dbf1c6bb409acee87d9902c8a38 data/create/recipes/mechanical_crafting/spark_plug.json
2d6327ccc2c1238ffc6fb3073f3cf94898bd26c5 data/create/recipes/mechanical_crafting/stator.json
9195362b7e061e947c4de657ce3b7c49c1e271d1 data/tfmg/advancements/recipes/misc/blasting/lead_ingot_blasting.json
14f26d532b7adf630370bfc99bf32a0ce4dc7e77 data/tfmg/advancements/recipes/misc/blasting/lead_ingot_from_crushed_blasting.json
c918937eba17a031abe7355ef190d20cc1e41f3c data/tfmg/advancements/recipes/misc/blasting/lithium_ingot_blasting.json
aae5d7bf4b4c3c1db5c04aa8427f8db7939f4d17 data/tfmg/advancements/recipes/misc/blasting/nickel_ingot_blasting.json
6d137afe5e70d3e68ebf5806d8eee80d1bcd1df8 data/tfmg/advancements/recipes/misc/blasting/nickel_ingot_from_crushed_blasting.json
ed72d53fe57cb70dbf96b69c081e0c9b0af83b86 data/tfmg/advancements/recipes/misc/crafting/kinetics/accumulator.json
dde62daa115fb2cd67962adb00d3fd7340a8ab7f data/tfmg/advancements/recipes/misc/crafting/kinetics/accumulatorfrom_lithium.json
db23a2f0a874c52b56611cbc77dc83f9763914ec data/tfmg/advancements/recipes/misc/crafting/kinetics/air_intake.json
@@ -222,6 +227,7 @@ b0b8eef469ef68a444cfbf5af7b761f534044c6e data/tfmg/advancements/recipes/misc/cra
58d67523a201578460c00c5bcc9a5d257f9169f1 data/tfmg/advancements/recipes/misc/crafting/kinetics/regular_engine.json
08659dddf04a87500623c4aa57430375c96ba19d data/tfmg/advancements/recipes/misc/crafting/kinetics/rusted_blast_furnace_reinforcement.json
85593de55d73ba0151415f5a3b72497573d2e0cd data/tfmg/advancements/recipes/misc/crafting/kinetics/screwdriver.json
4e891f247037c1055dcf54610804af284514fc85 data/tfmg/advancements/recipes/misc/crafting/kinetics/screwdriverfrom_brass.json
1dd82bd40b62169d547b108d9845fe8020abf34e data/tfmg/advancements/recipes/misc/crafting/kinetics/segmented_display.json
0541e6060200746c657d53b1567da8d0607aacd4 data/tfmg/advancements/recipes/misc/crafting/kinetics/steel_axe.json
26ee41be5fde5b7aa65746b453af7e5ce6ebbd03 data/tfmg/advancements/recipes/misc/crafting/kinetics/steel_block_from_compacting.json
@@ -277,11 +283,21 @@ b7c8ea540760ca91937bfb56a6c9abd4435a9910 data/tfmg/advancements/recipes/misc/cra
0d36bb9deeffeb8b2b0ad4d22322224ba07d2d43 data/tfmg/advancements/recipes/misc/crafting/kinetics/zinc_truss.json
b8fae2b8920863bd6eee674761e196567f6a3c8a data/tfmg/advancements/recipes/misc/smelting/fireproof_brick.json
9d8f6cd2cf27f42343fe47b185305cbc7cbc046c data/tfmg/advancements/recipes/misc/smelting/lead_ingot.json
7afd8bcf18543ef0ee6603a67ba43416c410c35b data/tfmg/advancements/recipes/misc/smelting/lead_ingot_blasting.json
b4c5dd15d6391d2b32850272ad082bf007678eb7 data/tfmg/advancements/recipes/misc/smelting/lead_ingot_from_crushed_blasting.json
b038ad57045f5486745a64ab19ac9769c8d08206 data/tfmg/advancements/recipes/misc/smelting/lithium_ingot.json
276516e97896dfecbc83be6768cc7d4e2b5b3787 data/tfmg/advancements/recipes/misc/smelting/lithium_ingot_blasting.json
a3bd640f5ee400dfc27ea69194f24d45c2c7440f data/tfmg/advancements/recipes/misc/smelting/nickel_ingot.json
c3ce53e018d4de6135e87b8bfd152c8498a467a0 data/tfmg/advancements/recipes/misc/smelting/nickel_ingot_blasting.json
6f75548eb450bc067d86b2a8cf28e25e9fd21ee5 data/tfmg/advancements/recipes/misc/smelting/nickel_ingot_from_crushed_blasting.json
22bdc24da46aab638de4fff26065a9937951533e data/tfmg/advancements/recipes/misc/smelting/unfinished_insulator.json
73edf8dc47a873080e40fd35e93d38e3a3daf489 data/tfmg/recipes/casting/silicon.json
7f1719f206a134e1c1df1be90711ca8f874c0a96 data/tfmg/recipes/casting/steel.json
fa176d9914b0268f3dc2bff1471f7724c5f9ec44 data/tfmg/recipes/blasting/lead_ingot_blasting.json
5c3735c5c5f885a733e151f4411e25669a4e2916 data/tfmg/recipes/blasting/lead_ingot_from_crushed_blasting.json
f83abce5cbf40a9a2c78c4ce95a094abdfb95da3 data/tfmg/recipes/blasting/lithium_ingot_blasting.json
1121750f909dc95ffc3f6790fc046b40f4d65a23 data/tfmg/recipes/blasting/nickel_ingot_blasting.json
09eed625166679cfa551dbcbf2005c86b484a7bf data/tfmg/recipes/blasting/nickel_ingot_from_crushed_blasting.json
4ca0426d93219655bbff0c359a5cc9c3ea9201ff data/tfmg/recipes/casting/silicon.json
bcc188834b31ab695c9dd610e06d17707f5167a9 data/tfmg/recipes/casting/steel.json
3032d7f8ddeda567a78664d6a8574f656263113e data/tfmg/recipes/crafting/kinetics/accumulator.json
5a862ab9f6982644f1452df3ef0fa130b57adf2d data/tfmg/recipes/crafting/kinetics/accumulatorfrom_lithium.json
c888fc7e9362f87124a9e172fef53433fd155784 data/tfmg/recipes/crafting/kinetics/air_intake.json
@@ -301,7 +317,7 @@ c268b9745ac59ef562e0d39ab6adb854addd8a2c data/tfmg/recipes/crafting/kinetics/alu
a9792957f7c086082a8cc1a69dfa84a05c5679dd data/tfmg/recipes/crafting/kinetics/aluminum_mechanical_pump.json
d7f1f4b18942932d33ae102bfbfbef6fcf09b3c8 data/tfmg/recipes/crafting/kinetics/aluminum_nugget_from_decompacting.json
f851bca643a34ee2960d75ee7f2a0ed5a58a31c7 data/tfmg/recipes/crafting/kinetics/aluminum_pickaxe.json
c76a62cbca7cc5b2cad6a1ec67e51aed20c92c67 data/tfmg/recipes/crafting/kinetics/aluminum_pipe.json
b50968d13ea80792b424912d41ce7f5291ecf0ba data/tfmg/recipes/crafting/kinetics/aluminum_pipe.json
647c83e5ef6f5649b5329f2f9d042bebf02feddb data/tfmg/recipes/crafting/kinetics/aluminum_pipe_vertical.json
5e7dac3869def1df965c8558485c771e2dc0e4d9 data/tfmg/recipes/crafting/kinetics/aluminum_shovel.json
be183c532de69717b584f2df32c0c34538f80089 data/tfmg/recipes/crafting/kinetics/aluminum_smart_fluid_pipe.json
@@ -314,7 +330,7 @@ be183c532de69717b584f2df32c0c34538f80089 data/tfmg/recipes/crafting/kinetics/alu
a3a45c1f82a7b6db35c489b4d0c5dabb62ff7419 data/tfmg/recipes/crafting/kinetics/blast_furnace_hatch.json
da5696363c9d489573b79ac2261de3eeeabcf28f data/tfmg/recipes/crafting/kinetics/blast_furnace_output.json
99724811c3a0fcf930e2c3ab9e960fe48f346219 data/tfmg/recipes/crafting/kinetics/blast_furnace_reinforcement.json
c5f9e9509b88317e4b8ee83c89f363725fd9586c data/tfmg/recipes/crafting/kinetics/blast_stove.json
1af622ae62c430bb9fe92d998046caa79e5be1b1 data/tfmg/recipes/crafting/kinetics/blast_stove.json
a64bdef677eb562a587374ce547a9d75558618f8 data/tfmg/recipes/crafting/kinetics/blue_concrete.json
80dd6da57061475960ef6068927d3ba528b84596 data/tfmg/recipes/crafting/kinetics/blue_multimeter.json
697d0e47ad2efaf5622ac5378d213271bed0cf51 data/tfmg/recipes/crafting/kinetics/blue_rebar_concrete.json
@@ -322,7 +338,7 @@ a64bdef677eb562a587374ce547a9d75558618f8 data/tfmg/recipes/crafting/kinetics/blu
429bdb714c3bfed25ca601e5f21bb40684930162 data/tfmg/recipes/crafting/kinetics/brass_fluid_valve.json
b327af92d5acb5d780aad5f009b9cc7e8d077464 data/tfmg/recipes/crafting/kinetics/brass_frame.json
ec8aa0a8f7b350c9b361c95d7b6510faaf554975 data/tfmg/recipes/crafting/kinetics/brass_mechanical_pump.json
8ece1e2ce120027fa58152bcb344ad94a179f0b1 data/tfmg/recipes/crafting/kinetics/brass_pipe.json
34e27bf918389302c5838949b58662333114d04a data/tfmg/recipes/crafting/kinetics/brass_pipe.json
34cab04bb83a2d47122ab08a0906c38f85d77c07 data/tfmg/recipes/crafting/kinetics/brass_pipe_vertical.json
cea30408cc76d443cfa37f2ef7abfcbd9e73b33f data/tfmg/recipes/crafting/kinetics/brass_smart_fluid_pipe.json
6dc803197514ee8836685c2515ea6854abd2fe6e data/tfmg/recipes/crafting/kinetics/brass_truss.json
@@ -336,16 +352,16 @@ f525ae0ae9b3c7047d8b0ac459294e7215e2417c data/tfmg/recipes/crafting/kinetics/cab
7e3e62e029e7ee2ed27436fb9f251ea7fdd120a6 data/tfmg/recipes/crafting/kinetics/cast_iron_block_from_compacting.json
d37e302532171583f3a1132734e46aebe7f5b127 data/tfmg/recipes/crafting/kinetics/cast_iron_chemical_vat.json
fb00488508be534ed1159b245c1ae38479a1f4bd data/tfmg/recipes/crafting/kinetics/cast_iron_fluid_tank.json
1177a70e262eabc67161f9cbb25f4c716a3dac1f data/tfmg/recipes/crafting/kinetics/cast_iron_fluid_valve.json
b52588d14e09e74ea298bef496e79317421b244d data/tfmg/recipes/crafting/kinetics/cast_iron_flywheel.json
d6d65d38fcbc4f2225d321bbe1b8a49edba0d2f9 data/tfmg/recipes/crafting/kinetics/cast_iron_fluid_valve.json
4309181b5de7f1e8a1784306d3ec8acb8888d887 data/tfmg/recipes/crafting/kinetics/cast_iron_flywheel.json
d7f6860a883070c7592b43ba5596da25a049031b data/tfmg/recipes/crafting/kinetics/cast_iron_frame.json
240c82190f1a978d28fa462cf5f7b85b8bcc96b1 data/tfmg/recipes/crafting/kinetics/cast_iron_ingot_from_compacting.json
9ee6880eff580774db37295800d3f0ba3c17a4c8 data/tfmg/recipes/crafting/kinetics/cast_iron_ingot_from_decompacting.json
1b897130edcc80799047f1e00b66d8e0eb4fadf3 data/tfmg/recipes/crafting/kinetics/cast_iron_mechanical_pump.json
50576c57c194826b89a7589a0b90799da6e53fc0 data/tfmg/recipes/crafting/kinetics/cast_iron_mechanical_pump.json
3059491b99ac97a4cb08042d65afda8ffbb5f89f data/tfmg/recipes/crafting/kinetics/cast_iron_nugget_from_decompacting.json
56e9956541820ebe0cc4caf44df07385893656e3 data/tfmg/recipes/crafting/kinetics/cast_iron_pipe.json
16d07664ab6e5269e3b54620affe0776bff1b0e9 data/tfmg/recipes/crafting/kinetics/cast_iron_pipe_vertical.json
673ec952e1dc35aee81fd935a2794525aafc7e48 data/tfmg/recipes/crafting/kinetics/cast_iron_smart_fluid_pipe.json
157b4067c314545a46b49a66e20e010a95bdab25 data/tfmg/recipes/crafting/kinetics/cast_iron_pipe.json
c2d7c7de54bf566cc6fbe0c9ae9b41d456ebdadc data/tfmg/recipes/crafting/kinetics/cast_iron_pipe_vertical.json
8f59795daa3b5b590a2e136d1d435a4e3b30dd85 data/tfmg/recipes/crafting/kinetics/cast_iron_smart_fluid_pipe.json
7ea5e8287397295280d7efd016dc4e73cfb649a0 data/tfmg/recipes/crafting/kinetics/cast_iron_truss.json
85abc110ea8e3a3455d89fbbc77fea773042fe6c data/tfmg/recipes/crafting/kinetics/centrifuge.json
c6f68175cec68fa42a680bb9f99eba9c8ab8befd data/tfmg/recipes/crafting/kinetics/cinderflour_block.json
@@ -464,7 +480,7 @@ c8cc1bb1c54789e4c3810b9ca98f7612c04c6768 data/tfmg/recipes/crafting/kinetics/pip
14174829741026aec93de7a6be22e2b480942de8 data/tfmg/recipes/crafting/kinetics/plastic_block.json
6baa5a2cf3d322ee9842afbfce5aa76fe3260631 data/tfmg/recipes/crafting/kinetics/plastic_fluid_valve.json
4cbf466888d7e59cfccfe80a63b65cc042ccd889 data/tfmg/recipes/crafting/kinetics/plastic_mechanical_pump.json
78886513403deb4879fff36205f365a0b6a121ac data/tfmg/recipes/crafting/kinetics/plastic_pipe.json
88ff42985773a64f07856e9fae2fccfbbd4485f9 data/tfmg/recipes/crafting/kinetics/plastic_pipe.json
c23f42c06a7af486c3026535f8706cab0bf5b235 data/tfmg/recipes/crafting/kinetics/plastic_pipe_vertical.json
a9dc832c8d3f75608a575e499766c9df1b1edba0 data/tfmg/recipes/crafting/kinetics/plastic_sheet.json
f3d8e96ab5f4fc6a290616b8151ccf1a43a4f30b data/tfmg/recipes/crafting/kinetics/plastic_smart_fluid_pipe.json
@@ -497,6 +513,7 @@ fc5ce9454a8464e5264d0b4f1696c01e4953aebf data/tfmg/recipes/crafting/kinetics/red
45e0349c5ff50a6d8de93bb0c6826400a03f7a1a data/tfmg/recipes/crafting/kinetics/regular_engine.json
38559a4f46b8592c258b13b74d751113bb7c7fb8 data/tfmg/recipes/crafting/kinetics/rusted_blast_furnace_reinforcement.json
5d74394ed8650542f7a1765080821eb034505d1b data/tfmg/recipes/crafting/kinetics/screwdriver.json
9bf6839fcd0bfe3577181ffd9dd966d4be9e9afd data/tfmg/recipes/crafting/kinetics/screwdriverfrom_brass.json
830dd504eb9ff9abb57e973ce2f7203948f93158 data/tfmg/recipes/crafting/kinetics/segmented_display.json
80f439b9615c99d6975e67fdc238cb4c2328d33d data/tfmg/recipes/crafting/kinetics/steel_axe.json
6d7ebd7ec8d10887489d3814fd6330c2b6174ef0 data/tfmg/recipes/crafting/kinetics/steel_block_from_compacting.json
@@ -522,7 +539,7 @@ b5663d1b346575425180164923cd03cf3c68b30f data/tfmg/recipes/crafting/kinetics/ste
775a4ee66cb1e045696a98611be4e77464ec6bb7 data/tfmg/recipes/crafting/kinetics/steel_mechanical_pump.json
f81ddce5df01c828b30f3b256986eda5ae406ca5 data/tfmg/recipes/crafting/kinetics/steel_nugget_from_decompacting.json
8456c034ee2cf2e6f856463f234d88f76dca4948 data/tfmg/recipes/crafting/kinetics/steel_pickaxe.json
d077c2c943e88c6a0606aeb2fea8661f23e5df71 data/tfmg/recipes/crafting/kinetics/steel_pipe.json
f676614f0f6d938475a95d68cd42987e7d2bf546 data/tfmg/recipes/crafting/kinetics/steel_pipe.json
5353bdf2254915099d8e235e4558be6eb75a6d77 data/tfmg/recipes/crafting/kinetics/steel_pipe_vertical.json
6df474b46616a0079190fbe26389101701ec4bee data/tfmg/recipes/crafting/kinetics/steel_shovel.json
264842c726437a16b7a75a4d63d5e3856a155384 data/tfmg/recipes/crafting/kinetics/steel_smart_fluid_pipe.json
@@ -551,13 +568,18 @@ b673506b5ef4dd9ea08cc070b3f9f3fc01fa4398 data/tfmg/recipes/crafting/kinetics/zin
56135df98436c7ff10516c4852cdddaef2367b53 data/tfmg/recipes/crafting/kinetics/zinc_grenade.json
4871336f9af956193ba3ff11467403b155f15208 data/tfmg/recipes/crafting/kinetics/zinc_truss.json
f42ff60ced168f9b0905b9f23ad0041c16265165 data/tfmg/recipes/industrial_blasting/silicon.json
592fe34876b5314a3c339523860f90fb6312ae5c data/tfmg/recipes/industrial_blasting/steel.json
0f4f7b1f99d97b40e1abeff52f4233693c54cbaf data/tfmg/recipes/industrial_blasting/steel.json
4691df4b385cfdd37eee42c5e760e0e503efb42c data/tfmg/recipes/industrial_blasting/steel_from_dust.json
d6f1c586376687c1a0acd3564144322ba8f8bf87 data/tfmg/recipes/industrial_blasting/steel_from_raw_iron.json
da11d79db201bb9d1567bda1374e2648cf4c9d67 data/tfmg/recipes/industrial_blasting/steel_from_raw_iron.json
621d3a3478c52f86c74f18472a6551c93f528e95 data/tfmg/recipes/smelting/fireproof_brick.json
1d2e4cc2469bcb5c04b7cf42d2fd2cf7ccdf81c1 data/tfmg/recipes/smelting/lead_ingot.json
1d2e4cc2469bcb5c04b7cf42d2fd2cf7ccdf81c1 data/tfmg/recipes/smelting/lead_ingot_blasting.json
67419d77c75b25ae63685821c3d26079d68957d0 data/tfmg/recipes/smelting/lead_ingot_from_crushed_blasting.json
7486a4d715bddf22a61b45e2ce48d70fee6126ff data/tfmg/recipes/smelting/lithium_ingot.json
7486a4d715bddf22a61b45e2ce48d70fee6126ff data/tfmg/recipes/smelting/lithium_ingot_blasting.json
502ce34e16301ccc8b45f8545b2984c6adfc9b0b data/tfmg/recipes/smelting/nickel_ingot.json
502ce34e16301ccc8b45f8545b2984c6adfc9b0b data/tfmg/recipes/smelting/nickel_ingot_blasting.json
5f3d7cd54c775d64eab2341702edc4498bb94b60 data/tfmg/recipes/smelting/nickel_ingot_from_crushed_blasting.json
85ce7ad0491b53460e0ec02f218d8ffb6d7a7298 data/tfmg/recipes/smelting/unfinished_insulator.json
7b044ce3df365bd9ca2ac9c2dd064a934c306d1b data/tfmg/recipes/vat_machine_recipe/aluminum.json
ed10f72cf5298f2f4558091e8b9e0e6cc489ffa2 data/tfmg/recipes/vat_machine_recipe/arc_furnace_steel.json

6
src/generated/resources/.cache/e54e4c34b4f65d271b7b9f53d4ba815125cff8b9
View File

@@ -1,4 +1,4 @@
// 1.20.1 2025-05-21T21:58:30.8947573 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.20.1 2025-05-25T13:01:32.2480982 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)]
ff5a5721633b83465ab501cbdfdc579a0f20e938 assets/tfmg/blockstates/accumulator.json
e982a263b6af75821042107fdeff7bd809436d08 assets/tfmg/blockstates/air_intake.json
e7f63aadfc892e337d9f87b5e50af8b1c7e4103f assets/tfmg/blockstates/aluminum_bars.json
@@ -436,8 +436,8 @@ a1988ec6a98f23cad8321b46345fbf1c5fd20489 assets/tfmg/blockstates/yellow_rebar_co
c58fa20c091e5ecddfb7164cba45538a8f911431 assets/tfmg/blockstates/yellow_rebar_concrete_wall.json
0271e2b940bb94cdb7e951b81e277ee633d64d62 assets/tfmg/blockstates/zinc_frame.json
1bd66f29acffb67f30bfe94c8535509bd009beab assets/tfmg/blockstates/zinc_truss.json
9b2398bfbf2c24969467e23d4b60046942cd5d21 assets/tfmg/lang/en_ud.json
7a877b3acd36b7c7aade17d748275b35c4689465 assets/tfmg/lang/en_us.json
45afc2cb1c4a18a7e6a2376578177aa3b50668c1 assets/tfmg/lang/en_ud.json
4fa1e7059a6184918773adf099a8e0407d627057 assets/tfmg/lang/en_us.json
9e6a6b62f5e7528c4e4d4f72f3510edcd8f0c078 assets/tfmg/models/block/aluminum_block.json
1d33a893d6ac05f9adaceb7f84423ebe9b195c01 assets/tfmg/models/block/aluminum_cable_hub.json
da469bf3233944085f07d4ef437827061e408838 assets/tfmg/models/block/aluminum_cap.json

3
src/generated/resources/assets/tfmg/lang/en_ud.json
View File

@@ -515,8 +515,10 @@
"create.goggles.ammeter.amps": "Λ %1$s :sdɯⱯ pǝɹnsɐǝW ",
"create.goggles.blast_furnace.fuel_amount": "%1$s : ןǝnℲ ",
"create.goggles.blast_furnace.height": "%1$s :ʇɥbıǝH ",
"create.goggles.blast_furnace.modifier": "%1$s :ǝɯı⟘ uoıʇɔnpoɹԀ",
"create.goggles.blast_furnace.reinforced": "pǝɔɹoɟuıǝᴚ",
"create.goggles.blast_furnace.stats": ":ǝɔɐuɹnℲ ʇsɐןᗺ",
"create.goggles.blast_furnace.timer": "%1$s :ʇɟǝꞀ ǝɯı⟘",
"create.goggles.blast_stove.header": " :ǝʌoʇS ʇsɐןᗺ",
"create.goggles.blast_stove.tank1": " :Ɩ ʞuɐ⟘ ʇnduI",
"create.goggles.blast_stove.tank2": " :ᄅ ʞuɐ⟘ ʇnduI",
@@ -599,6 +601,7 @@
"create.recipe.chemical_vat": "ʇɐΛ ןɐɔıɯǝɥƆ",
"create.recipe.coking": "buıʞoƆ",
"create.recipe.distillation": "uoıʇɐןןıʇsıᗡ",
"create.recipe.hot_blast": "buıʇsɐןᗺ ɹıⱯ",
"create.recipe.industrial_blasting": "buıʇsɐןᗺ ןɐıɹʇsnpuI",
"create.recipe.polarizing": "buızıɹɐןoԀ",
"create.resistor.allowed_voltage": "pǝʍoןןⱯ ǝbɐʇןoΛ ɟo ǝbɐʇuǝɔɹǝԀ",

3
src/generated/resources/assets/tfmg/lang/en_us.json
View File

@@ -515,8 +515,10 @@
"create.goggles.ammeter.amps": " Measured Amps: %1$s V",
"create.goggles.blast_furnace.fuel_amount": " Fuel : %1$s",
"create.goggles.blast_furnace.height": " Height: %1$s",
"create.goggles.blast_furnace.modifier": "Production Time: %1$s",
"create.goggles.blast_furnace.reinforced": "Reinforced",
"create.goggles.blast_furnace.stats": "Blast Furnace:",
"create.goggles.blast_furnace.timer": "Time Left: %1$s",
"create.goggles.blast_stove.header": "Blast Stove: ",
"create.goggles.blast_stove.tank1": "Input Tank 1: ",
"create.goggles.blast_stove.tank2": "Input Tank 2: ",
@@ -599,6 +601,7 @@
"create.recipe.chemical_vat": "Chemical Vat",
"create.recipe.coking": "Coking",
"create.recipe.distillation": "Distillation",
"create.recipe.hot_blast": "Air Blasting",
"create.recipe.industrial_blasting": "Industrial Blasting",
"create.recipe.polarizing": "Polarizing",
"create.resistor.allowed_voltage": "Percentage of Voltage Allowed",

35
src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/lead_ingot_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"tfmg:raw_lead"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:blasting/lead_ingot_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:blasting/lead_ingot_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/lead_ingot_from_crushed_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_lead"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:blasting/lead_ingot_from_crushed_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:blasting/lead_ingot_from_crushed_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/lithium_ingot_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"tfmg:raw_lithium"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:blasting/lithium_ingot_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:blasting/lithium_ingot_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/nickel_ingot_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"tfmg:raw_nickel"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:blasting/nickel_ingot_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:blasting/nickel_ingot_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/nickel_ingot_from_crushed_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_nickel"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:blasting/nickel_ingot_from_crushed_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:blasting/nickel_ingot_from_crushed_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/screwdriverfrom_brass.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"create:brass_ingot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:crafting/kinetics/screwdriverfrom_brass"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:crafting/kinetics/screwdriverfrom_brass"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/lead_ingot_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"tfmg:raw_lead"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:smelting/lead_ingot_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:smelting/lead_ingot_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/lead_ingot_from_crushed_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_lead"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:smelting/lead_ingot_from_crushed_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:smelting/lead_ingot_from_crushed_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/lithium_ingot_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"tfmg:raw_lithium"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:smelting/lithium_ingot_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:smelting/lithium_ingot_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/nickel_ingot_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"tfmg:raw_nickel"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:smelting/nickel_ingot_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:smelting/nickel_ingot_blasting"
]
},
"sends_telemetry_event": false
}

35
src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/nickel_ingot_from_crushed_blasting.json Normal file
View File

@@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_nickel"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "tfmg:smelting/nickel_ingot_from_crushed_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"tfmg:smelting/nickel_ingot_from_crushed_blasting"
]
},
"sends_telemetry_event": false
}

10
src/generated/resources/data/tfmg/recipes/blasting/lead_ingot_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:blasting",
"category": "misc",
"cookingtime": 100,
"experience": 0.0,
"ingredient": {
"item": "tfmg:raw_lead"
},
"result": "tfmg:lead_ingot"
}

10
src/generated/resources/data/tfmg/recipes/blasting/lead_ingot_from_crushed_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:blasting",
"category": "misc",
"cookingtime": 100,
"experience": 0.0,
"ingredient": {
"item": "create:crushed_raw_lead"
},
"result": "tfmg:lead_ingot"
}

10
src/generated/resources/data/tfmg/recipes/blasting/lithium_ingot_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:blasting",
"category": "misc",
"cookingtime": 100,
"experience": 0.0,
"ingredient": {
"item": "tfmg:raw_lithium"
},
"result": "tfmg:lithium_ingot"
}

10
src/generated/resources/data/tfmg/recipes/blasting/nickel_ingot_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:blasting",
"category": "misc",
"cookingtime": 100,
"experience": 0.0,
"ingredient": {
"item": "tfmg:raw_nickel"
},
"result": "tfmg:nickel_ingot"
}

10
src/generated/resources/data/tfmg/recipes/blasting/nickel_ingot_from_crushed_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:blasting",
"category": "misc",
"cookingtime": 100,
"experience": 0.0,
"ingredient": {
"item": "create:crushed_raw_nickel"
},
"result": "tfmg:nickel_ingot"
}

2
src/generated/resources/data/tfmg/recipes/casting/silicon.json
View File

@@ -7,7 +7,7 @@
"nbt": {}
}
],
"processingTime": 60,
"processingTime": 200,
"results": [
{
"item": "tfmg:silicon_ingot"

2
src/generated/resources/data/tfmg/recipes/casting/steel.json
View File

@@ -7,7 +7,7 @@
"nbt": {}
}
],
"processingTime": 60,
"processingTime": 200,
"results": [
{
"item": "tfmg:steel_ingot"

1
src/generated/resources/data/tfmg/recipes/compacting/cast_iron.json
View File

@@ -11,7 +11,6 @@
],
"results": [
{
"count": 2,
"item": "tfmg:cast_iron_ingot"
}
]

1
src/generated/resources/data/tfmg/recipes/crafting/kinetics/aluminum_pipe.json
View File

@@ -15,6 +15,7 @@
" "
],
"result": {
"count": 4,
"item": "tfmg:aluminum_pipe"
},
"show_notification": true

1
src/generated/resources/data/tfmg/recipes/crafting/kinetics/blast_stove.json
View File

@@ -18,6 +18,7 @@
"FF "
],
"result": {
"count": 2,
"item": "tfmg:blast_stove"
},
"show_notification": true

1
src/generated/resources/data/tfmg/recipes/crafting/kinetics/brass_pipe.json
View File

@@ -15,6 +15,7 @@
" "
],
"result": {
"count": 4,
"item": "tfmg:brass_pipe"
},
"show_notification": true

2
src/generated/resources/data/tfmg/recipes/crafting/kinetics/cast_iron_fluid_valve.json
View File

@@ -6,7 +6,7 @@
"tag": "forge:plates/iron"
},
{
"item": "tfmg:brass_pipe"
"item": "tfmg:cast_iron_pipe"
}
],
"result": {

2
src/generated/resources/data/tfmg/recipes/crafting/kinetics/cast_iron_flywheel.json
View File

@@ -3,7 +3,7 @@
"category": "misc",
"key": {
"C": {
"tag": "forge:ingots/lead"
"tag": "forge:ingots/cast_iron"
},
"S": {
"item": "create:shaft"

2
src/generated/resources/data/tfmg/recipes/crafting/kinetics/cast_iron_mechanical_pump.json
View File

@@ -6,7 +6,7 @@
"item": "create:cogwheel"
},
{
"item": "tfmg:brass_pipe"
"item": "tfmg:cast_iron_pipe"
}
],
"result": {

5
src/generated/resources/data/tfmg/recipes/crafting/kinetics/cast_iron_pipe.json
View File

@@ -3,10 +3,10 @@
"category": "misc",
"key": {
"I": {
"tag": "forge:ingots/brass"
"tag": "forge:ingots/cast_iron"
},
"P": {
"tag": "forge:plates/brass"
"tag": "forge:plates/cast_iron"
}
},
"pattern": [
@@ -15,6 +15,7 @@
" "
],
"result": {
"count": 4,
"item": "tfmg:cast_iron_pipe"
},
"show_notification": true

4
src/generated/resources/data/tfmg/recipes/crafting/kinetics/cast_iron_pipe_vertical.json
View File

@@ -3,10 +3,10 @@
"category": "misc",
"key": {
"I": {
"tag": "forge:ingots/brass"
"tag": "forge:ingots/cast_iron"
},
"P": {
"tag": "forge:plates/brass"
"tag": "forge:plates/cast_iron"
}
},
"pattern": [

4
src/generated/resources/data/tfmg/recipes/crafting/kinetics/cast_iron_smart_fluid_pipe.json
View File

@@ -3,13 +3,13 @@
"category": "misc",
"key": {
"I": {
"tag": "forge:plates/brass"
"tag": "forge:plates/cast_iron"
},
"P": {
"item": "create:electron_tube"
},
"S": {
"item": "tfmg:brass_pipe"
"item": "tfmg:cast_iron_pipe"
}
},
"pattern": [

1
src/generated/resources/data/tfmg/recipes/crafting/kinetics/plastic_pipe.json
View File

@@ -12,6 +12,7 @@
" "
],
"result": {
"count": 4,
"item": "tfmg:plastic_pipe"
},
"show_notification": true

21
src/generated/resources/data/tfmg/recipes/crafting/kinetics/screwdriverfrom_brass.json Normal file
View File

@@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"I": {
"tag": "forge:ingots/brass"
},
"R": {
"item": "tfmg:rebar"
}
},
"pattern": [
" R",
" I ",
" "
],
"result": {
"item": "tfmg:screwdriver"
},
"show_notification": true
}

1
src/generated/resources/data/tfmg/recipes/crafting/kinetics/steel_pipe.json
View File

@@ -15,6 +15,7 @@
" "
],
"result": {
"count": 4,
"item": "tfmg:steel_pipe"
},
"show_notification": true

3
src/generated/resources/data/tfmg/recipes/filling/air_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:air",

15
src/generated/resources/data/tfmg/recipes/filling/butane_tank.json
View File

@@ -1,15 +0,0 @@
{
"type": "create:filling",
"ingredients": [
{
"amount": 1000,
"fluid": "tfmg:butane",
"nbt": {}
}
],
"results": [
{
"item": "tfmg:butane_bucket"
}
]
}

3
src/generated/resources/data/tfmg/recipes/filling/carbon_dioxide_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:carbon_dioxide",

3
src/generated/resources/data/tfmg/recipes/filling/ethylene_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:ethylene",

3
src/generated/resources/data/tfmg/recipes/filling/furnace_gas_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:furnace_gas",

3
src/generated/resources/data/tfmg/recipes/filling/hardened_planks.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"tag": "minecraft:planks"
},
{
"amount": 250,
"fluid": "tfmg:creosote",

3
src/generated/resources/data/tfmg/recipes/filling/hot_air_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:hot_air",

3
src/generated/resources/data/tfmg/recipes/filling/hydrogen_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:hydrogen",

3
src/generated/resources/data/tfmg/recipes/filling/lpg_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:lpg",

3
src/generated/resources/data/tfmg/recipes/filling/neon_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:neon",

15
src/generated/resources/data/tfmg/recipes/filling/propane_tank.json
View File

@@ -1,15 +0,0 @@
{
"type": "create:filling",
"ingredients": [
{
"amount": 1000,
"fluid": "tfmg:propane",
"nbt": {}
}
],
"results": [
{
"item": "tfmg:propane_bucket"
}
]
}

3
src/generated/resources/data/tfmg/recipes/filling/propylene_tank.json
View File

@@ -1,6 +1,9 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"amount": 1000,
"fluid": "tfmg:propylene",

2
src/generated/resources/data/tfmg/recipes/industrial_blasting/steel.json
View File

@@ -20,7 +20,7 @@
"fluid": "tfmg:molten_slag"
},
{
"amount": 20,
"amount": 200,
"fluid": "tfmg:furnace_gas"
}
]

2
src/generated/resources/data/tfmg/recipes/industrial_blasting/steel_from_raw_iron.json
View File

@@ -20,7 +20,7 @@
"fluid": "tfmg:molten_slag"
},
{
"amount": 20,
"amount": 200,
"fluid": "tfmg:furnace_gas"
}
]

2
src/generated/resources/data/tfmg/recipes/sequenced_assembly/heavy_plate.json
View File

@@ -1,7 +1,7 @@
{
"type": "create:sequenced_assembly",
"ingredient": {
"item": "tfmg:heavy_plate"
"tag": "forge:ingots/steel"
},
"loops": 1,
"results": [

10
src/generated/resources/data/tfmg/recipes/smelting/lead_ingot_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 200,
"experience": 0.0,
"ingredient": {
"item": "tfmg:raw_lead"
},
"result": "tfmg:lead_ingot"
}

10
src/generated/resources/data/tfmg/recipes/smelting/lead_ingot_from_crushed_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 200,
"experience": 0.0,
"ingredient": {
"item": "create:crushed_raw_lead"
},
"result": "tfmg:lead_ingot"
}

10
src/generated/resources/data/tfmg/recipes/smelting/lithium_ingot_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 200,
"experience": 0.0,
"ingredient": {
"item": "tfmg:raw_lithium"
},
"result": "tfmg:lithium_ingot"
}

10
src/generated/resources/data/tfmg/recipes/smelting/nickel_ingot_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 200,
"experience": 0.0,
"ingredient": {
"item": "tfmg:raw_nickel"
},
"result": "tfmg:nickel_ingot"
}

10
src/generated/resources/data/tfmg/recipes/smelting/nickel_ingot_from_crushed_blasting.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "minecraft:smelting",
"category": "misc",
"cookingtime": 200,
"experience": 0.0,
"ingredient": {
"item": "create:crushed_raw_nickel"
},
"result": "tfmg:nickel_ingot"
}

34
src/main/java/com/drmangotea/tfmg/base/TFMGCreativeTabs.java
View File

@@ -88,7 +88,8 @@ public class TFMGCreativeTabs {
List<RegistryEntry<? extends Item>> list = new ArrayList<>();
list.add(TFMGItems.LIT_LITHIUM_BLADE);
list.add(TFMGItems.GOLDEN_TURBO);
list.add(TFMGItems.DEPOSIT_ITEM);
return list;
}
@@ -97,8 +98,19 @@ public class TFMGCreativeTabs {
CompoundTag gasolineTag = new CompoundTag();
gasolineTag.putString("gasoline", "forge:gasoline");
gasolineTag.putString("kerosene", "forge:kerosene");
gasolineTag.putString("naphtha", "forge:naphtha");
CompoundTag gasolineTagName = new CompoundTag();
gasolineTagName.putString("gasoline", "Gasoline");
gasolineTagName.putString("kerosene", "Kerosene");
gasolineTagName.putString("naphtha", "Naphtha");
//
CompoundTag creosoteTag = new CompoundTag();
creosoteTag.putString("creosote", "forge:creosote");
creosoteTag.putString("furnace_gas", "forge:furnace_gas");
CompoundTag creosoteTagName = new CompoundTag();
creosoteTagName.putString("creosote", "Creosote");
creosoteTagName.putString("furnace_gas", "Furnace Gas");
//
CompoundTag dieselTag = new CompoundTag();
dieselTag.putString("diesel", "forge:diesel");
@@ -113,19 +125,15 @@ public class TFMGCreativeTabs {
CompoundTag keroseneTag = new CompoundTag();
keroseneTag.putString("kerosene", "forge:kerosene");
CompoundTag keroseneTagName = new CompoundTag();
keroseneTagName.putString("kerosene", "KEROSENE");
//
CompoundTag naphthaTag = new CompoundTag();
naphthaTag.putString("naphtha", "forge:naphtha");
CompoundTag naphthaTagName = new CompoundTag();
naphthaTagName.putString("naphtha", "NAPHTHA");
keroseneTagName.putString("kerosene", "Kerosene");
//
ItemStack gasoline = TFMGItems.ENGINE_CYLINDER.asStack();
gasoline.getOrCreateTag().put("Fuels", gasolineTag);
gasoline.getOrCreateTag().put("FuelNames", gasolineTagName);
list.add(gasoline);
ItemStack diesel = TFMGItems.ENGINE_CYLINDER.asStack();
ItemStack diesel = TFMGItems.DIESEL_ENGINE_CYLINDER.asStack();
diesel.getOrCreateTag().put("Fuels", dieselTag);
diesel.getOrCreateTag().put("FuelNames", dieselTagName);
list.add(diesel);
@@ -133,6 +141,16 @@ public class TFMGCreativeTabs {
lpg.getOrCreateTag().put("Fuels", lpgTag);
lpg.getOrCreateTag().put("FuelNames", lpgTagName);
list.add(lpg);
ItemStack creosote = TFMGItems.SIMPLE_ENGINE_CYLINDER.asStack();
creosote.getOrCreateTag().put("Fuels", creosoteTag);
creosote.getOrCreateTag().put("FuelNames", creosoteTagName);
list.add(creosote);
ItemStack kerosene = TFMGItems.TURBINE_BLADE.asStack();
kerosene.getOrCreateTag().put("Fuels", keroseneTag);
kerosene.getOrCreateTag().put("FuelNames", keroseneTagName);
list.add(kerosene);
return list;
}

7
src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorBlockEntity.java
View File

@@ -83,6 +83,11 @@ public class AccumulatorBlockEntity extends ElectricBlockEntity {
@Override
public boolean makeMultimeterTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
if(!isController())
if(level.getBlockEntity(controller) instanceof AccumulatorBlockEntity be)
return be.makeMultimeterTooltip(tooltip, isPlayerSneaking);
super.makeMultimeterTooltip(tooltip, isPlayerSneaking);
@@ -288,7 +293,7 @@ public class AccumulatorBlockEntity extends ElectricBlockEntity {
public int getChargingRate() {
//
// int chargingRate = Math.max((data.networkPowerGeneration - getNetworkPowerUsage()), 0);
if (energy.getEnergyStored() == getMaxCapacity() || getData().getVoltage() < getOutputVoltage() || canPower()|| data.notEnoughtPower)
if (energy.getEnergyStored() >= getMaxCapacity() || getData().getVoltage() < getOutputVoltage() || canPower()|| data.notEnoughtPower)
return 0;
//return Math.min(chargingRate, getMaxChargingRate());

22
src/main/java/com/drmangotea/tfmg/content/engines/base/AbstractEngineBlockEntity.java
View File

@@ -88,8 +88,10 @@ public abstract class AbstractEngineBlockEntity extends KineticElectricBlockEnti
}
public void tankUpdated(FluidStack stack, boolean fuelTank ) {
if(fuelTank && stack.isEmpty())
if(fuelTank && stack.isEmpty()) {
fuelInjectionRate = 0;
updateRotation();
}
sendData();
setChanged();
}
@@ -125,14 +127,14 @@ public abstract class AbstractEngineBlockEntity extends KineticElectricBlockEnti
}
@Override
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
CreateLang.text("SIGNAL " + highestSignal).forGoggles(tooltip);
return super.addToGoggleTooltip(tooltip, isPlayerSneaking);
}
//@Override
//public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
//
// CreateLang.text("SIGNAL " + highestSignal).forGoggles(tooltip);
//
//
// return super.addToGoggleTooltip(tooltip, isPlayerSneaking);
//}
@Override
@@ -147,7 +149,7 @@ public abstract class AbstractEngineBlockEntity extends KineticElectricBlockEnti
}
public void manageFuelAndExhaust() {
exhaustTank.forceFill(new FluidStack(TFMGFluids.CARBON_DIOXIDE.get(), Math.min(300, getFuelConsumption() * 7)), IFluidHandler.FluidAction.EXECUTE);
exhaustTank.forceFill(new FluidStack(TFMGFluids.CARBON_DIOXIDE.get(), Math.min(300, getFuelConsumption())), IFluidHandler.FluidAction.EXECUTE);
if (fuelConsumptionTimer <= 2) {
fuelConsumptionTimer++;

1
src/main/java/com/drmangotea/tfmg/content/engines/base/EngineBlock.java
View File

@@ -62,6 +62,7 @@ public class EngineBlock extends HorizontalKineticBlock {
engineController.accelerationRate = 0;
engineController.shift = TransmissionUpgrade.TransmissionState.NEUTRAL;
be.shift = TransmissionUpgrade.TransmissionState.NEUTRAL;
be.clutchPressed = false;
engineController.engine = null;
engineController.enginePos = null;
engineController.disconnectEngine();

45
src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java
View File

@@ -131,6 +131,7 @@ public class EngineControllerBlockEntity extends SmartBlockEntity implements IHa
if (enginePos != null)
if (level.getBlockEntity(enginePos) instanceof AbstractSmallEngineBlockEntity be) {
be.getControllerBE().shift = shift;
be.getControllerBE().clutchPressed = clutch;
be.getControllerBE().updateGeneratedRotation();
if(be.getControllerBE().engineLength()>1){
if(level.getBlockEntity(BlockPos.of(be.getControllerBE().engines.get(be.getControllerBE().engineLength()-1)))instanceof AbstractSmallEngineBlockEntity be2){
@@ -230,28 +231,28 @@ public class EngineControllerBlockEntity extends SmartBlockEntity implements IHa
disconnectEngine();
}
@Override
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
if (engine != null) {
CreateLang.text("Linked").forGoggles(tooltip);
}
CreateLang.text(shift.name()).forGoggles(tooltip);
CreateLang.text(engineStarted ? "Engine Started" : "Engine Stopped").forGoggles(tooltip);
CreateLang.text("Acceleration: " + accelerationRate).forGoggles(tooltip);
if (clutch)
CreateLang.text("CLUTCH").forGoggles(tooltip);
if (brake)
CreateLang.text("BRAKE").forGoggles(tooltip);
if (gas)
CreateLang.text("GAS").forGoggles(tooltip);
return true;
}
//@Override
//public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
//
// if (engine != null) {
// CreateLang.text("Linked").forGoggles(tooltip);
// }
//
//
// CreateLang.text(shift.name()).forGoggles(tooltip);
// CreateLang.text(engineStarted ? "Engine Started" : "Engine Stopped").forGoggles(tooltip);
// CreateLang.text("Acceleration: " + accelerationRate).forGoggles(tooltip);
//
//
// if (clutch)
// CreateLang.text("CLUTCH").forGoggles(tooltip);
// if (brake)
// CreateLang.text("BRAKE").forGoggles(tooltip);
// if (gas)
// CreateLang.text("GAS").forGoggles(tooltip);
//
// return true;
//}
@Override

4
src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java
View File

@@ -50,6 +50,7 @@ public abstract class AbstractSmallEngineBlockEntity extends AbstractEngineBlock
public Optional<? extends EngineUpgrade> upgrade = Optional.empty();
public TransmissionUpgrade.TransmissionState shift = TransmissionUpgrade.TransmissionState.NEUTRAL;
public boolean clutchPressed = false;
public int oil = 0;
@@ -354,6 +355,9 @@ public abstract class AbstractSmallEngineBlockEntity extends AbstractEngineBlock
if (getControllerBE().hasEngineController()) {
if(getControllerBE().hasTwoShafts())
speed = switch (getControllerBE().shift) {
case REVERSE -> speed * -0.3f;
case NEUTRAL -> 0;

7
src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java
View File

@@ -128,7 +128,7 @@ public class LargeEngineBlockEntity extends AbstractEngineBlockEntity {
@Override
public float efficiencyModifier() {
return 1;
return 0.5f;
}
@Override
@@ -296,8 +296,11 @@ public class LargeEngineBlockEntity extends AbstractEngineBlockEntity {
if(getShaft()==null)
return 0;
if(isSimpleEngine())
if(isSimpleEngine()&&getShaft()!=null)
return (int) getShaft().getGeneratedSpeed()/10;
if(getShaft()==null)
return 0;
return (int) getShaft().getGeneratedSpeed()/40;
}

3
src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java
View File

@@ -281,7 +281,8 @@ public class RegularEngineBlockEntity extends AbstractSmallEngineBlockEntity {
@OnlyIn(Dist.CLIENT)
private void makeSound(){
soundTimer++;
if(!isController())
return;
if(soundTimer>1/Math.min(6000,(rpm*0.0002)*pistonInventory.getSlots())) {

6
src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java
View File

@@ -119,6 +119,12 @@ public class BlastFurnaceOutputBlockEntity extends SmartBlockEntity implements I
CreateLang.translate("goggles.blast_furnace.fuel_amount", fuel)
.forGoggles(tooltip, 1);
if (timer != -1)
CreateLang.translate("goggles.blast_furnace.timer", timer)
.style(ChatFormatting.GOLD)
.forGoggles(tooltip, 1);
if (isReinforced)
CreateLang.translate("goggles.blast_furnace.reinforced")
.style(ChatFormatting.GREEN)

65
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java
View File

@@ -122,7 +122,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
CAST_IRON_FLYWHEEL = create(TFMGBlocks.CAST_IRON_FLYWHEEL)
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('C', leadIngot())
.define('C', castIronIngot())
.define('S', shaft())
.pattern("CCC")
.pattern("CSC")
@@ -326,7 +326,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("S ")
.pattern("S ")),
/// ////////////
STEEL_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0))
STEEL_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0)).returns(4)
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShaped(b -> b
.define('I', steelIngot())
@@ -366,7 +366,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.requires(ironSheet())
.requires(steelPipe())),
/// ////////////
ALUMINUM_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0))
ALUMINUM_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0)).returns(4)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
.define('I', aluminumIngot())
@@ -406,7 +406,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.requires(ironSheet())
.requires(aluminumPipe())),
/// ////////////
PLASTIC_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0))
PLASTIC_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0)).returns(4)
.unlockedBy(TFMGItems.PLASTIC_SHEET::get)
.viaShaped(b -> b
.define('I', plasticSheet())
@@ -444,7 +444,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.requires(ironSheet())
.requires(plasticPipe())),
/// ////////////
BRASS_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0))
BRASS_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0)).returns(4)
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
@@ -484,11 +484,11 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.requires(ironSheet())
.requires(brassPipe())),
/// ////////////
CAST_IRON_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0))
CAST_IRON_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0)).returns(4)
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
.define('P', brassSheet())
.define('I', castIronIngot())
.define('P', castIronSheet())
.pattern(" ")
.pattern("PIP")
.pattern(" ")),
@@ -496,8 +496,8 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
CAST_IRON_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0)).withSuffix("_vertical")
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
.define('P', brassSheet())
.define('I', castIronIngot())
.define('P', castIronSheet())
.pattern("P")
.pattern("I")
.pattern("P")),
@@ -506,14 +506,14 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShapeless(b -> b
.requires(cog())
.requires(brassPipe())),
.requires(castIronPipe())),
CAST_IRON_SMART_FLUID_PIPE = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(4))
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('P', electronTube())
.define('S', brassPipe())
.define('I', brassSheet())
.define('S', castIronPipe())
.define('I', castIronSheet())
.pattern("I")
.pattern("S")
.pattern("P")),
@@ -522,7 +522,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShapeless(b -> b
.requires(ironSheet())
.requires(brassPipe())),
.requires(castIronPipe())),
/// ////////////
STEEL_COGWHEEL = create(TFMGBlocks.STEEL_COGWHEEL).returns(4)
@@ -856,6 +856,15 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern(" I ")
.pattern(" ")),
SCREWDRIVER_FROM_BRASS = create(TFMGItems.SCREWDRIVER).withSuffix("from_brass")
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
.define('R', rebar())
.pattern(" R")
.pattern(" I ")
.pattern(" ")),
ELECTRIC_GAUGE = create(TFMGBlocks.VOLTMETER)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
@@ -1301,14 +1310,36 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.viaCooking(() -> TFMGItems.RAW_LEAD)
.inFurnace(),
NICKEL_LEAD = create(TFMGItems.NICKEL_INGOT::get)
NICKEL = create(TFMGItems.NICKEL_INGOT::get)
.viaCooking(() -> TFMGItems.RAW_NICKEL)
.inFurnace(),
LITHIUM_LEAD = create(TFMGItems.LITHIUM_INGOT::get)
LITHIUM = create(TFMGItems.LITHIUM_INGOT::get)
.viaCooking(() -> TFMGItems.RAW_LITHIUM)
.inFurnace(),
RAW_LEAD_BLASTING = create(TFMGItems.LEAD_INGOT::get).withSuffix("_blasting")
.viaCooking(() -> TFMGItems.RAW_LEAD)
.inBlastFurnace(),
NICKEL_LEAD_BLASTING = create(TFMGItems.NICKEL_INGOT::get).withSuffix("_blasting")
.viaCooking(() -> TFMGItems.RAW_NICKEL)
.inBlastFurnace(),
LITHIUM_BLASTING = create(TFMGItems.LITHIUM_INGOT::get).withSuffix("_blasting")
.viaCooking(() -> TFMGItems.RAW_LITHIUM)
.inBlastFurnace(),
//
LEAD_FROM_CRUSHED_BLASTING = create(TFMGItems.LEAD_INGOT::get).withSuffix("_from_crushed_blasting")
.viaCooking(() -> AllItems.CRUSHED_LEAD)
.inBlastFurnace(),
NICKEL_FROM_CRUSHED_BLASTING = create(TFMGItems.NICKEL_INGOT::get).withSuffix("_from_crushed_blasting")
.viaCooking(() -> AllItems.CRUSHED_NICKEL)
.inBlastFurnace(),
//
THERMITE_GRENADE = create(TFMGItems.THERMITE_GRENADE)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
@@ -1760,7 +1791,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("SPN")
.pattern("WIW")),
BLAST_STOVE = create(TFMGBlocks.BLAST_STOVE)
BLAST_STOVE = create(TFMGBlocks.BLAST_STOVE).returns(2)
.unlockedBy(TFMGItems.FIREPROOF_BRICK::get)
.viaShaped(b -> b
.define('F', fireproofBricks())

2
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java
View File

@@ -30,7 +30,7 @@ public class TFMGCompactingRecipeGen extends TFMGPressingRecipeGen {
CAST_IRON = create("cast_iron", b -> b
.require(ironIngot())
.require(coal())
.output(TFMGItems.CAST_IRON_INGOT, 2)
.output(TFMGItems.CAST_IRON_INGOT, 1)
.requiresHeat(HeatCondition.HEATED)
);

28
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java
View File

@@ -5,6 +5,8 @@ import com.drmangotea.tfmg.registry.TFMGBlocks;
import com.drmangotea.tfmg.registry.TFMGFluids;
import com.simibubi.create.AllRecipeTypes;
import net.minecraft.data.PackOutput;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.Items;
import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*;
@@ -14,6 +16,7 @@ public class TFMGFillingRecipeGen extends TFMGProcessingRecipeGen {
GeneratedRecipe
HARDENED_PLANKS = create("hardened_planks", b -> b
.require(ItemTags.PLANKS)
.require(TFMGFluids.CREOSOTE.getSource(), 250)
.output(TFMGBlocks.HARDENED_PLANKS)),
@@ -21,46 +24,55 @@ public class TFMGFillingRecipeGen extends TFMGProcessingRecipeGen {
//GAS TANKS
LPG_TANK = create("lpg_tank", b -> b
.require(Items.BUCKET)
.require(lpg(), 1000)
.output(lpgTank())
),
BUTANE_TANK = create("butane_tank", b -> b
.require(butane(), 1000)
.output(butaneTank())
),
PROPANE_TANK = create("propane_tank", b -> b
.require(propane(), 1000)
.output(propaneTank())
),
//BUTANE_TANK = create("butane_tank", b -> b
// .require(butane(), 1000)
// .output(butaneTank())
//),
//PROPANE_TANK = create("propane_tank", b -> b
// .require(propane(), 1000)
// .output(propaneTank())
//),
HYDROGEN_TANK = create("hydrogen_tank", b -> b
.require(Items.BUCKET)
.require(hydrogen(), 1000)
.output(hydrogenTank())
),
FURNACE_GAS_TANK = create("furnace_gas_tank", b -> b
.require(Items.BUCKET)
.require(blastFurnaceGas(), 1000)
.output(furnaceGasTank())
),
ETHYLENE_TANK = create("ethylene_tank", b -> b
.require(Items.BUCKET)
.require(ethylene(), 1000)
.output(ethyleneTank())
),
PROPYLENE_TANK = create("propylene_tank", b -> b
.require(Items.BUCKET)
.require(propylene(), 1000)
.output(propyleneTank())
),
NEON_TANK = create("neon_tank", b -> b
.require(Items.BUCKET)
.require(neon(), 1000)
.output(neonTank())
),
CARBON_DIOXIDE_TANK = create("carbon_dioxide_tank", b -> b
.require(Items.BUCKET)
.require(carbonDioxide(), 1000)
.output(carbonDioxideTank())
),
AIR_TANK = create("air_tank", b -> b
.require(Items.BUCKET)
.require(air(), 1000)
.output(airTank())
),
HOT_AIR_TANK = create("hot_air_tank", b -> b
.require(Items.BUCKET)
.require(hotAir(), 1000)
.output(hotAirTank())
);

2
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java
View File

@@ -61,7 +61,7 @@ public class TFMGSequencedAssemblyRecipeGen extends CreateRecipeProvider {
),
HEAVY_PLATE = create("heavy_plate", b -> b.require(TFMGItems.HEAVY_PLATE)
HEAVY_PLATE = create("heavy_plate", b -> b.require(steelIngot())
.transitionTo(TFMGItems.UNPROCESSED_HEAVY_PLATE.get())
.addOutput(TFMGItems.HEAVY_PLATE.get(), 1)
.loops(1)

4
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/CastingRecipeGen.java
View File

@@ -13,12 +13,12 @@ public class CastingRecipeGen extends TFMGProcessingRecipeGen {
STEEL_INGOT = create("steel", b ->b
.require(TFMGFluids.MOLTEN_STEEL.get(),144)
.output(TFMGItems.STEEL_INGOT)
.duration(60)),
.duration(200)),
SILICON = create("silicon", b ->b
.require(TFMGFluids.LIQUID_SILICON.get(),144)
.output(TFMGItems.SILICON_INGOT)
.duration(60));
.duration(200));
;
public CastingRecipeGen(PackOutput output) {
super(output);

4
src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/IndustrialBlastingRecipeGen.java
View File

@@ -28,7 +28,7 @@ public class IndustrialBlastingRecipeGen extends TFMGRecipeProvider{
.require(TFMGTags.TFMGItemTags.FLUX.tag)
.output(TFMGFluids.MOLTEN_STEEL.get(),144)
.output(TFMGFluids.MOLTEN_SLAG.get(),144)
.output(TFMGFluids.FURNACE_GAS.get(),20)
.output(TFMGFluids.FURNACE_GAS.get(),200)
.duration(20)
, 20),
STEEL_DOUBLE = createIndustrialBlastingRecipe("steel_from_raw_iron", b -> (IndustrialBlastingRecipeBuilder) b
@@ -36,7 +36,7 @@ public class IndustrialBlastingRecipeGen extends TFMGRecipeProvider{
.require(Ingredient.of(TFMGTags.TFMGItemTags.FLUX.tag))
.output(TFMGFluids.MOLTEN_STEEL.get(),288)
.output(TFMGFluids.MOLTEN_SLAG.get(),288)
.output(TFMGFluids.FURNACE_GAS.get(),20)
.output(TFMGFluids.FURNACE_GAS.get(),200)
.duration(40)
, 30),

2
src/main/java/com/drmangotea/tfmg/mixin/RecipeProviderMixin.java
View File

@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
public class RecipeProviderMixin {
@Inject(at = @At("HEAD"), method = "getName",cancellable = true , remap = false)
@Inject(at = @At("HEAD"), method = "getName",cancellable = true , remap = true)
public final void getName(CallbackInfoReturnable<String> cir) {
if((Object)this instanceof TFMGMechanicalCraftingRecipeGen)
cir.setReturnValue("TFMG'S Mechanical Crafting Recipes");

29
src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java
View File

@@ -169,23 +169,24 @@ public class TFMGBlocks {
}
//------------------ENGINES------------------//
public static final BlockEntry<TurbineEngineBlock> TURBINE_ENGINE = REGISTRATE.block("turbine_engine", TurbineEngineBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.addLayer(() -> RenderType::cutoutMipped)
.transform(TFMGStress.setCapacity(85))
.blockstate(new TurbineEngineGenerator()::generate)
.item()
.transform(customItemModel())
.register();
public static final BlockEntry<RegularEngineBlock> REGULAR_ENGINE = REGISTRATE.block("regular_engine", RegularEngineBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.onRegister(connectedTextures(() -> new EngineCTBehavior(TFMGSpriteShifts.REGULAR_ENGINE_TOP, TFMGSpriteShifts.REGULAR_ENGINE_BOTTOM, TFMGSpriteShifts.REGULAR_ENGINE_SIDE)))
.blockstate(new EngineGenerator()::generate)
.transform(TFMGStress.setCapacity(45.0))
.item()
.transform(customItemModel())
.register();
public static final BlockEntry<TurbineEngineBlock> TURBINE_ENGINE = REGISTRATE.block("turbine_engine", TurbineEngineBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.addLayer(() -> RenderType::cutoutMipped)
.transform(TFMGStress.setCapacity(45.0))
.blockstate(new TurbineEngineGenerator()::generate)
.transform(TFMGStress.setCapacity(85.0))
.item()
.transform(customItemModel())
.register();
@@ -193,7 +194,7 @@ public class TFMGBlocks {
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(TFMGStress.setCapacity(45.0))
.transform(TFMGStress.setCapacity(85))
.onRegister(connectedTextures(() -> new EngineCTBehavior(TFMGSpriteShifts.REGULAR_ENGINE_TOP, TFMGSpriteShifts.REGULAR_ENGINE_BOTTOM, TFMGSpriteShifts.REGULAR_ENGINE_SIDE)))
.blockstate(new TurbineEngineGenerator()::generate)
.item()
@@ -203,7 +204,7 @@ public class TFMGBlocks {
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(TFMGStress.setCapacity(45.0))
.transform(TFMGStress.setCapacity(55))
.blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p)))
.item()
.transform(customItemModel())
@@ -212,7 +213,7 @@ public class TFMGBlocks {
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(TFMGStress.setCapacity(30))
.transform(TFMGStress.setCapacity(40))
.blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p)))
.item()
.transform(customItemModel())

3
src/main/resources/assets/tfmg/lang/default/interface.json
View File

@@ -21,6 +21,8 @@
"create.goggles.blast_furnace.fuel_amount": " Fuel : %1$s",
"create.goggles.blast_furnace.height": " Height: %1$s",
"create.goggles.blast_furnace.reinforced": "Reinforced",
"create.goggles.blast_furnace.timer": "Time Left: %1$s",
"create.goggles.blast_furnace.modifier": "Production Time: %1$s",
"create.goggles.blast_stove.header": "Blast Stove: ",
"create.goggles.blast_stove.tank1": "Input Tank 1: ",
@@ -122,6 +124,7 @@
"create.recipe.coking": "Coking",
"create.recipe.polarizing": "Polarizing",
"create.recipe.chemical_vat": "Chemical Vat",
"create.recipe.hot_blast": "Air Blasting",
"tfmg.keyinfo.custom_button": "Engine Controller Custom Button",
"tfmg.keyinfo.engine_start": "Start Engine",

0
src/main/resources/assets/tfmg/textures/block/surface_scanner_flags/flag1.png
View File

1
src/main/resources/tfmg.mixins.json
View File

@@ -9,7 +9,6 @@
"FluidPropagatorMixin",
"GoggleOverlayRendererMixin",
"PipeAttachmentModelMixin",
"RecipeProviderMixin",
"FluidTankBlockEntityMixin",
"accessor.FluidTankBlockEntityAccessor",
"accessor.TankSegmentAccessor"