This commit is contained in:
DrMangoTea
2025-06-02 17:51:00 +02:00
parent 8b566a64f5
commit e2abb9b7f5
96 changed files with 21396 additions and 19451 deletions

View File

@@ -1,4 +1,4 @@
// 1.20.1 2025-05-25T12:54:48.7554292 TFMG's Processing Recipes
// 1.20.1 2025-06-01T20:09:54.4787585 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
@@ -8,7 +8,6 @@ ae24d73a2ef5b8059806e660641bcb9dff2a15f4 data/tfmg/recipes/coking/charcoal.json
3e2f2dd950bd134c331a9cbf0a17e82713f11249 data/tfmg/recipes/compacting/cinderflourblock.json
b0b8677040f2093573fc9ee074d3f29f70b440b3 data/tfmg/recipes/compacting/lead_ingot.json
fd2a489b06d8ae7eea9635af3a74d773aaf60c25 data/tfmg/recipes/compacting/nickel_ingot.json
8913dc5ba7356ec528efcfbd99f5e14b4f16c2ad data/tfmg/recipes/compacting/plastic_sheet.json
239785319ac742ebaf0d09127404310d68217732 data/tfmg/recipes/compacting/synthetic_leather.json
f8f004cce2acbbf02207433e88df3e1f3d155053 data/tfmg/recipes/crushing/bauxite.json
6c8b2797938c86e8bf21508db782f19e6fa1c5d2 data/tfmg/recipes/crushing/coal_coke.json
@@ -17,13 +16,14 @@ c66b8e651bf39232afca35da09b82fc1af29a8d6 data/tfmg/recipes/crushing/dirt.json
ced4aa7fb9a039d9144959a17381c83d324222a2 data/tfmg/recipes/crushing/galena.json
46ede7a2a24bb1f7949ad6e98466a47fdb9ee759 data/tfmg/recipes/crushing/lignite.json
b12cbfd32b1c386b4cc8f28480f36937d756e0cd data/tfmg/recipes/crushing/limestone.json
8a83ba25a8412f503d750c73dd8b5c5e9fdb063f data/tfmg/recipes/crushing/slag_block.json
f218b0fa35bdb632066225082134f6ba297d49fb data/tfmg/recipes/crushing/sulfur.json
55a40ebeb7612a9ba4a938e18adcfe6da4388fff data/tfmg/recipes/distillation/crude_oil.json
c53735f5bedbc3e6fd8c03f2dcc18047e9391d6a data/tfmg/recipes/distillation/crude_oil_light_distillation.json
2ef242c09ecf8dc0dbd554dac9ec924b65bdd17d data/tfmg/recipes/distillation/crude_oil_no_naphtha.json
34371023823fc0686c5e6e3d074c7b723a7c5cd7 data/tfmg/recipes/distillation/heavy_oil.json
8c80e612bd4187241a90e40c68241826e222b1c3 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
e4b71e1cfabc347dccef6426d722bb6369f018e6 data/tfmg/recipes/distillation/heavy_oil_no_naphtha.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
@@ -34,13 +34,13 @@ dcc60da72dd0f818ea6c5d7a29e60aec0c710bab data/tfmg/recipes/filling/hardened_plan
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
46cb31b82c65ef9c724b2ed864ee51cd4234fb04 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
6208a999d88f949b1043f13c492f97d52260fe83 data/tfmg/recipes/item_application/heavy_machinery_casing.json
c19411c5d0a02e974f617fbe377bcac3bea1fd99 data/tfmg/recipes/item_application/steel_casing.json
e025109b51e8c82579970379716072470d578cf8 data/tfmg/recipes/mixing/asphalt_mixture.json
21400ac77d3a01bb414350dff853962c9c2b9ee6 data/tfmg/recipes/mixing/asphalt_mixture_from_slag.json
56d6c4142fc71e87095e234f1123d14f08e7038d data/tfmg/recipes/mixing/asphalt_mixture.json
17f834b88ee7c86a28d9d0cf214b151fb92be7f4 data/tfmg/recipes/mixing/asphalt_mixture_from_slag.json
4005a79190133704f6d399dc48cf5a41a8f7ae44 data/tfmg/recipes/mixing/cement.json
d6c254e0ba2531195eaeffc235628a4b405f96bb data/tfmg/recipes/mixing/concrete_mixture.json
5c6dfae267284b5e4dc1fc6a386172f1525c394f data/tfmg/recipes/mixing/concrete_mixture_from_slag.json
@@ -48,7 +48,7 @@ d6c254e0ba2531195eaeffc235628a4b405f96bb data/tfmg/recipes/mixing/concrete_mixtu
e8c5783e5b93e9e66417c8d73aa684ab96f43cd6 data/tfmg/recipes/mixing/cooling_fluid.json
d0b6208fbe3a36bbab8f93ccd5e11cafcdc348ea data/tfmg/recipes/mixing/copper_sulfate.json
78d5ad5111a8daa6ba7943f2d49ca479a440347a data/tfmg/recipes/mixing/gunpowder.json
d005e893f5920c8c410c978b02723587f64f9779 data/tfmg/recipes/mixing/liquid_asphalt.json
0ba7ddd0c210f4ccf6a257e4dbf089435af9e5a6 data/tfmg/recipes/mixing/liquid_asphalt.json
31092ad453356efe10f4ac4e8b7d8c4964d75699 data/tfmg/recipes/mixing/liquid_concrete.json
5cec7d55327f7340ca037b55d9ce5142ed04d20c data/tfmg/recipes/mixing/magnetic_alloy.json
91a5223d59ba418922a8d9738dd13f2464ec426a data/tfmg/recipes/mixing/napalm.json

View File

@@ -1,4 +1,4 @@
// 1.20.1 2025-03-23T17:11:24.6472682 TFMG's Generated Registry Entries
// 1.20.1 2025-06-01T16:00:40.7055358 TFMG's Generated Registry Entries
03f0181e37952f9e7fabf4292538df1a63dfe854 data/tfmg/damage_type/acid.json
3597357d17e8d9d166905c8cfd89df04ce0dc113 data/tfmg/damage_type/blast_furnace.json
059ddd2bfc9abe546988d9dd0ab8459eb553cb65 data/tfmg/damage_type/concrete.json
@@ -7,14 +7,14 @@ e6ce5388a0167e63e2b9d4b87190374f448722a5 data/tfmg/forge/biome_modifier/lead_ore
519659cfd37b92b2d7697652ff9e895fe299a220 data/tfmg/forge/biome_modifier/nickel_ore.json
33918362b99c2b2a4adc251dafd3e1d75d64896c data/tfmg/forge/biome_modifier/oil_deposit.json
c56fa6819ca8e875c19cab71a79cacdd9c15094f data/tfmg/forge/biome_modifier/oil_well.json
6af256d6c41726c0f978554cb344169db52c840b data/tfmg/forge/biome_modifier/tfmg_striated_ores_nether.json
a2fe9ef1b66772d66b4023e5a9338793973ca54f data/tfmg/forge/biome_modifier/tfmg_striated_ores_nether.json
e724fbf2054dc1b5403ebf641fae197e33c03ddc data/tfmg/forge/biome_modifier/tfmg_striated_ores_overworld.json
c3ee7d50456a7e0aafd3bbe9ab71bf2b96a01470 data/tfmg/worldgen/configured_feature/lead_ore.json
c3b14f129d7c60f33dc2b572e4f9ef0ce08bec1b data/tfmg/worldgen/configured_feature/lithium_ore.json
a4042949e1e7bce134b8a05a7627fb8c50201e1c data/tfmg/worldgen/configured_feature/nickel_ore.json
b1d0a22fcd0a33c72686dc910f5beb3c4ace9a3c data/tfmg/worldgen/configured_feature/oil_deposit.json
970c5ca8bd5004e4164b7d0f8ca1a99ce1ac4a19 data/tfmg/worldgen/configured_feature/oil_well.json
c6c39be2182770a537db582ae5cae15f186ea1f9 data/tfmg/worldgen/configured_feature/tfmg_striated_ores_nether.json
2811e9fd2c2e3b876ae8b364b877aa5776b6af15 data/tfmg/worldgen/configured_feature/tfmg_striated_ores_nether.json
a106ee08545287c881b5dd458efe7f425d8c1f77 data/tfmg/worldgen/configured_feature/tfmg_striated_ores_overworld.json
6f5615fecd27fe4a37938194fb5a94b030d85fed data/tfmg/worldgen/placed_feature/lead_ore.json
65afa2f400018fc5eceab759d81dacbac6eecb70 data/tfmg/worldgen/placed_feature/lithium_ore.json

View File

@@ -1,8 +1,8 @@
// 1.20.1 2025-05-25T12:37:45.2883043 Recipes
// 1.20.1 2025-06-01T15:25:31.654134 Recipes
8e18331462285f0f09e5897f4cd797c89b6ffc23 data/tfmg/recipes/sequenced_assembly/capacitor.json
782800c146c9d0485149cf0c1c552274ca6e78da data/tfmg/recipes/sequenced_assembly/generator.json
1ec9510103d905de21001b87c64f4d4db0a9299f data/tfmg/recipes/sequenced_assembly/heavy_plate.json
5813e728507b3c3e11868f8e8ea7771f002ca54b data/tfmg/recipes/sequenced_assembly/motor.json
0d1909f56645fd3ed9f2cb8d45fb3bebf1ae048c data/tfmg/recipes/sequenced_assembly/motor.json
6943441658b1aa9175e6dce859896609b2d7aa28 data/tfmg/recipes/sequenced_assembly/potentiometer.json
fa180f8f12a0e27125b0eae636afdd7c0309b1be data/tfmg/recipes/sequenced_assembly/steel_mechanism.json
70be470bb0b72de21713f1c0e08a529780a199c0 data/tfmg/recipes/sequenced_assembly/transistor.json

View File

@@ -1,4 +1,4 @@
// 1.20.1 2025-05-25T16:45:33.7046035 TFMG's Recipes
// 1.20.1 2025-06-02T00:04:37.217711 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
@@ -267,6 +267,7 @@ d7175bb0b6e8a62b9fcf97329c5ee4ecb54be7fb data/tfmg/advancements/recipes/misc/cra
08541d155ce5b2268bd93a382107380f38e1543c data/tfmg/advancements/recipes/misc/crafting/kinetics/transmission.json
519c17270631a55f44b319e4322cfabdcaac7720 data/tfmg/advancements/recipes/misc/crafting/kinetics/turbine_engine.json
12a11c54fbc8ab63328d286b4ed7b5497c770983 data/tfmg/advancements/recipes/misc/crafting/kinetics/turbo.json
f3b909bbe91328da029554fedfe999fa4fb6be79 data/tfmg/advancements/recipes/misc/crafting/kinetics/unfinished_electromagnetic_coil.json
d65e511c99cd724b482cbdb879d8e07a252dc5b6 data/tfmg/advancements/recipes/misc/crafting/kinetics/unfinished_resistor.json
065c3d69c24697e32fbc6205f0c66357345863e6 data/tfmg/advancements/recipes/misc/crafting/kinetics/unfinished_resistorfrom_slime.json
206cfd8ea696578a3eb3d2530f80687d7eeb6236 data/tfmg/advancements/recipes/misc/crafting/kinetics/voltage_observer.json
@@ -296,11 +297,14 @@ fa176d9914b0268f3dc2bff1471f7724c5f9ec44 data/tfmg/recipes/blasting/lead_ingot_b
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
cb579a4ab0ff4bc8d843e78fe3ec0f5b3267d0ee data/tfmg/recipes/casting/cinderblock.json
b8046892f4b2e40ef25f4d7f6e6be5d6cc02ee70 data/tfmg/recipes/casting/plastic_sheet.json
4ca0426d93219655bbff0c359a5cc9c3ea9201ff data/tfmg/recipes/casting/silicon.json
02ad3d1f8c3fa29349d2a48216146b05e30f2060 data/tfmg/recipes/casting/slag_block.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
7f965b40cda04e83d51b0e388b6e5a364f5affdb data/tfmg/recipes/crafting/kinetics/air_intake.json
e307ca2c1f76fc26b146363c744d2f0b6534f0c1 data/tfmg/recipes/crafting/kinetics/aluminum_axe.json
095e9a7f9523d026f360eea92718c9e462e1a222 data/tfmg/recipes/crafting/kinetics/aluminum_block_from_compacting.json
702c25f81a0e1b8217285b4d80e78407595c3ca2 data/tfmg/recipes/crafting/kinetics/aluminum_cable_hub.json
@@ -318,7 +322,7 @@ a9792957f7c086082a8cc1a69dfa84a05c5679dd data/tfmg/recipes/crafting/kinetics/alu
d7f1f4b18942932d33ae102bfbfbef6fcf09b3c8 data/tfmg/recipes/crafting/kinetics/aluminum_nugget_from_decompacting.json
f851bca643a34ee2960d75ee7f2a0ed5a58a31c7 data/tfmg/recipes/crafting/kinetics/aluminum_pickaxe.json
b50968d13ea80792b424912d41ce7f5291ecf0ba data/tfmg/recipes/crafting/kinetics/aluminum_pipe.json
647c83e5ef6f5649b5329f2f9d042bebf02feddb data/tfmg/recipes/crafting/kinetics/aluminum_pipe_vertical.json
8b3890ba35f79e0d0c066a97b6251f165bdbe72f 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
516b1ac568984a87a812b1fc23de8129efae5fe3 data/tfmg/recipes/crafting/kinetics/aluminum_spool.json
@@ -329,7 +333,7 @@ be183c532de69717b584f2df32c0c34538f80089 data/tfmg/recipes/crafting/kinetics/alu
0a8407c6c691dc2e2dc76d436c4b857660405b7b data/tfmg/recipes/crafting/kinetics/black_rebar_concrete.json
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
9e2ae069e8739df5ae797aa8873fa80ff7785862 data/tfmg/recipes/crafting/kinetics/blast_furnace_reinforcement.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
@@ -339,7 +343,7 @@ a64bdef677eb562a587374ce547a9d75558618f8 data/tfmg/recipes/crafting/kinetics/blu
b327af92d5acb5d780aad5f009b9cc7e8d077464 data/tfmg/recipes/crafting/kinetics/brass_frame.json
ec8aa0a8f7b350c9b361c95d7b6510faaf554975 data/tfmg/recipes/crafting/kinetics/brass_mechanical_pump.json
34e27bf918389302c5838949b58662333114d04a data/tfmg/recipes/crafting/kinetics/brass_pipe.json
34cab04bb83a2d47122ab08a0906c38f85d77c07 data/tfmg/recipes/crafting/kinetics/brass_pipe_vertical.json
fbf42ee2c1bc1917e14ee23e5a34523e661b9518 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
1b12f55387d82cf4ac731d3e8b323bbe4d5c1387 data/tfmg/recipes/crafting/kinetics/brick_smokestack.json
@@ -360,7 +364,7 @@ d7f6860a883070c7592b43ba5596da25a049031b data/tfmg/recipes/crafting/kinetics/cas
50576c57c194826b89a7589a0b90799da6e53fc0 data/tfmg/recipes/crafting/kinetics/cast_iron_mechanical_pump.json
3059491b99ac97a4cb08042d65afda8ffbb5f89f data/tfmg/recipes/crafting/kinetics/cast_iron_nugget_from_decompacting.json
157b4067c314545a46b49a66e20e010a95bdab25 data/tfmg/recipes/crafting/kinetics/cast_iron_pipe.json
c2d7c7de54bf566cc6fbe0c9ae9b41d456ebdadc data/tfmg/recipes/crafting/kinetics/cast_iron_pipe_vertical.json
9c816caa73f6998087b5a73dc83cda313bf3cc05 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
@@ -461,7 +465,7 @@ b78332d528e39fffa878bf90171bd48876ebcd1b data/tfmg/recipes/crafting/kinetics/met
75d572fecac2127a9bf4dd8a070c43fd77d13380 data/tfmg/recipes/crafting/kinetics/modern_light.json
514d64001949b548450cf811e94cccc966257139 data/tfmg/recipes/crafting/kinetics/multimeter.json
fe4c2b992eb08744551e4cf5339cf8e916adacaf data/tfmg/recipes/crafting/kinetics/napalm_bomb.json
88bbbcd291403c02924fa5d57877789b55d248e2 data/tfmg/recipes/crafting/kinetics/neon_tube.json
53dc3fc753cf41882857173bdb05e6084da35dbf data/tfmg/recipes/crafting/kinetics/neon_tube.json
b6a20b2a85231dfa01cac33b283d0dd431fb4819 data/tfmg/recipes/crafting/kinetics/nickel_block_from_compacting.json
e8e39a368fe762182212c818548b730bc62b4ddf data/tfmg/recipes/crafting/kinetics/nickel_flywheel.json
d4bac0335e3c6ef10dc23bfef61ed15b947a86b7 data/tfmg/recipes/crafting/kinetics/nickel_frame.json
@@ -481,7 +485,7 @@ c8cc1bb1c54789e4c3810b9ca98f7612c04c6768 data/tfmg/recipes/crafting/kinetics/pip
6baa5a2cf3d322ee9842afbfce5aa76fe3260631 data/tfmg/recipes/crafting/kinetics/plastic_fluid_valve.json
4cbf466888d7e59cfccfe80a63b65cc042ccd889 data/tfmg/recipes/crafting/kinetics/plastic_mechanical_pump.json
88ff42985773a64f07856e9fae2fccfbbd4485f9 data/tfmg/recipes/crafting/kinetics/plastic_pipe.json
c23f42c06a7af486c3026535f8706cab0bf5b235 data/tfmg/recipes/crafting/kinetics/plastic_pipe_vertical.json
7be2b11ddffb26c9dfe9e6ec388f4da57cfc937b 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
de85eb1e5a49cf14f33cecb8b8960df66c02bf34 data/tfmg/recipes/crafting/kinetics/polarizer.json
@@ -520,7 +524,7 @@ fc5ce9454a8464e5264d0b4f1696c01e4953aebf data/tfmg/recipes/crafting/kinetics/red
09c4631dcd8d1fc1e007132e0cfdef0ea0eb000b data/tfmg/recipes/crafting/kinetics/steel_boots.json
e8b6a2fd7c9c0050c6e75b746ddc302302f11b47 data/tfmg/recipes/crafting/kinetics/steel_cable_hub.json
1631ff9b2ed449f1057b5ff5cbcc5b1d222f9452 data/tfmg/recipes/crafting/kinetics/steel_casing_cable_hub.json
46cbaec07cbdf176d955da97e068a0a5393980c2 data/tfmg/recipes/crafting/kinetics/steel_chemical_vat.json
ce72c3681a8c430dd5136647b3d2c09633602cf0 data/tfmg/recipes/crafting/kinetics/steel_chemical_vat.json
aeae4be55074c4a2e1ce260ee09cf8d484bdbc13 data/tfmg/recipes/crafting/kinetics/steel_chestplate.json
344e41cb10455a1329bddfb2683c0d0a77b6b47f data/tfmg/recipes/crafting/kinetics/steel_cogwheel.json
da1c97a1168fbbfe644d85859fdfde98d5f0a10c data/tfmg/recipes/crafting/kinetics/steel_distillation_controller.json
@@ -540,7 +544,7 @@ b5663d1b346575425180164923cd03cf3c68b30f data/tfmg/recipes/crafting/kinetics/ste
f81ddce5df01c828b30f3b256986eda5ae406ca5 data/tfmg/recipes/crafting/kinetics/steel_nugget_from_decompacting.json
8456c034ee2cf2e6f856463f234d88f76dca4948 data/tfmg/recipes/crafting/kinetics/steel_pickaxe.json
f676614f0f6d938475a95d68cd42987e7d2bf546 data/tfmg/recipes/crafting/kinetics/steel_pipe.json
5353bdf2254915099d8e235e4558be6eb75a6d77 data/tfmg/recipes/crafting/kinetics/steel_pipe_vertical.json
8bc59cc36d3e06f88cfbe89a6760b94513858af0 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
3e23426519f6a57190eef8a97f95a45161543c65 data/tfmg/recipes/crafting/kinetics/steel_sword.json
@@ -553,10 +557,11 @@ a6bca70746588176a2fb37fbdde3c3e95988ed83 data/tfmg/recipes/crafting/kinetics/tra
c97a40119329b1f075ecb3eb4c64325ce62c64a5 data/tfmg/recipes/crafting/kinetics/transmission.json
7a93ec3833ac7d7709718442486cff899f870ace data/tfmg/recipes/crafting/kinetics/turbine_engine.json
f5984b5d3c82f4605f08a88d16aa2fdfec5482fb data/tfmg/recipes/crafting/kinetics/turbo.json
dc20e1047f6e2b7d653be4878117e991d764630f data/tfmg/recipes/crafting/kinetics/unfinished_electromagnetic_coil.json
f4b78d2293045114fdefb5b92c4d4bcc9bd26f29 data/tfmg/recipes/crafting/kinetics/unfinished_resistor.json
7c21eabc1576d80b5cf111306ff2859421a838b2 data/tfmg/recipes/crafting/kinetics/unfinished_resistorfrom_slime.json
6ca672214a0639fbc93502774aff5e5a60650018 data/tfmg/recipes/crafting/kinetics/voltage_observer.json
e2ec2eaf75166a30f3c9749e335c167793b54c14 data/tfmg/recipes/crafting/kinetics/voltmeter.json
74882b3c4ca4e1ec7c5188a06877ade4c9478044 data/tfmg/recipes/crafting/kinetics/voltmeter.json
5c740c1158f8cb1a928a1f79cd2eac2d13d80f1a data/tfmg/recipes/crafting/kinetics/white_concrete.json
eb0daeae165f64bfb8d33de5d48f82ee2c9546a2 data/tfmg/recipes/crafting/kinetics/white_multimeter.json
95a0c0882053843057d9d80b92d517738f44d4a3 data/tfmg/recipes/crafting/kinetics/white_rebar_concrete.json
@@ -581,12 +586,14 @@ da11d79db201bb9d1567bda1374e2648cf4c9d67 data/tfmg/recipes/industrial_blasting/s
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
90a58e0d9258bdb86cf87dc5a0c9fbe202b98155 data/tfmg/recipes/vat_machine_recipe/aluminum.json
ed10f72cf5298f2f4558091e8b9e0e6cc489ffa2 data/tfmg/recipes/vat_machine_recipe/arc_furnace_steel.json
acf59f5e8adce2bce3b3ef41ccba69da4b43d047 data/tfmg/recipes/vat_machine_recipe/concrete.json
a3e28ff6bd207b6706fcf281c54a218c8b92e49e data/tfmg/recipes/vat_machine_recipe/debug_5.json
fd950379c54876ace411e616a140cb1d478dd8e1 data/tfmg/recipes/vat_machine_recipe/concrete.json
9030f8ac9d020c52c90a73370b13851950c61481 data/tfmg/recipes/vat_machine_recipe/debug_5.json
3c27711ce60595c4b165b4a712d307bd3143c534 data/tfmg/recipes/vat_machine_recipe/etched_circuit_board.json
afb1fafe00c628a461094a864193a665bf24355d data/tfmg/recipes/vat_machine_recipe/naphtha.json
3912f2d5f01ed5da6ba98c948b4dd15d9a6b1c20 data/tfmg/recipes/vat_machine_recipe/neon.json
b4b8f407f0ad16a338d58a6c35381a59d02b527e data/tfmg/recipes/vat_machine_recipe/plastic_from_ethylene.json
3c5c5c0d7837afd9c60545c23274d0a82364da46 data/tfmg/recipes/vat_machine_recipe/plastic_from_propylene.json
78c16afe71eccff99d089074f388f9a42fcef9ed data/tfmg/recipes/vat_machine_recipe/sulfuric_acid.json
a41059765ad56b8c1a9b2b7fc24018928d884737 data/tfmg/recipes/vat_machine_recipe/plastic_from_ethylene.json
e0d228ab29e4b6054f4518adbd4cbf9935b012cb data/tfmg/recipes/vat_machine_recipe/plastic_from_propylene.json
091cadaa70039d60f36362cb2728cf0ffc29837e data/tfmg/recipes/vat_machine_recipe/rubber.json
09e29b7566577c4eacb8fd56764d3eba2b9fc536 data/tfmg/recipes/vat_machine_recipe/sulfuric_acid.json

View File

@@ -1,4 +1,4 @@
// 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)]
// 1.20.1 2025-06-02T00:04:37.1876081 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
45afc2cb1c4a18a7e6a2376578177aa3b50668c1 assets/tfmg/lang/en_ud.json
4fa1e7059a6184918773adf099a8e0407d627057 assets/tfmg/lang/en_us.json
b05484c150b66d277472632f6fef20013a2b22bd assets/tfmg/lang/en_ud.json
fb87388f7dcb25543963fd2c4fcab6bcf7095185 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
@@ -1060,6 +1060,7 @@ d3288be7ee67467134c7603b976fb02ac43373d3 assets/tfmg/models/item/aluminum_smart_
153b6d8b77344afcb5e6b509fbcab4b4d67a4723 assets/tfmg/models/item/aluminum_truss.json
3678ef091ea84638cde934ba7717be4843b55cc1 assets/tfmg/models/item/aluminum_wire.json
1e2f0ebb7ad85bdcd2d9578ad95dd0ddecbf3958 assets/tfmg/models/item/asphalt.json
fc36493d50593b89257b2184436b1397b4baa4c9 assets/tfmg/models/item/asphalt_mixture.json
8a8fa4346314945eaff5c779d77e258425d0d910 assets/tfmg/models/item/asphalt_slab.json
0c7dde6b90a3209509dfbc6599d3b920635fd0b5 assets/tfmg/models/item/asphalt_stairs.json
8fadae731be3ad6d131ba3be2c1a507b7af7d61b assets/tfmg/models/item/asphalt_wall.json
@@ -2591,7 +2592,7 @@ c6874308b457a286b5b01b46baa054247c73fb6b data/tfmg/recipes/red_rebar_concrete_sl
cefcd20280a2ebcf49b4a730d89794d665136088 data/tfmg/recipes/red_rebar_concrete_stairs_from_red_rebar_concrete_stonecutting.json
48c6ea40099351f50e7bf7e08c7f07e400599471 data/tfmg/recipes/red_rebar_concrete_wall_from_red_rebar_concrete_stonecutting.json
030409ba146d3f61aa25e1f61ec2aa7d83095027 data/tfmg/recipes/screw_from_ingots_steel_stonecutting.json
32d992f3eb502dea22209a643c148afd1ac9370e data/tfmg/recipes/slag_bricks_from_slag_block_stonecutting.json
a65d53057d31ef53fac7ae3d017a15aeebe48358 data/tfmg/recipes/slag_bricks_from_slag_block_stonecutting.json
703fab44a257920905370c614a4b55aeb168b65d data/tfmg/recipes/slag_bricks_slab_from_slag_bricks_stonecutting.json
988c79de50f867ee2320d504c69f28f8d92af104 data/tfmg/recipes/slag_bricks_stairs_from_slag_bricks_stonecutting.json
282e19f628d70c897ab903a5adb462d7d1e4955b data/tfmg/recipes/slag_bricks_wall_from_slag_bricks_stonecutting.json

View File

@@ -533,6 +533,7 @@
"create.goggles.distillation_tower.tank_not_found": "punoℲ ʇoN ʞuɐ⟘ pınןןǝǝʇS",
"create.goggles.electric_machine.no_power": "ɹǝʍoԀ oN",
"create.goggles.electricity.insufficient_voltage": "ǝbɐʇןoΛ ʇuǝıɔıɟɟnsuI",
"create.goggles.electrode_holder.min_amps": " spǝǝN( ʇuǝɹɹnƆ ɥbnouƎ ʇoN",
"create.goggles.engine.cooling_fluid": " :pınןℲ buıןooƆ",
"create.goggles.engine.fuel_consumption": ":uoıʇdɯnsuoƆ ןǝnℲ ",
"create.goggles.engine.header": "oɟuI ǝuıbuƎ",
@@ -556,6 +557,7 @@
"create.goggles.motor.usage": "ʇ/ǝɟ %1$s :ǝbɐs∩ ʎbɹǝuƎ",
"create.goggles.polarizer.charge": " :ǝbɹɐɥƆ",
"create.goggles.polarizer.header": "ɹǝzıɹɐןoԀ",
"create.goggles.polarizer.insufficient_power": ")M000ᄅ spǝǝN( ɹǝʍoԀ ɥbnouƎ ʇoN",
"create.goggles.pumpjack.deposit_info": ":oɟuI ʇısodǝᗡ",
"create.goggles.pumpjack.fluid_amount": ":ʇunoɯⱯ pınןℲ",
"create.goggles.pumpjack.part_missing": "buıssıW ʞuɐɹƆ ɹo ɹǝɯɯɐH",
@@ -578,7 +580,7 @@
"create.goggles.vat.tfmg.centrifuge": "ǝbnɟıɹʇuǝƆ ",
"create.goggles.vat.tfmg.electrode": "ǝpoɹʇɔǝןƎ ",
"create.goggles.vat.tfmg.graphite_electrode": "ǝpoɹʇɔǝןƎ ǝʇıɥdɐɹ⅁ ",
"create.goggles.vat.tfmg.mixer": "ɹǝxıW ",
"create.goggles.vat.tfmg.mixing": "ɹǝxıW ",
"create.goggles.voltmeter": ":ɹǝʇǝɯʇןoΛ",
"create.goggles.voltmeter.range": "%1$s :ǝbuɐᴚ ",
"create.goggles.winding_machine.header": "ǝuıɥɔɐW buıpuıM",
@@ -593,10 +595,12 @@
"create.multimeter.power_generated": " :pǝʇɐɹǝuǝ⅁ ɹǝʍoԀ ",
"create.multimeter.power_percentage": " :ɥʇbuǝɹʇS pıɹ⅁ ",
"create.multimeter.power_usage": " :ǝbɐs∩ ɹǝʍoԀ ",
"create.multimeter.transformer_ratio": " :oıʇɐᴚ uɹn⟘ ",
"create.multimeter.voltage_generated": " :pǝʇɐɹǝuǝ⅁ ǝbɐʇןoΛ ",
"create.network": "%1$s :ʞɹoʍʇǝN",
"create.pumpjack_deposit_amount": "sʇǝʞɔnᗺ %1$s",
"create.recipe.advanced_distillation": "uoıʇɐןןıʇsıᗡ pǝɔuɐʌpⱯ",
"create.recipe.assembly.winding": "%1$s puıM",
"create.recipe.casting": "buıʇsɐƆ",
"create.recipe.chemical_vat": "ʇɐΛ ןɐɔıɯǝɥƆ",
"create.recipe.coking": "buıʞoƆ",
@@ -681,6 +685,7 @@
"item.tfmg.aluminum_spool": "ןoodS ɯnuıɯnןⱯ",
"item.tfmg.aluminum_sword": "pɹoʍS ɯnuıɯnןⱯ",
"item.tfmg.aluminum_wire": "ǝɹıM ɯnuıɯnןⱯ",
"item.tfmg.asphalt_mixture": "ǝɹnʇxıW ʇןɐɥdsⱯ",
"item.tfmg.bauxite_powder": "ɹǝpʍoԀ ǝʇıxnɐᗺ",
"item.tfmg.bitumen": "uǝɯıᗺ",
"item.tfmg.black_multimeter": "ɹǝʇǝɯıʇןnW ʞɔɐןᗺ",

View File

@@ -533,6 +533,7 @@
"create.goggles.distillation_tower.tank_not_found": "Steel Fluid Tank Not Found",
"create.goggles.electric_machine.no_power": "No Power",
"create.goggles.electricity.insufficient_voltage": "Insufficient Voltage",
"create.goggles.electrode_holder.min_amps": "Not Enough Current (Needs ",
"create.goggles.engine.cooling_fluid": "Cooling Fluid: ",
"create.goggles.engine.fuel_consumption": " Fuel Consumption:",
"create.goggles.engine.header": "Engine Info",
@@ -556,6 +557,7 @@
"create.goggles.motor.usage": "Energy Usage: %1$s fe/t",
"create.goggles.polarizer.charge": "Charge: ",
"create.goggles.polarizer.header": "Polarizer",
"create.goggles.polarizer.insufficient_power": "Not Enough Power (Needs 2000W)",
"create.goggles.pumpjack.deposit_info": "Deposit Info:",
"create.goggles.pumpjack.fluid_amount": "Fluid Amount:",
"create.goggles.pumpjack.part_missing": "Hammer or Crank Missing",
@@ -578,7 +580,7 @@
"create.goggles.vat.tfmg.centrifuge": " Centrifuge",
"create.goggles.vat.tfmg.electrode": " Electrode",
"create.goggles.vat.tfmg.graphite_electrode": " Graphite Electrode",
"create.goggles.vat.tfmg.mixer": " Mixer",
"create.goggles.vat.tfmg.mixing": " Mixer",
"create.goggles.voltmeter": "Voltmeter:",
"create.goggles.voltmeter.range": " Range: %1$s",
"create.goggles.winding_machine.header": "Winding Machine",
@@ -593,10 +595,12 @@
"create.multimeter.power_generated": " Power Generated: ",
"create.multimeter.power_percentage": " Grid Strength: ",
"create.multimeter.power_usage": " Power Usage: ",
"create.multimeter.transformer_ratio": " Turn Ratio: ",
"create.multimeter.voltage_generated": " Voltage Generated: ",
"create.network": "Network: %1$s",
"create.pumpjack_deposit_amount": "%1$s Buckets",
"create.recipe.advanced_distillation": "Advanced Distillation",
"create.recipe.assembly.winding": "Wind %1$s",
"create.recipe.casting": "Casting",
"create.recipe.chemical_vat": "Chemical Vat",
"create.recipe.coking": "Coking",
@@ -681,6 +685,7 @@
"item.tfmg.aluminum_spool": "Aluminum Spool",
"item.tfmg.aluminum_sword": "Aluminum Sword",
"item.tfmg.aluminum_wire": "Aluminum Wire",
"item.tfmg.asphalt_mixture": "Asphalt Mixture",
"item.tfmg.bauxite_powder": "Bauxite Powder",
"item.tfmg.bitumen": "Bitumen",
"item.tfmg.black_multimeter": "Black Multimeter",

View File

@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "tfmg:item/asphalt_mixture"
}
}

View File

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

View File

@@ -1,6 +1,6 @@
{
"type": "forge:add_features",
"biomes": "#forge:is_desert",
"biomes": "#minecraft:is_nether",
"features": "tfmg:tfmg_striated_ores_nether",
"step": "underground_ores"
}

View File

@@ -0,0 +1,16 @@
{
"type": "tfmg:casting",
"ingredients": [
{
"amount": 144,
"fluid": "tfmg:liquid_concrete",
"nbt": {}
}
],
"processingTime": 50,
"results": [
{
"item": "tfmg:cinderblock"
}
]
}

View File

@@ -1,5 +1,5 @@
{
"type": "create:compacting",
"type": "tfmg:casting",
"ingredients": [
{
"amount": 200,
@@ -7,6 +7,7 @@
"nbt": {}
}
],
"processingTime": 100,
"results": [
{
"item": "tfmg:plastic_sheet"

View File

@@ -0,0 +1,16 @@
{
"type": "tfmg:casting",
"ingredients": [
{
"amount": 20,
"fluid": "tfmg:molten_slag",
"nbt": {}
}
],
"processingTime": 50,
"results": [
{
"item": "tfmg:slag_block"
}
]
}

View File

@@ -27,6 +27,7 @@
" B "
],
"result": {
"count": 3,
"item": "tfmg:air_intake"
},
"show_notification": true

View File

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

View File

@@ -2,6 +2,9 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"B": {
"item": "tfmg:fireproof_bricks"
},
"I": {
"tag": "forge:ingots/steel"
},
@@ -10,9 +13,9 @@
}
},
"pattern": [
" IO",
" IO",
" IO"
"IOB",
"IOB",
"IOB"
],
"result": {
"count": 4,

View File

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

View File

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

View File

@@ -5,7 +5,9 @@
"C": {
"tag": "forge:nuggets/copper"
},
"N": [],
"N": {
"item": "tfmg:neon_bucket"
},
"O": {
"tag": "forge:nuggets/steel"
},

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,22 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"M": {
"item": "tfmg:magnetic_alloy_ingot"
},
"N": {
"tag": "forge:nuggets/steel"
}
},
"pattern": [
" N ",
" M ",
" N "
],
"result": {
"count": 2,
"item": "tfmg:unfinished_electromagnetic_coil"
},
"show_notification": true
}

View File

@@ -3,7 +3,7 @@
"category": "misc",
"key": {
"A": {
"tag": "forge:ingots/aluminum"
"tag": "forge:ingots/steel"
},
"C": {
"item": "minecraft:compass"

View File

@@ -0,0 +1,18 @@
{
"type": "create:crushing",
"ingredients": [
{
"item": "tfmg:slag_block"
}
],
"results": [
{
"count": 2,
"item": "tfmg:slag"
},
{
"chance": 0.3,
"item": "tfmg:slag"
}
]
}

View File

@@ -12,6 +12,10 @@
"amount": 100,
"fluid": "tfmg:heavy_oil"
},
{
"amount": 25,
"fluid": "tfmg:lubrication_oil"
},
{
"amount": 50,
"fluid": "tfmg:diesel"
@@ -23,10 +27,6 @@
{
"amount": 5,
"fluid": "tfmg:naphtha"
},
{
"amount": 25,
"fluid": "tfmg:lubrication_oil"
}
]
}

View File

@@ -12,6 +12,10 @@
"amount": 100,
"fluid": "tfmg:heavy_oil"
},
{
"amount": 30,
"fluid": "tfmg:lubrication_oil"
},
{
"amount": 50,
"fluid": "tfmg:diesel"
@@ -19,10 +23,6 @@
{
"amount": 20,
"fluid": "tfmg:kerosene"
},
{
"amount": 30,
"fluid": "tfmg:lubrication_oil"
}
]
}

View File

@@ -2,7 +2,7 @@
"type": "tfmg:hot_blast",
"ingredients": [
{
"amount": 5,
"amount": 25,
"fluid": "tfmg:air",
"nbt": {}
},
@@ -14,11 +14,11 @@
"processingTime": 200,
"results": [
{
"amount": 5,
"amount": 25,
"fluid": "tfmg:hot_air"
},
{
"amount": 5,
"amount": 25,
"fluid": "tfmg:carbon_dioxide"
}
]

View File

@@ -14,7 +14,7 @@
"results": [
{
"count": 16,
"item": "tfmg:concrete_mixture"
"item": "tfmg:asphalt_mixture"
}
]
}

View File

@@ -14,7 +14,7 @@
"results": [
{
"count": 32,
"item": "tfmg:concrete_mixture"
"item": "tfmg:asphalt_mixture"
}
]
}

View File

@@ -2,7 +2,7 @@
"type": "create:mixing",
"ingredients": [
{
"item": "tfmg:concrete_mixture"
"item": "tfmg:asphalt_mixture"
},
{
"amount": 250,

View File

@@ -23,7 +23,7 @@
"type": "create:deploying",
"ingredients": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
},
{
"tag": "forge:plates/nickel"
@@ -31,7 +31,7 @@
],
"results": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
}
]
},
@@ -39,7 +39,7 @@
"type": "tfmg:winding",
"ingredients": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
},
{
"item": "tfmg:copper_spool"
@@ -48,7 +48,7 @@
"processingTime": 75,
"results": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
}
]
},
@@ -56,7 +56,7 @@
"type": "create:deploying",
"ingredients": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
},
{
"item": "tfmg:magnet"
@@ -64,7 +64,7 @@
],
"results": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
}
]
},
@@ -72,7 +72,7 @@
"type": "create:deploying",
"ingredients": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
},
{
"tag": "forge:plates/steel"
@@ -80,7 +80,7 @@
],
"results": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
}
]
},
@@ -88,7 +88,7 @@
"type": "create:deploying",
"ingredients": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
},
{
"item": "tfmg:steel_mechanism"
@@ -96,7 +96,7 @@
],
"results": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
}
]
},
@@ -104,7 +104,7 @@
"type": "create:deploying",
"ingredients": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
},
{
"item": "tfmg:screwdriver"
@@ -112,12 +112,12 @@
],
"results": [
{
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
}
]
}
],
"transitionalItem": {
"item": "tfmg:unfinished_generator"
"item": "tfmg:unfinished_electric_motor"
}
}

View File

@@ -1,6 +1,6 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"count": 4,
"ingredient": {
"item": "tfmg:slag_block"
},

View File

@@ -2,7 +2,6 @@
"type": "tfmg:vat_machine_recipe",
"allowedVatTypes": [
"tfmg:steel_vat",
"tfmg:cast_iron_vat",
"tfmg:firebrick_lined_vat"
],
"heatRequirement": "heated",

View File

@@ -2,7 +2,6 @@
"type": "tfmg:vat_machine_recipe",
"allowedVatTypes": [
"tfmg:steel_vat",
"tfmg:cast_iron_vat",
"tfmg:firebrick_lined_vat"
],
"ingredients": [

View File

@@ -2,7 +2,6 @@
"type": "tfmg:vat_machine_recipe",
"allowedVatTypes": [
"tfmg:steel_vat",
"tfmg:cast_iron_vat",
"tfmg:firebrick_lined_vat"
],
"ingredients": [

View File

@@ -0,0 +1,29 @@
{
"type": "tfmg:vat_machine_recipe",
"allowedVatTypes": [
"tfmg:steel_vat",
"tfmg:firebrick_lined_vat"
],
"heatRequirement": "heated",
"ingredients": [
{
"amount": 500,
"fluid": "tfmg:naphtha",
"nbt": {}
}
],
"machines": [
"tfmg:mixing"
],
"minSize": 1,
"results": [
{
"amount": 250,
"fluid": "tfmg:ethylene"
},
{
"amount": 250,
"fluid": "tfmg:propylene"
}
]
}

View File

@@ -2,7 +2,6 @@
"type": "tfmg:vat_machine_recipe",
"allowedVatTypes": [
"tfmg:steel_vat",
"tfmg:cast_iron_vat",
"tfmg:firebrick_lined_vat"
],
"heatRequirement": "heated",
@@ -13,7 +12,9 @@
"nbt": {}
}
],
"machines": [],
"machines": [
"tfmg:mixing"
],
"minSize": 1,
"results": [
{

View File

@@ -2,7 +2,6 @@
"type": "tfmg:vat_machine_recipe",
"allowedVatTypes": [
"tfmg:steel_vat",
"tfmg:cast_iron_vat",
"tfmg:firebrick_lined_vat"
],
"heatRequirement": "heated",
@@ -13,7 +12,9 @@
"nbt": {}
}
],
"machines": [],
"machines": [
"tfmg:mixing"
],
"minSize": 1,
"results": [
{

View File

@@ -0,0 +1,27 @@
{
"type": "tfmg:vat_machine_recipe",
"allowedVatTypes": [
"tfmg:steel_vat",
"tfmg:firebrick_lined_vat"
],
"heatRequirement": "heated",
"ingredients": [
{
"item": "tfmg:sulfur_dust"
},
{
"amount": 250,
"fluid": "tfmg:heavy_oil",
"nbt": {}
}
],
"machines": [
"tfmg:mixing"
],
"minSize": 1,
"results": [
{
"item": "tfmg:rubber_sheet"
}
]
}

View File

@@ -2,7 +2,6 @@
"type": "tfmg:vat_machine_recipe",
"allowedVatTypes": [
"tfmg:steel_vat",
"tfmg:cast_iron_vat",
"tfmg:firebrick_lined_vat"
],
"ingredients": [

View File

@@ -50,7 +50,7 @@
}
]
],
"weight": 2
"weight": 4
},
{
"max_size": 3,
@@ -179,7 +179,7 @@
}
]
],
"weight": 2
"weight": 5
},
{
"max_size": 3,

View File

@@ -68,12 +68,14 @@ public class TFMG {
TFMGPaletteBlocks.init();
TFMGParticleTypes.register(modEventBus);
TFMGCreativeTabs.register(modEventBus);
TFMGMobEffects.register(modEventBus);
TFMGRecipeTypes.register(modEventBus);
TFMGColoredFires.register(modEventBus);
TFMGFeatures.register(modEventBus);
TFMGMountedStorageTypes.register();
modEventBus.addListener(TFMG::onRegister);
TFMGPackets.registerPackets();

View File

@@ -1,5 +1,6 @@
package com.drmangotea.tfmg.content.decoration;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -11,7 +12,7 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.material.FluidState;
public class FrameBlock extends Block implements ProperWaterloggedBlock {
public class FrameBlock extends Block implements ProperWaterloggedBlock, IWrenchable {

View File

@@ -1,5 +1,6 @@
package com.drmangotea.tfmg.content.decoration;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
import com.simibubi.create.foundation.block.ProperWaterloggedBlock;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -17,7 +18,7 @@ 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 RotatedPillarBlock implements ProperWaterloggedBlock {
public class TrussBlock extends RotatedPillarBlock implements ProperWaterloggedBlock, IWrenchable {

View File

@@ -40,7 +40,6 @@ public class ElectricalNetwork {
int maxVoltage = 0;
int power = 0;
int frequency = 0;
int resistance = 0;
int powerGeneration = 0;
@@ -53,7 +52,6 @@ public class ElectricalNetwork {
maxVoltage = Math.max(member.voltageGeneration(), maxVoltage);
power += member.powerGeneration();
frequency = frequency == 0 ? member.frequencyGeneration() : (frequency + member.frequencyGeneration()) / 2;
resistance += (int) member.resistance();
powerGeneration += member.powerGeneration();
if (member.canBeInGroups())
@@ -75,7 +73,6 @@ public class ElectricalNetwork {
member.getData().setVoltageNextTick = true;
member.getData().networkPowerGeneration = powerGeneration;
member.setFrequency(frequency);
member.setNetworkResistance(resistance);
member.onNetworkChanged(oldVoltage, oldPower);

View File

@@ -17,6 +17,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.network.PacketDistributor;
import java.util.ArrayList;
import java.util.List;
public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity implements IElectric, IHaveGoggleInformation, IHaveHoveringInformation {
@@ -30,21 +31,19 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
public KineticElectricBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
data.connectNextTick = true;
if (!canBeInGroups()) {
data.group = new ElectricalGroup(-1);
}
}
//@Override
//public boolean addToTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
// CreateLang.text("MAX POWER: "+getNetworkPowerGeneration()).forGoggles(tooltip);
// return makeElectricityTooltip(tooltip, isPlayerSneaking);
//}
@Override
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
}
@Override
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {}
@Override
public LevelAccessor getLevelAccessor(){
public LevelAccessor getLevelAccessor() {
return level;
}
@@ -55,7 +54,7 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
@Override
public ElectricalNetwork getOrCreateElectricNetwork() {
if(level.getBlockEntity(BlockPos.of(data.electricalNetworkId)) instanceof IElectric) {
if (level.getBlockEntity(BlockPos.of(data.electricalNetworkId)) instanceof IElectric) {
return TFMG.NETWORK_MANAGER.getOrCreateNetworkFor((IElectric) level.getBlockEntity(BlockPos.of(data.electricalNetworkId)));
} else {
ElectricNetworkManager.networks.get(getLevel())
@@ -64,6 +63,18 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
}
}
@Override
public void lazyTick() {
super.lazyTick();
if (data.failTimer >= 4) {
this.blockFail();
data.failTimer = 0;
sendStuff();
} else if ((data.voltage > getMaxVoltage() && getMaxVoltage() > 0) || (getCurrent() > getMaxCurrent()&&getMaxCurrent()>0)) {
data.failTimer++;
}
}
@Override
public ElectricBlockValues getData() {
return data;
@@ -82,20 +93,20 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
int voltageGeneration = 0;
for(Direction direction : Direction.values()){
if(hasElectricitySlot(direction)){
for (Direction direction : Direction.values()) {
if (hasElectricitySlot(direction)) {
if(level.getBlockEntity(getBlockPos().relative(direction)) instanceof VoltageAlteringBlockEntity be)
if(be.getData().getId() !=getData().getId())
if(be.getData().getVoltage()!=0)
if(be.hasElectricitySlot(direction)){
voltageGeneration = Math.max(voltageGeneration,be.getOutputVoltage());
if (level.getBlockEntity(getBlockPos().relative(direction)) instanceof VoltageAlteringBlockEntity be)
if (be.getData().getId() != getData().getId())
if (be.getData().getVoltage() != 0)
if (be.hasElectricitySlot(direction)) {
voltageGeneration = Math.max(voltageGeneration, be.getOutputVoltage());
data.getsOutsidePower = true;
}
}
}
if(voltageGeneration == 0)
if (voltageGeneration == 0)
data.getsOutsidePower = false;
return voltageGeneration;
@@ -108,15 +119,21 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
int powerGeneration = 0;
for(Direction direction : Direction.values()){
if(hasElectricitySlot(direction)){
for (Direction direction : Direction.values()) {
if (hasElectricitySlot(direction)) {
if(level.getBlockEntity(getBlockPos().relative(direction)) instanceof VoltageAlteringBlockEntity be)
if(be.getData().getId() !=getData().getId())
if(be.getData().getVoltage()!=0)
if(be.hasElectricitySlot(direction)){
powerGeneration = Math.max(powerGeneration,be.getOutputPower())+10;
if (level.getBlockEntity(getBlockPos().relative(direction)) instanceof VoltageAlteringBlockEntity be&&be.canWork()) {
if (be.getData().getId() != getData().getId())
if (be.getData().getVoltage() != 0)
if (be.hasElectricitySlot(direction)) {
powerGeneration = Math.max(powerGeneration, be.getPowerUsage()) + 1;
if(powerGeneration>be.getNetworkPowerGeneration()) {
powerGeneration = 0;
be.data.updatePowerNextTick=true;
}
}
}
}
}
@@ -128,7 +145,6 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
return 0;
}
@Override
public void updateNextTick() {
data.updateNextTick = true;
@@ -137,7 +153,7 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
@Override
public void updateNetwork() {
getOrCreateElectricNetwork().updateNetwork();
if(!level.isClientSide)
if (!level.isClientSide)
TFMGPackets.getChannel().send(PacketDistributor.ALL.noArg(), new NetworkUpdatePacket(BlockPos.of(getPos())));
sendData();
}
@@ -150,8 +166,12 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
@Override
public void setVoltage(int newVoltage) {
if(canBeInGroups()){
data.voltage = (int) (((float)resistance()/data.group.resistance)*(float)data.voltageSupply);
//if(this instanceof LightBulbBlockEntity be&&be.color == DyeColor.WHITE){
// TFMG.LOGGER.debug("Rezistancja Grup "+data.group.resistance);
//}
if (canBeInGroups()) {
data.voltage = (int) (((float) resistance() / data.group.resistance) * (float) data.voltageSupply);
return;
}
data.voltage = newVoltage;
@@ -173,15 +193,19 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
}
@Override
public void setNetwork(long network) {
this.data.electricalNetworkId = network;
if(network!=getPos())
if (network != getPos())
ElectricNetworkManager.networks.get(getLevel())
.remove(getPos());
}
public boolean networkUndersupplied() {
return getNetworkPowerUsage() > data.networkPowerGeneration;
}
@Override
public long getPos() {
return getBlockPos().asLong();
@@ -190,6 +214,7 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
@Override
public void remove() {
super.remove();
this.data.destroyed = true;
for (Direction d : Direction.values()) {
if (hasElectricitySlot(d))
@@ -197,41 +222,51 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
ElectricNetworkManager.networks.get(getLevel())
.remove(be.getPos());
be.setNetwork(be.getPos());
be.getData().connectNextTick = true;
be.onPlaced();
be.updateNextTick();
}
}
if (data.electricalNetworkId != getPos())
getOrCreateElectricNetwork().getMembers().remove(this);
//
if (data.electricalNetworkId == getPos())
ElectricNetworkManager.networks.get(getLevel())
.remove(getData().getId());
}
@Override
public void lazyTick() {
super.lazyTick();
public void tick() {
super.tick();
if (data.checkForLoopsNextTick) {
getOrCreateElectricNetwork().checkForLoops(getBlockPos());
data.checkForLoopsNextTick = false;
}
if (data.connectNextTick) {
onPlaced();
data.connectNextTick = false;
}
if (data.updateNextTick) {
updateNetwork();
data.updateNextTick = false;
}
if(data.failTimer >=4){
this.blockFail();
data.failTimer = 0;
sendStuff();
if (data.updatePowerNextTick) {
updateUnpowered(new ArrayList<>());
data.updatePowerNextTick = false;
}
if((data.voltage>getMaxVoltage()&&getMaxVoltage()>0)||(getCurrent()>getMaxCurrent()&&getMaxCurrent()>0)){
data.failTimer++;
if (data.setVoltageNextTick) {
setVoltage(data.voltageSupply);
data.setVoltageNextTick = false;
}
}
@Override
protected void write(CompoundTag compound, boolean clientPacket) {
super.write(compound, clientPacket);
compound.putInt("GroupId", data.group.id);
compound.putFloat("GroupResistance", data.group.resistance);
compound.putFloat("MotorSpeed", getSpeed());
}
@Override
@@ -239,14 +274,11 @@ public class KineticElectricBlockEntity extends GeneratingKineticBlockEntity imp
super.read(compound, clientPacket);
data.group = new ElectricalGroup(compound.getInt("GroupId"));
data.group.resistance = compound.getFloat("GroupResistance");
setSpeed(compound.getFloat("MotorSpeed"));
if(!clientPacket)
if (!clientPacket)
data.connectNextTick = true;
}
@Override
public void onSpeedChanged(float previousSpeed) {
super.onSpeedChanged(previousSpeed);

View File

@@ -3,6 +3,7 @@ package com.drmangotea.tfmg.content.electricity.connection.cable_hub;
import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity;
import com.drmangotea.tfmg.content.electricity.base.IElectric;
import com.drmangotea.tfmg.registry.TFMGBlockEntities;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
import com.simibubi.create.foundation.block.IBE;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
@@ -10,7 +11,7 @@ import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
public class CableHubBlock extends Block implements IBE<CableHubBlockEntity> {
public class CableHubBlock extends Block implements IBE<CableHubBlockEntity>, IWrenchable {
public CableHubBlock(Properties p_49795_) {
super(p_49795_);
}

View File

@@ -239,7 +239,7 @@ public class CableConnectorBlockEntity extends ElectricBlockEntity implements IH
@Override
public AABB getRenderBoundingBox() {
return new AABB(getBlockPos()).inflate(10);
return new AABB(getBlockPos()).inflate(32);
}
}

View File

@@ -38,17 +38,17 @@ public class GeneratorBlockEntity extends KineticElectricBlockEntity {
public void updateNetwork() {
super.updateNetwork();
}
@Override
public float calculateStressApplied() {
if(getData().voltageSupply == 0)
return super.calculateStressApplied();
if(getNetworkResistance() ==0)
return super.calculateStressApplied();
return (int)(Math.min(super.calculateStressApplied()+(getGeneratorLoad() * 0.01f), 1000));
}
//
// @Override
// public float calculateStressApplied() {
// if(getData().voltageSupply == 0)
// return super.calculateStressApplied();
//
// if(getNetworkResistance() ==0)
// return super.calculateStressApplied();
//
// return (int)(Math.min(super.calculateStressApplied()+(getGeneratorLoad() * 0.01f), 1000));
// }
@Override
public void onSpeedChanged(float previousSpeed) {

View File

@@ -90,7 +90,7 @@ public class RotorBlockEntity extends KineticElectricBlockEntity {
@Override
public int powerGeneration() {
return generation() * 40;
return (int) (generation() * 40*1.84563);
}
public void findStators() {

View File

@@ -37,7 +37,7 @@ public class ElectricMotorBlockEntity extends KineticElectricBlockEntity {
public ElectricMotorBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
updateGeneratedRotation();
}
@Override

View File

@@ -0,0 +1,14 @@
package com.drmangotea.tfmg.content.electricity.utilities.polarizer;
import net.minecraft.world.item.Item;
public class MagnetItem extends Item {
public MagnetItem(Properties p_41383_) {
super(p_41383_);
}
@Override
public boolean isFireResistant() {
return true;
}
}

View File

@@ -66,7 +66,7 @@ public class PolarizerBlockEntity extends ElectricBlockEntity implements IHaveGo
if (getRecipe(itemStack).isPresent()) {
TFMGUtils.debugMessage(level, "AMOGUS SIGMA");
chargeCapacitors = true;
updateNextTick();
@@ -81,6 +81,8 @@ public class PolarizerBlockEntity extends ElectricBlockEntity implements IHaveGo
}
@Override
public float resistance() {
return chargeCapacitors ? 30 : 0;
@@ -90,6 +92,13 @@ public class PolarizerBlockEntity extends ElectricBlockEntity implements IHaveGo
@Override
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
if(getPowerUsage()<2000&&!inventory.isEmpty()){
CreateLang.translate("goggles.polarizer.insufficient_power")
.style(ChatFormatting.GRAY)
.forGoggles(tooltip, 1);
return true;
}
CreateLang.translate("goggles.polarizer.header")
.style(ChatFormatting.GRAY)
.forGoggles(tooltip, 1);
@@ -104,7 +113,7 @@ public class PolarizerBlockEntity extends ElectricBlockEntity implements IHaveGo
@Override
public boolean canBeInGroups() {
return true;
return false;
}
@Override
@@ -118,7 +127,7 @@ public class PolarizerBlockEntity extends ElectricBlockEntity implements IHaveGo
}
if (getPowerUsage() > 2000) {
if (getPowerUsage() >= 2000) {
if (chargeCapacitors) {
if (capacitorPercentage < 200) {
capacitorPercentage++;

View File

@@ -125,7 +125,7 @@ public class TransformerBlockEntity extends VoltageAlteringBlockEntity {
CreateLang.text("----------------------------")
.style(ChatFormatting.WHITE)
.forGoggles(tooltip);
CreateLang.translate("multimeter.transformer_ration")
CreateLang.translate("multimeter.transformer_ratio")
.add(CreateLang.number(coilRatio))
.color(0xc6e82c)
.forGoggles(tooltip, 1);

View File

@@ -99,7 +99,7 @@ public class FireboxBlockEntity extends SmartBlockEntity implements IHaveGoggleI
if (!wasRunning)
level.setBlock(getBlockPos(), getBlockState().setValue(FireboxBlock.HEAT_LEVEL, BlazeBurnerBlock.HeatLevel.FADING), 2);
running = true;
TFMGUtils.drainFilteredTank((SmartFluidTank) controller.tankInventory, 100);
TFMGUtils.drainFilteredTank((SmartFluidTank) controller.tankInventory, 50);
if (TFMGConfigs.common().machines.fireboxExhaustRequirement.get()) {
TFMGUtils.fillFilteredTank((SmartFluidTank) controller.exhuastTank, new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(), 500));
}

View File

@@ -1,5 +1,6 @@
package com.drmangotea.tfmg.content.machinery.misc.winding_machine;
import com.drmangotea.tfmg.TFMG;
import com.drmangotea.tfmg.base.TFMGUtils;
import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnection;
import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnectorBlockEntity;
@@ -123,9 +124,10 @@ public class SpoolItem extends Item {
float wireCost = (connection1.getLength()/8);
if(stack.getOrCreateTag().getInt("Amount")<wireCost)
return InteractionResult.PASS;
if(stack.getOrCreateTag().getInt("Amount")<wireCost*125) {
return InteractionResult.PASS;
}
if(be.connections.contains(connection1)||otherBE.connections.contains(connection1)){
if (level.isClientSide)
player.displayClientMessage(CreateLang.translateDirect("wires.connection_already_created")
@@ -135,11 +137,12 @@ public class SpoolItem extends Item {
be.setChanged();
return InteractionResult.SUCCESS;
}
if(!level.isClientSide) {
// if(!level.isClientSide) {
be.connections.add(connection1);
otherBE.connections.add(connection2);
be.onPlaced();
}
// otherBE.onPlaced();
//}
// connectedBe1.wiresUpdated();
stack.getOrCreateTag().putInt("Amount", (int) (stack.getOrCreateTag().getInt("Amount")-(wireCost*125)));

View File

@@ -33,7 +33,7 @@ public class DistillationControllerRenderer extends SafeBlockEntityRenderer<Dist
ms.pushPose();
CachedBuffers.partial(TFMGPartialModels.DISTILLATION_CONTROLLER_DIAL,blockState)
.center()
.rotateY(blockState.getValue(FACING).getAxis() == Direction.Axis.Z ? Math.abs(blockState.getValue(FACING).toYRot() - 180) : blockState.getValue(FACING).toYRot())
.rotateYDegrees(blockState.getValue(FACING).getAxis() == Direction.Axis.Z ? Math.abs(blockState.getValue(FACING).toYRot() - 180) : blockState.getValue(FACING).toYRot())
.translateY(0.01f)
.rotateZDegrees(be.angle.getValue(partialTicks))
.translateX(0.09f)

View File

@@ -133,6 +133,7 @@ public class PumpjackBaseBlockEntity extends SmartBlockEntity implements IHaveGo
if (tank.getFluidAmount() + miningRate > tank.getCapacity())
return;
int amountPumped = tank.fill(new FluidStack(TFMGFluids.CRUDE_OIL.getSource(), miningRate), IFluidHandler.FluidAction.EXECUTE);
sendData();
if (amountPumped == 0)
return;

View File

@@ -160,9 +160,13 @@ public class VatBlockEntity extends SmartBlockEntity implements IHaveGoggleInfor
int tankNumber = 0;
for (int i = 0; i < 8; i++) {
IFluidHandler fluidHandler = this.getCapability(ForgeCapabilities.FLUID_HANDLER).orElse(null);
fluidLevel[i].chase((double) (fluidHandler.getFluidInTank(tankNumber).getAmount()) / inputTank.getPrimaryHandler().getCapacity(), .5f, LerpedFloat.Chaser.EXP);
getFillState();
tankNumber++;
if(fluidHandler != null) {
fluidLevel[i].chase((double) (fluidHandler.getFluidInTank(tankNumber).getAmount()) / inputTank.getPrimaryHandler().getCapacity(), .5f, LerpedFloat.Chaser.EXP);
getFillState();
tankNumber++;
}
}
}
}

View File

@@ -7,15 +7,19 @@ import com.drmangotea.tfmg.content.machinery.vat.base.VatBlock;
import com.drmangotea.tfmg.content.machinery.vat.base.VatBlockEntity;
import com.drmangotea.tfmg.registry.TFMGItems;
import com.drmangotea.tfmg.registry.TFMGPartialModels;
import com.simibubi.create.foundation.utility.CreateLang;
import dev.engine_room.flywheel.lib.model.baked.PartialModel;
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.item.ItemStack;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.AABB;
import java.util.List;
import java.util.Objects;
public class ElectrodeHolderBlockEntity extends ElectricBlockEntity implements IVatMachine {
@@ -48,14 +52,26 @@ public class ElectrodeHolderBlockEntity extends ElectricBlockEntity implements I
return false;
}
@Override
public boolean makeMultimeterTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
super.makeMultimeterTooltip(tooltip, isPlayerSneaking);
if (getCurrent() < TFMGConfigs.common().machines.electrolysisMinimumCurrent.get())
CreateLang.translate("goggles.electrode_holder.min_amps")
.style(ChatFormatting.RED)
.add(CreateLang.text(TFMGConfigs.common().machines.electrolysisMinimumCurrent.get() + "A)"))
.forGoggles(tooltip);
return true;
}
@Override
public float resistance() {
if (electrodeType != ElectrodeType.NONE) {
if(electrodeType == ElectrodeType.GRAPHITE) {
if (electrodeType == ElectrodeType.GRAPHITE) {
return 300;
}else return 100;
} else return 100;
}
return 0;
@@ -87,9 +103,8 @@ public class ElectrodeHolderBlockEntity extends ElectricBlockEntity implements I
}
boolean isOperational() {
return getCurrent() >= TFMGConfigs.common().machines.electrolysisMinimumCurrent.get()&&canWork();
return getCurrent() >= TFMGConfigs.common().machines.electrolysisMinimumCurrent.get() && canWork();
}
@Override
@@ -119,7 +134,6 @@ public class ElectrodeHolderBlockEntity extends ElectricBlockEntity implements I
public String getOperationId() {
return switch (electrodeType) {
case NONE -> "";

View File

@@ -40,6 +40,7 @@ import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.common.crafting.conditions.ICondition;
import net.minecraftforge.common.crafting.conditions.ModLoadedCondition;
import net.minecraftforge.common.crafting.conditions.NotCondition;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.ArrayList;
import java.util.HashMap;
@@ -335,7 +336,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("PIP")
.pattern(" ")),
STEEL_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0)).withSuffix("_vertical")
STEEL_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.STEEL).get(0)).withSuffix("_vertical").returns(4)
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShaped(b -> b
.define('I', steelIngot())
@@ -375,7 +376,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("PIP")
.pattern(" ")),
ALUMINUM_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0)).withSuffix("_vertical")
ALUMINUM_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.ALUMINUM).get(0)).withSuffix("_vertical").returns(4)
.unlockedBy(TFMGItems.ALUMINUM_INGOT::get)
.viaShaped(b -> b
.define('I', aluminumIngot())
@@ -414,7 +415,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("III")
.pattern(" ")),
PLASTIC_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0)).withSuffix("_vertical")
PLASTIC_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.PLASTIC).get(0)).withSuffix("_vertical").returns(4)
.unlockedBy(TFMGItems.PLASTIC_SHEET::get)
.viaShaped(b -> b
.define('I', plasticSheet())
@@ -453,7 +454,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("PIP")
.pattern(" ")),
BRASS_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0)).withSuffix("_vertical")
BRASS_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.BRASS).get(0)).withSuffix("_vertical").returns(4)
.unlockedBy(AllItems.BRASS_INGOT::get)
.viaShaped(b -> b
.define('I', brassIngot())
@@ -493,7 +494,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("PIP")
.pattern(" ")),
CAST_IRON_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0)).withSuffix("_vertical")
CAST_IRON_PIPE_VERTICAL = create(TFMGPipes.TFMG_PIPES.get(TFMGPipes.PipeMaterial.CAST_IRON).get(0)).withSuffix("_vertical").returns(4)
.unlockedBy(TFMGItems.CAST_IRON_INGOT::get)
.viaShaped(b -> b
.define('I', castIronIngot())
@@ -597,7 +598,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("NNN")
.pattern("PPP")),
STEEL_VAT = create(TFMGBlocks.STEEL_CHEMICAL_VAT)
STEEL_VAT = create(TFMGBlocks.STEEL_CHEMICAL_VAT).returns(2)
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShaped(b -> b
.define('T', steelTank())
@@ -629,6 +630,15 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("NTN")
.pattern("PHP")),
UNFINISHED_ELECTROMAGNETIC_COIL = create(TFMGItems.UNFINISHED_ELECTROMAGNETIC_COIL).returns(2)
.unlockedBy(TFMGItems.STEEL_INGOT::get)
.viaShaped(b -> b
.define('M', magneticIngot())
.define('N', steelNugget())
.pattern(" N ")
.pattern(" M ")
.pattern(" N ")),
RAW_LEAD_BLOCK = create(TFMGBlocks.RAW_LEAD_BLOCK)
.unlockedBy(TFMGItems.RAW_LEAD::get)
.viaShaped(b -> b
@@ -653,7 +663,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.pattern("BBB")
.pattern("BBB")),
AIR_INTAKE = create(TFMGBlocks.AIR_INTAKE)
AIR_INTAKE = create(TFMGBlocks.AIR_INTAKE).returns(3)
.unlockedBy(AllItems.PROPELLER::get)
.viaShaped(b -> b
.define('B', AllBlocks.ANDESITE_BARS)
@@ -755,7 +765,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.viaShaped(b -> b
.define('C', copperNugget())
.define('W', framedGlass())
.define('N', TFMGFluids.NEON.getBucket().get())
.define('N', ForgeRegistries.ITEMS.getValue(TFMG.asResource("neon_bucket")))
.define('O', steelNugget())
.pattern("OCO")
.pattern("NWN")
@@ -870,7 +880,7 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.viaShaped(b -> b
.define('M', magnet())
.define('N', steelNugget())
.define('A', aluminumIngot())
.define('A', steelIngot())
.define('C', Items.COMPASS)
.pattern("NNN")
.pattern("NCN")
@@ -1687,9 +1697,10 @@ public class TFMGStandardRecipeGen extends TFMGRecipeProvider {
.viaShaped(b -> b
.define('O', heavyPlate())
.define('I', steelIngot())
.pattern(" IO")
.pattern(" IO")
.pattern(" IO")),
.define('B', fireproofBricks())
.pattern("IOB")
.pattern("IOB")
.pattern("IOB")),
FIREPROOF_BRICK_REINFORCEMENT = create(TFMGBlocks.FIREPROOF_BRICK_REINFORCEMENT).returns(6)
.unlockedBy(TFMGBlocks.FIREPROOF_BRICKS::get)

View File

@@ -16,10 +16,6 @@ public class TFMGCompactingRecipeGen extends TFMGPressingRecipeGen {
.output(bitumen(), 1)
.requiresHeat(HeatCondition.HEATED)
),
PLASTIC_SHEET = create("plastic_sheet", b -> b
.require(liquidPlastic(),200)
.output(plasticSheet(), 1)
),
CINDERFLOURBLOCK = create("cinderflourblock", b -> b
.require(cinderFlour())
.require(cinderFlour())

View File

@@ -29,6 +29,10 @@ public class TFMGCrushingRecipeGen extends TFMGProcessingRecipeGen {
LIMESAND = create(I::limestone, b -> b
.output(limesand(), 1)
),
SLAG = create(TFMGBlocks.SLAG_BLOCK::get, b -> b
.output(slag(), 2)
.output(.3f,slag())
),
COAL_COKE = create(I::coalCoke, b -> b
.output(coalCokeDust(), 1)
),

View File

@@ -37,14 +37,14 @@ public class TFMGMixingRecipeGen extends TFMGProcessingRecipeGen {
.require(sand())
.require(bitumen())
.require(gravel())
.output(concreteMixture(),16)
.output(asphaltMixture(),16)
),
ASPHALT_MIXTURE_FROM_SLAG = create("asphalt_mixture_from_slag", b -> b
.require(slag())
.require(bitumen())
.require(gravel())
.output(concreteMixture(),32)
.output(asphaltMixture(),32)
),
CONCRETE_MIXTURE = create("concrete_mixture", b -> b

View File

@@ -87,7 +87,7 @@ public class TFMGSequencedAssemblyRecipeGen extends CreateRecipeProvider {
),
MOTOR = create("motor", b -> b.require(shaft())
.transitionTo(TFMGItems.UNFINISHED_GENERATOR.get())
.transitionTo(TFMGItems.UNFINISHED_ELECTRIC_MOTOR.get())
.addOutput(TFMGBlocks.ELECTRIC_MOTOR.get(), 120)
.addOutput(TFMGBlocks.STEEL_CASING.get(), 8)
.addOutput(TFMGItems.NICKEL_SHEET.get(), 8)

View File

@@ -1,6 +1,7 @@
package com.drmangotea.tfmg.datagen.recipes.values.tfmg;
import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen;
import com.drmangotea.tfmg.registry.TFMGBlocks;
import com.drmangotea.tfmg.registry.TFMGFluids;
import com.drmangotea.tfmg.registry.TFMGItems;
import com.drmangotea.tfmg.registry.TFMGRecipeTypes;
@@ -15,10 +16,27 @@ public class CastingRecipeGen extends TFMGProcessingRecipeGen {
.output(TFMGItems.STEEL_INGOT)
.duration(200)),
PLASTIC_SHEET = create("plastic_sheet", b ->b
.require(TFMGFluids.MOLTEN_PLASTIC.get(),200)
.output(TFMGItems.PLASTIC_SHEET)
.duration(100)),
SLAG_BLOCK = create("slag_block", b ->b
.require(TFMGFluids.MOLTEN_SLAG.get(),20)
.output(TFMGBlocks.SLAG_BLOCK)
.duration(50)),
CINDERBLOCK = create("cinderblock", b ->b
.require(TFMGFluids.LIQUID_CONCRETE.get(),144)
.output(TFMGItems.CINDERBLOCK)
.duration(50)),
SILICON = create("silicon", b ->b
.require(TFMGFluids.LIQUID_SILICON.get(),144)
.output(TFMGItems.SILICON_INGOT)
.duration(200));
;
public CastingRecipeGen(PackOutput output) {
super(output);

View File

@@ -35,17 +35,17 @@ public class DistillationRecipeGen extends TFMGProcessingRecipeGen {
HEAVY_OIL = create("heavy_oil", b ->b
.require(heavyOil(),200)
.output(heavyOil(), 100)
.output(lubricationOil(), 25)
.output(diesel(), 50)
.output(kerosene(), 20)
.output(naphtha(), 5)
.output(lubricationOil(), 25)),
.output(naphtha(), 5)),
HEAVY_OIL_NO_NAPHTHA = create("heavy_oil_no_naphtha", b ->b
.require(heavyOil(),200)
.output(heavyOil(), 100)
.output(lubricationOil(), 30)
.output(diesel(), 50)
.output(kerosene(), 20)
.output(lubricationOil(), 30)),
.output(kerosene(), 20)),
HEAVY_OIL_LIGHT_DISTILLATION = create("heavy_oil_light_distillation", b ->b
.require(heavyOil(),200)

View File

@@ -13,10 +13,10 @@ public class HotBlastRecipeGen extends TFMGProcessingRecipeGen {
HOT_AIR = create("hot_air", b ->b
.require(air(),5)
.require(air(),25)
.require(TFMGTags.TFMGFluidTags.BLAST_STOVE_FUEL.tag,5)
.output(hotAir(), 5)
.output(carbonDioxide(), 5)
.output(hotAir(), 25)
.output(carbonDioxide(), 25)
.duration(200));
public HotBlastRecipeGen(PackOutput output) {
super(output);

View File

@@ -51,16 +51,31 @@ public class VatRecipeGen extends TFMGRecipeProvider {
.require(nitrateDust())
.output(sulfuricAcid(), 500)
,mixing()),
RUBBER = createVatRecipe("rubber", b -> (VatMachineRecipeBuilder) b
.require(heavyOil(), 250)
.require(sulfurDust())
.output(rubber())
.requiresHeat(HeatCondition.HEATED)
,mixing()),
NAPHTHA = createVatRecipe("naphtha", b -> (VatMachineRecipeBuilder) b
.require(naphtha(), 500)
.output(ethylene(), 250)
.output(propylene(), 250)
.requiresHeat(HeatCondition.HEATED)
,mixing()),
PLASTIC_FROM_ETHYLENE = createVatRecipe("plastic_from_ethylene", b -> (VatMachineRecipeBuilder) b
.require(ethylene(), 500)
.output(liquidPlastic(), 500)
.requiresHeat(HeatCondition.HEATED)
,new VatRecipeParams()),
,mixing()),
PLASTIC_FROM_PROPYLENE = createVatRecipe("plastic_from_propylene", b -> (VatMachineRecipeBuilder) b
.require(propylene(), 500)
.output(liquidPlastic(), 500)
.requiresHeat(HeatCondition.HEATED)
,new VatRecipeParams()),
,mixing()),
ETCHED_CIRCUIT_BOARD = createVatRecipe("etched_circuit_board", b -> (VatMachineRecipeBuilder) b
.require(TFMGItems.COATED_CIRCUIT_BOARD)
.require(TFMGFluids.SULFURIC_ACID.getSource(), 250)
@@ -104,12 +119,18 @@ public class VatRecipeGen extends TFMGRecipeProvider {
VatRecipeParams params = new VatRecipeParams();
params.machines.add("tfmg:electrode");
params.machines.add("tfmg:electrode");
params.allowedVatTypes = new ArrayList<>();
params.allowedVatTypes.add("tfmg:steel_vat");
params.allowedVatTypes.add("tfmg:firebrick_lined_vat");
return params;
}
public VatRecipeParams mixing() {
VatRecipeParams params = new VatRecipeParams();
params.machines.add("tfmg:mixing");
params.allowedVatTypes = new ArrayList<>();
params.allowedVatTypes.add("tfmg:steel_vat");
params.allowedVatTypes.add("tfmg:firebrick_lined_vat");
return params;
}

View File

@@ -3,6 +3,7 @@ package com.drmangotea.tfmg.recipes.jei;
import com.drmangotea.tfmg.TFMG;
import com.drmangotea.tfmg.recipes.*;
import com.drmangotea.tfmg.registry.TFMGBlocks;
import com.drmangotea.tfmg.registry.TFMGItems;
import com.drmangotea.tfmg.registry.TFMGRecipeTypes;
import com.simibubi.create.Create;
import com.simibubi.create.compat.jei.*;
@@ -96,6 +97,7 @@ public class TFMGJei implements IModPlugin {
casting = builder(CastingRecipe.class)
.addTypedRecipes(TFMGRecipeTypes.CASTING)
.catalyst(TFMGBlocks.CASTING_BASIN::get)
.catalyst(TFMGItems.STEEL_INGOT::get)
.itemIcon(TFMGBlocks.CASTING_BASIN.get())
.emptyBackground(177, 53)
.build("casting", CastingCategory::new),

View File

@@ -24,7 +24,7 @@ public class Polarizer extends AnimatedKinetics {
matrixStack.translate(-2.0, 18.0, 0.0);
int scale = 22;
GuiGameElement.of(TFMGBlocks.POLARIZER.getDefaultState().setValue(PolarizerBlock.FACING, Direction.NORTH)).rotateBlock(22.5, 22.5, 0.0).scale(scale).render(graphics);
GuiGameElement.of(TFMGBlocks.POLARIZER.getDefaultState().setValue(PolarizerBlock.FACING, Direction.SOUTH)).rotateBlock(22.5, 22.5, 0.0).scale(scale).render(graphics);
matrixStack.popPose();
}
}

View File

@@ -112,6 +112,7 @@ import com.drmangotea.tfmg.content.machinery.vat.base.VatBlock;
import com.drmangotea.tfmg.content.machinery.vat.base.VatGenerator;
import com.drmangotea.tfmg.content.machinery.vat.electrode_holder.ElectrodeHolderBlock;
import com.drmangotea.tfmg.content.machinery.vat.industrial_mixer.IndustrialMixerBlock;
import com.simibubi.create.AllMountedStorageTypes;
import com.simibubi.create.AllTags;
import com.simibubi.create.api.stress.BlockStressValues;
import com.simibubi.create.content.contraptions.bearing.StabilizedBearingMovementBehaviour;
@@ -122,6 +123,7 @@ import com.simibubi.create.content.decoration.encasing.CasingBlock;
import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour;
import com.simibubi.create.content.decoration.encasing.EncasingRegistry;
import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock;
import com.simibubi.create.content.fluids.tank.FluidTankMovementBehavior;
import com.simibubi.create.content.kinetics.gearbox.GearboxBlock;
import com.simibubi.create.content.kinetics.motor.CreativeMotorGenerator;
import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockModel;
@@ -149,6 +151,7 @@ import static com.drmangotea.tfmg.TFMG.REGISTRATE;
import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.*;
import static com.drmangotea.tfmg.content.electricity.lights.LightBulbBlock.LIGHT;
import static com.simibubi.create.api.behaviour.movement.MovementBehaviour.movementBehaviour;
import static com.simibubi.create.api.contraption.storage.fluid.MountedFluidStorageType.mountedFluidStorage;
import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock;
import static com.simibubi.create.foundation.data.BlockStateGen.simpleCubeAll;
import static com.simibubi.create.foundation.data.CreateRegistrate.casingConnectivity;
@@ -244,6 +247,8 @@ public class TFMGBlocks {
.properties(BlockBehaviour.Properties::noOcclusion)
.properties(p -> p.isRedstoneConductor((p1, p2, p3) -> true))
.transform(pickaxeOnly())
.transform(mountedFluidStorage(TFMGMountedStorageTypes.TFMG_FLUID_TANK))
.onRegister(movementBehaviour(new FluidTankMovementBehavior()))
.blockstate(new TFMGTankGenerator()::generate)
.onRegister(CreateRegistrate.blockModel(() -> AluminumFluidTankModel::standard))
.addLayer(() -> RenderType::cutoutMipped)
@@ -256,6 +261,8 @@ public class TFMGBlocks {
.initialProperties(SharedProperties::copperMetal)
.properties(p -> p.sound(SoundType.METAL))
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(mountedFluidStorage(TFMGMountedStorageTypes.TFMG_FLUID_TANK))
.onRegister(movementBehaviour(new FluidTankMovementBehavior()))
.properties(p -> p.isRedstoneConductor((p1, p2, p3) -> true))
.transform(pickaxeOnly())
.blockstate(new TFMGTankGenerator()::generate)
@@ -267,7 +274,6 @@ public class TFMGBlocks {
.register();
//------------------DISTILLATION_TOWER------------------//
@SuppressWarnings("'addLayer(java.util.function.Supplier<java.util.function.Supplier<net.minecraft.client.renderer.RenderType>>)' is deprecated and marked for removal ")
public static final BlockEntry<SteelTankBlock> STEEL_FLUID_TANK =
REGISTRATE.block("steel_fluid_tank", SteelTankBlock::regular)
.initialProperties(SharedProperties::copperMetal)
@@ -276,6 +282,8 @@ public class TFMGBlocks {
.properties(p -> p.isRedstoneConductor((p1, p2, p3) -> true))
.transform(pickaxeOnly())
.blockstate(new TFMGTankGenerator()::generate)
.transform(mountedFluidStorage(TFMGMountedStorageTypes.TFMG_FLUID_TANK))
.onRegister(movementBehaviour(new FluidTankMovementBehavior()))
.onRegister(CreateRegistrate.blockModel(() -> SteelFluidTankModel::standard))
.addLayer(() -> RenderType::cutoutMipped)
.item(SteelTankItem::new)
@@ -696,6 +704,7 @@ public class TFMGBlocks {
.initialProperties(SharedProperties::softMetal)
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(pickaxeOnly())
.transform(TFMGStress.setImpact(4.0))
.blockstate(BlockStateGen.horizontalBlockProvider(true))
.item()
.transform(customItemModel())
@@ -881,7 +890,7 @@ public class TFMGBlocks {
.initialProperties(() -> Blocks.IRON_BLOCK)
.transform(pickaxeOnly())
.properties(BlockBehaviour.Properties::noOcclusion)
.transform(TFMGStress.setImpact(5.0f))
.transform(TFMGStress.setImpact(50.0f))
.blockstate(BlockStateGen.directionalBlockProvider(true))
.item()
.transform(customItemModel())
@@ -1202,7 +1211,7 @@ public class TFMGBlocks {
.transform(pickaxeOnly())
.properties(BlockBehaviour.Properties::noOcclusion)
.blockstate(BlockStateGen.axisBlockProvider(true))
.transform(TFMGStress.setImpact(10))
.transform(TFMGStress.setImpact(240))
.item()
.transform(customItemModel())
.register();
@@ -1675,7 +1684,7 @@ public class TFMGBlocks {
.strength(3.0F)
.requiresCorrectToolForDrops()
.sound(SoundType.CALCITE))
.recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.SLAG_BLOCK.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1))
.recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.SLAG_BLOCK.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 4))
.transform(pickaxeOnly())
.simpleItem()
.register();

View File

@@ -8,7 +8,7 @@ import com.drmangotea.tfmg.content.electricity.configuration_wrench.Electricians
import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnection;
import com.drmangotea.tfmg.content.electricity.debug.DebugCinderBlockItem;
import com.drmangotea.tfmg.content.electricity.measurement.MultimeterItem;
import com.drmangotea.tfmg.content.electricity.utilities.fuse_block.FuseItem;
import com.drmangotea.tfmg.content.electricity.utilities.polarizer.MagnetItem;
import com.drmangotea.tfmg.content.electricity.utilities.resistor.ResistorItem;
import com.drmangotea.tfmg.content.electricity.utilities.transformer.ElectromagneticCoilItem;
import com.drmangotea.tfmg.content.engines.CylinderItem;
@@ -123,16 +123,15 @@ public class TFMGItems {
STEEL_MECHANISM = REGISTRATE.item("steel_mechanism", Item::new).register(),
NITRATE_DUST = REGISTRATE.item("nitrate_dust", Item::new).register(),
CONCRETE_MIXTURE = REGISTRATE.item("concrete_mixture", Item::new).register(),
ASPHALT_MIXTURE = REGISTRATE.item("concrete_mixture", Item::new).register(),
ASPHALT_MIXTURE = REGISTRATE.item("asphalt_mixture", Item::new).register(),
MAGNETIC_ALLOY_INGOT = REGISTRATE.item("magnetic_alloy_ingot", Item::new).register(),
BAUXITE_POWDER = REGISTRATE.item("bauxite_powder", Item::new).register(),
MAGNET = REGISTRATE.item("magnet", Item::new).register(),
EMPTY_CIRCUIT_BOARD = REGISTRATE.item("empty_circuit_board", Item::new).register(),
EMPTY_CIRCUIT_BOARD = REGISTRATE.item("empty_circuit_board", Item::new).register(),
COATED_CIRCUIT_BOARD = REGISTRATE.item("coated_circuit_board", Item::new).register(),
ETCHED_CIRCUIT_BOARD = REGISTRATE.item("etched_circuit_board", Item::new).register(),
CIRCUIT_BOARD = REGISTRATE.item("circuit_board", Item::new).register(),
TRANSISTOR = REGISTRATE.item("transistor_item", Item::new).lang("Transistor")
.properties(p -> p.stacksTo(1)).register(),
TRANSISTOR = REGISTRATE.item("transistor_item", Item::new).lang("Transistor").register(),
CAPACITOR = REGISTRATE.item("capacitor_item", Item::new).lang("Capacitor").register(),
COPPER_SULFATE = REGISTRATE.item("copper_sulfate", Item::new).register(),
LITHIUM_CHARGE = REGISTRATE.item("lithium_charge", Item::new).register(),
@@ -177,6 +176,8 @@ public class TFMGItems {
TRANSMISSION = REGISTRATE.item("transmission", TransmissionItem::new)
.properties(p -> p.stacksTo(1))
.model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/transmission_model"))).register();
public static final ItemEntry<MagnetItem>
MAGNET = REGISTRATE.item("magnet", MagnetItem::new).register();
public static final ItemEntry<ResistorItem>
UNFINISHED_RESISTOR = REGISTRATE.item("unfinished_resistor", ResistorItem::new).register();

View File

@@ -0,0 +1,22 @@
package com.drmangotea.tfmg.registry;
import com.simibubi.create.api.contraption.storage.fluid.MountedFluidStorageType;
import com.simibubi.create.content.fluids.tank.storage.FluidTankMountedStorageType;
import com.tterrag.registrate.util.entry.RegistryEntry;
import java.util.function.Supplier;
import static com.drmangotea.tfmg.TFMG.REGISTRATE;
public class TFMGMountedStorageTypes {
public static final RegistryEntry<FluidTankMountedStorageType> TFMG_FLUID_TANK = simpleFluid("tfmg_fluid_tank", FluidTankMountedStorageType::new);
private static <T extends MountedFluidStorageType<?>> RegistryEntry<T> simpleFluid(String name, Supplier<T> supplier) {
return REGISTRATE.mountedFluidStorage(name, supplier).register();
}
public static void register() {
}
}

View File

@@ -33,7 +33,7 @@ public class TFMGBiomeModifiers {
public static void bootstrap(BootstapContext<BiomeModifier> ctx) {
HolderGetter<Biome> biomeLookup = ctx.lookup(Registries.BIOME);
HolderSet<Biome> isOverworld = biomeLookup.getOrThrow(BiomeTags.IS_OVERWORLD);
HolderSet<Biome> isNether = biomeLookup.getOrThrow(Tags.Biomes.IS_DESERT);
HolderSet<Biome> isNether = biomeLookup.getOrThrow(BiomeTags.IS_NETHER);
HolderSet<Biome> isDesert = biomeLookup.getOrThrow(BiomeTags.HAS_DESERT_PYRAMID);

View File

@@ -88,7 +88,7 @@ public class TFMGLayeredPatterns {
.inNether()
.layer(l -> l.weight(2)
.passiveBlock())
.layer(l -> l.weight(2)
.layer(l -> l.weight(4)
.block(TFMGBlocks.SULFUR.get())
.size(1, 2))
.layer(l -> l.weight(3)
@@ -108,7 +108,7 @@ public class TFMGLayeredPatterns {
.inNether()
.layer(l -> l.weight(2)
.passiveBlock())
.layer(l -> l.weight(2)
.layer(l -> l.weight(5)
.block(TFMGBlocks.FIRECLAY.get())
.size(1, 2))
.layer(l -> l.weight(3)

View File

@@ -58,6 +58,7 @@
"create.goggles.polarizer.header": "Polarizer",
"create.goggles.polarizer.charge": "Charge: ",
"create.goggles.polarizer.insufficient_power": "Not Enough Power (Needs 2000W)",
"create.goggles.electric_machine.no_power": "No Power",
"create.goggles.electricity.insufficient_voltage": "Insufficient Voltage",
@@ -79,6 +80,8 @@
"create.goggles.engine.pistons_missing": "Pistons Missing",
"create.goggles.engine.turbines_missing": "Turbines Missing",
"create.goggles.electrode_holder.min_amps": "Not Enough Current (Needs ",
"create.goggles.vat.header": "Chemical Vat",
"create.goggles.vat.attachments": "Attachments:",
"create.goggles.vat.contents": "Vat Contents:",
@@ -88,7 +91,7 @@
"create.goggles.vat.superheated": "Superheated",
"create.goggles.vat.tfmg.graphite_electrode": " Graphite Electrode",
"create.goggles.vat.tfmg.electrode": " Electrode",
"create.goggles.vat.tfmg.mixer": " Mixer",
"create.goggles.vat.tfmg.mixing": " Mixer",
"create.goggles.vat.tfmg.centrifuge": " Centrifuge",
@@ -117,6 +120,8 @@
"create.tooltip.cylinder": "Supported Fuels:",
"create.tooltip.fluid_item": "Fluid Amount: %1$s",
"create.recipe.assembly.winding": "Wind %1$s",
"create.recipe.distillation": "Distillation",
"create.recipe.advanced_distillation": "Advanced Distillation",
"create.recipe.industrial_blasting": "Industrial Blasting",
@@ -140,6 +145,7 @@
"create.multimeter.power_percentage": " Grid Strength: ",
"create.multimeter.energy_usage": " Energy Usage: ",
"create.multimeter.energy_stored": " Energy Stored: ",
"create.multimeter.transformer_ratio": " Turn Ratio: ",
"item.minecraft.potion.effect.hellfire_potion": "Potion of Hellfire",
"item.minecraft.splash_potion.effect.hellfire_potion": "Splash Potion of Hellfire",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 472 B

View File

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