From d5d66c900d923d53245bc360a39e9e8f5a040e93 Mon Sep 17 00:00:00 2001 From: PouffyDev <99536749+pouffy@users.noreply.github.com> Date: Wed, 9 Jul 2025 16:08:04 +0100 Subject: [PATCH] Recipe Changes/Additions - Moved the Coated Circuit Board recipe from Item Application to Deploying. (You can't Item Apply onto an Item) - Made TFMGCompactingRecipeGen extend TFMGProcessingRecipeGen instead of TFMGPressingRecipeGen. - All pipes now properly show in JEI and Creative. - Added group tags for some items that didn't have them. - Added Crushed Raw Lithium & Lithium crushing recipes. --- .../5b8c0f5df972d0059948e36f3c0712dca4487541 | 13 +++--- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 13 ++++-- .../resources/assets/tfmg/lang/en_ud.json | 1 + .../resources/assets/tfmg/lang/en_us.json | 1 + .../tfmg/models/item/crushed_raw_lithium.json | 6 +++ .../tags/items/crushed_raw_materials.json | 5 +++ .../data/forge/tags/items/dusts.json | 6 +++ .../data/forge/tags/items/ingots.json | 6 +++ .../data/forge/tags/items/nuggets.json | 11 +++++ .../data/forge/tags/items/plates.json | 9 ++++ .../data/forge/tags/items/wires.json | 7 +++ .../recipes/compacting/aluminum_ingot.json | 14 ------ .../recipes/compacting/cast_iron_ingot.json | 14 ------ .../tfmg/recipes/compacting/lead_ingot.json | 14 ------ .../tfmg/recipes/compacting/nickel_ingot.json | 14 ------ .../recipes/compacting/synthetic_leather.json | 14 ------ .../crushing/deepslate_lithium_ore.json | 26 ++++++++++++ .../tfmg/recipes/crushing/lithium_ore.json | 25 +++++++++++ .../tfmg/recipes/crushing/raw_lithium.json | 17 ++++++++ .../recipes/crushing/raw_lithium_block.json | 19 +++++++++ .../coated_circuit_board.json | 2 +- .../content/decoration/pipes/TFMGPipes.java | 16 ++++--- .../recipes/TFMGProcessingRecipeGen.java | 3 +- .../create/TFMGCompactingRecipeGen.java | 4 +- .../values/create/TFMGCrushingRecipeGen.java | 28 +++++++++++- .../values/create/TFMGDeployingRecipeGen.java | 29 +++++++++++++ .../create/TFMGItemApplicationRecipeGen.java | 8 ---- .../values/create/TFMGPressingRecipeGen.java | 2 +- .../drmangotea/tfmg/registry/TFMGItems.java | 40 +++++++++--------- .../textures/item/crushed_raw_lithium.png | Bin 0 -> 243 bytes 30 files changed, 248 insertions(+), 119 deletions(-) create mode 100644 src/generated/resources/assets/tfmg/models/item/crushed_raw_lithium.json create mode 100644 src/generated/resources/data/create/tags/items/crushed_raw_materials.json create mode 100644 src/generated/resources/data/forge/tags/items/dusts.json create mode 100644 src/generated/resources/data/forge/tags/items/ingots.json create mode 100644 src/generated/resources/data/forge/tags/items/nuggets.json create mode 100644 src/generated/resources/data/forge/tags/items/plates.json create mode 100644 src/generated/resources/data/forge/tags/items/wires.json delete mode 100644 src/generated/resources/data/tfmg/recipes/compacting/aluminum_ingot.json delete mode 100644 src/generated/resources/data/tfmg/recipes/compacting/cast_iron_ingot.json delete mode 100644 src/generated/resources/data/tfmg/recipes/compacting/lead_ingot.json delete mode 100644 src/generated/resources/data/tfmg/recipes/compacting/nickel_ingot.json delete mode 100644 src/generated/resources/data/tfmg/recipes/compacting/synthetic_leather.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/deepslate_lithium_ore.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/lithium_ore.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/raw_lithium.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/raw_lithium_block.json rename src/generated/resources/data/tfmg/recipes/{item_application => deploying}/coated_circuit_board.json (84%) create mode 100644 src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGDeployingRecipeGen.java create mode 100644 src/main/resources/assets/tfmg/textures/item/crushed_raw_lithium.png diff --git a/src/generated/resources/.cache/5b8c0f5df972d0059948e36f3c0712dca4487541 b/src/generated/resources/.cache/5b8c0f5df972d0059948e36f3c0712dca4487541 index 4eb4ab02..fe6b32d0 100644 --- a/src/generated/resources/.cache/5b8c0f5df972d0059948e36f3c0712dca4487541 +++ b/src/generated/resources/.cache/5b8c0f5df972d0059948e36f3c0712dca4487541 @@ -1,23 +1,23 @@ -// 1.20.1 2025-06-02T18:21:37.9498192 TFMG's Processing Recipes +// 1.20.1 2025-07-09T16:04:00.770188 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 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 -fd2a489b06d8ae7eea9635af3a74d773aaf60c25 data/tfmg/recipes/compacting/nickel_ingot.json -239785319ac742ebaf0d09127404310d68217732 data/tfmg/recipes/compacting/synthetic_leather.json f8f004cce2acbbf02207433e88df3e1f3d155053 data/tfmg/recipes/crushing/bauxite.json 6c8b2797938c86e8bf21508db782f19e6fa1c5d2 data/tfmg/recipes/crushing/coal_coke.json 45266f40ad082ae192242067acdd148fd738bb81 data/tfmg/recipes/crushing/copper_sulfate.json +0857149111f629739ad9bf9614db4f152901cd52 data/tfmg/recipes/crushing/deepslate_lithium_ore.json 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 +a8e3130eb7a1710aed487723b80e979dc0792fe7 data/tfmg/recipes/crushing/lithium_ore.json +dca0f0038c50981ce8a1c353741856b7b592068e data/tfmg/recipes/crushing/raw_lithium.json +d95d95710ffd322ba1248f8fd305c58c09f05c3c data/tfmg/recipes/crushing/raw_lithium_block.json 8a83ba25a8412f503d750c73dd8b5c5e9fdb063f data/tfmg/recipes/crushing/slag_block.json f218b0fa35bdb632066225082134f6ba297d49fb data/tfmg/recipes/crushing/sulfur.json +c4023ecc489f52b2b08eb6d8bdfdcea87a185a56 data/tfmg/recipes/deploying/coated_circuit_board.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 @@ -37,7 +37,6 @@ e9287ed78b8ddba564751a2974306eea83e77ab4 data/tfmg/recipes/filling/neon_tank.jso 83b959dcd319de129fbf76bd967d6d4c3ada9852 data/tfmg/recipes/filling/propylene_tank.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 56d6c4142fc71e87095e234f1123d14f08e7038d data/tfmg/recipes/mixing/asphalt_mixture.json diff --git a/src/generated/resources/.cache/e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 b/src/generated/resources/.cache/e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 index 5410a0a4..1f915e12 100644 --- a/src/generated/resources/.cache/e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 +++ b/src/generated/resources/.cache/e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 @@ -1,4 +1,4 @@ -// 1.20.1 2025-07-09T13:44:40.7657277 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-07-09T16:04:00.7541667 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 -357f4d6abeef0bde539d7075fea14bc2853eb121 assets/tfmg/lang/en_ud.json -4178184df5302698896a54d0d9d9eaef71340069 assets/tfmg/lang/en_us.json +5bf8ddfe0df80889f602316c9b4c41dd502750ae assets/tfmg/lang/en_ud.json +4fb0224e3539ba7862dd28afbd57bd3c9aea9475 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 @@ -1174,6 +1174,7 @@ ad22e8940129ab3a0601244b48387b1832bcb80e assets/tfmg/models/item/copycat_cable_b e90663032572b10fff3b45cdf2435211cb1ef05b assets/tfmg/models/item/creative_generator.json 0abf2b2d61995c4fd3e3c88656e740ffe0a2f083 assets/tfmg/models/item/creosote_bucket.json a79994155c228372c913d281a53b5c7303d5a8ee assets/tfmg/models/item/crude_oil_bucket.json +a2484a203f80efcc0bc630469ded2d8b408e8850 assets/tfmg/models/item/crushed_raw_lithium.json ad53ebb7bbb4567ba0bc948b6594c079d1050fb9 assets/tfmg/models/item/cut_bauxite.json eb80646f49d4c682fd21fb8054ed5b8427d9b554 assets/tfmg/models/item/cut_bauxite_bricks.json 7112aa744d3215a868decd72aa42adb62c4f0b66 assets/tfmg/models/item/cut_bauxite_brick_slab.json @@ -1612,6 +1613,7 @@ f89b8482c9709a46bb2161a70330596c2a723657 data/create/tags/blocks/fan_transparent 12ccc31f8e00edef9ceb5c3f23af8a4a2897b853 data/create/tags/items/casing.json 733eedc50a1e81b450633c52efdedf016d0af5fa data/create/tags/items/contraption_controlled.json dd1f4f2989edaecd2273411a846f47d0fbc69fbc data/create/tags/items/create_ingots.json +ded1913401f4b56ac3175be37bf30ffadab245c8 data/create/tags/items/crushed_raw_materials.json c4cd22d062b4e5471e0ff25690ba3a07f253e6ec data/forge/tags/blocks/concrete.json d2665ad28704027f558ced594fdf4566a9900a0d data/forge/tags/blocks/ores.json 0dee12a43ee8f732dcbbde658c237412715306cd data/forge/tags/blocks/ores/lead.json @@ -1675,8 +1677,10 @@ fdf3b8fdf1975b0eee671f428803caa4e17dc5bd data/forge/tags/items/buckets/naphtha.j 791b0c269e39301f39ca49195d9b0b64aa38675e data/forge/tags/items/buckets/propylene.json 7ea46c564e02bfa27b4e5847d7379a06633646f3 data/forge/tags/items/buckets/sulfuric_acid.json c4cd22d062b4e5471e0ff25690ba3a07f253e6ec data/forge/tags/items/concrete.json +4be4781148e3f8ddc5433509ff81a97f6bec143a data/forge/tags/items/dusts.json f1cc6d710a5e49ab33dbaceea796f0c0b589c82b data/forge/tags/items/dusts/coal_coke.json 1680fbeada809052df4b6b3669545f26f910b801 data/forge/tags/items/dusts/sulfur.json +c0131e24e685cf900e572d253f67e23eb96f0dad data/forge/tags/items/ingots.json 70e609465aa949ff4acc873fb19d4afc07f79aa1 data/forge/tags/items/ingots/aluminum.json 2da28c9441f79389929080f6f31da841bbee19e7 data/forge/tags/items/ingots/cast_iron.json fb19e0080a429f94e31248c2644063e766decc6d data/forge/tags/items/ingots/constantan.json @@ -1688,6 +1692,7 @@ ff4c520db3f2bb2b7f0e145e546447a67217f54a data/forge/tags/items/ingots/plastic.js 5ebaae9aae4f5ee54b9fccd128d202e3b33169f7 data/forge/tags/items/ingots/silicon.json db02fa414c4049eef32e5270451417518bbcec4b data/forge/tags/items/ingots/steel.json 6e765d685d327ab489f10f39e883f3feac27824e data/forge/tags/items/leather.json +b04514fba2122f9f96f2c85d795f03f7bb792ffe data/forge/tags/items/nuggets.json bce1eb237b24177298631df74e156c2513de2b2c data/forge/tags/items/nuggets/aluminum.json 7937b3b14b13d836a619d425918d3b4594ff53f2 data/forge/tags/items/nuggets/cast_iron.json 175588458a9cf48c7ced4318ba2ac90421009d52 data/forge/tags/items/nuggets/constantan.json @@ -1701,6 +1706,7 @@ d24579a31b2842ed918f938ad204e91ab405cc32 data/forge/tags/items/ores/lithium.json 4a4923c9c00653a98fb9b247ee5ac9191d7c2ede data/forge/tags/items/ores/nickel.json 94ba62223301585f0de8d7bee24c39cce84f6ae8 data/forge/tags/items/ores_in_ground/deepslate.json eefda4e96e7bc3a3c3c130eb5593a811b50255ce data/forge/tags/items/ores_in_ground/stone.json +f3ce36c8924067e41979217af1442178d7bf896b data/forge/tags/items/plates.json 94e25db7b89d3a7c6bd16051ab827e7d252d5dae data/forge/tags/items/plates/aluminum.json c925bfceef2c034d86c923d427bb12318bec9d57 data/forge/tags/items/plates/cast_iron.json 069748d745ddccbfefe61a406abd80da061216fa data/forge/tags/items/plates/lead.json @@ -1724,6 +1730,7 @@ c06711f911c6e48111c6441978c6185cc1ef8641 data/forge/tags/items/storage_blocks/ra a1f3c8498ccc83ea4a9015e4214c596753f58a81 data/forge/tags/items/storage_blocks/raw_nickel.json 37b1c9c3ae722d8110db48015993ede3e194c0a0 data/forge/tags/items/storage_blocks/steel.json d030bcdb3da4c37703a22037cc3a26830c7a9498 data/forge/tags/items/string.json +e3afbea07a938bb797c2a112aa1b66ce50433a72 data/forge/tags/items/wires.json ffb77323df69802d55e95d7fc30a45b3fbca8db8 data/forge/tags/items/wires/aluminum.json ccae2d221dc320981c331f4b8e07fe159176557a data/forge/tags/items/wires/constantan.json 863e668119b306cf119cb6a7a62a2d1e12bee1ff data/forge/tags/items/wires/copper.json diff --git a/src/generated/resources/assets/tfmg/lang/en_ud.json b/src/generated/resources/assets/tfmg/lang/en_ud.json index 718f4f9b..6031b2a1 100644 --- a/src/generated/resources/assets/tfmg/lang/en_ud.json +++ b/src/generated/resources/assets/tfmg/lang/en_ud.json @@ -752,6 +752,7 @@ "item.tfmg.crankshaft": "ʇɟɐɥsʞuɐɹƆ", "item.tfmg.creosote_bucket": "ʇǝʞɔnᗺ ǝʇosoǝɹƆ", "item.tfmg.crude_oil_bucket": "ʇǝʞɔnᗺ ןıO ǝpnɹƆ", + "item.tfmg.crushed_raw_lithium": "ɯnıɥʇıꞀ ʍɐᴚ pǝɥsnɹƆ", "item.tfmg.cyan_multimeter": "ɹǝʇǝɯıʇןnW uɐʎƆ", "item.tfmg.cyan_multimeter.tooltip.behaviour1": "dnoɹb sʇuǝuodɯoɔ ǝɥʇ ɥʇıʍ buoןɐ ʎןǝʌıʇɔǝdsǝɹ sʇʇɐʍoןıʞ puɐ sǝɹǝdɯɐ 'sʇןoʌ 'sɯɥo uı ɹǝʍod puɐ ʇuǝɹɹnɔ 'ǝbɐʇןoʌ 'ǝɔuɐʇsısǝɹ sʍoɥS", "item.tfmg.cyan_multimeter.tooltip.behaviour2": "uoıʇdɯnsuoɔ puɐ uoıʇɐɹǝuǝb ɹǝʍod ןɐʇoʇ sʞɹoʍʇǝu ǝɥʇ sʍoɥs ɹǝʇǝɯıʇןnɯ ǝɥʇ sʇɐʇs pǝuoıʇuǝɯ ʎןsnoıʌǝɹd ǝɥʇ oʇ ʎןןɐuoıʇıppⱯ", diff --git a/src/generated/resources/assets/tfmg/lang/en_us.json b/src/generated/resources/assets/tfmg/lang/en_us.json index df552941..5f2d05ac 100644 --- a/src/generated/resources/assets/tfmg/lang/en_us.json +++ b/src/generated/resources/assets/tfmg/lang/en_us.json @@ -752,6 +752,7 @@ "item.tfmg.crankshaft": "Crankshaft", "item.tfmg.creosote_bucket": "Creosote Bucket", "item.tfmg.crude_oil_bucket": "Crude Oil Bucket", + "item.tfmg.crushed_raw_lithium": "Crushed Raw Lithium", "item.tfmg.cyan_multimeter": "Cyan Multimeter", "item.tfmg.cyan_multimeter.tooltip.behaviour1": "Shows resistance, voltage, current and power in ohms, volts, amperes and kilowatts respectively along with the components group", "item.tfmg.cyan_multimeter.tooltip.behaviour2": "Additionally to the previously mentioned stats the multimeter shows the networks total power generation and consumption", diff --git a/src/generated/resources/assets/tfmg/models/item/crushed_raw_lithium.json b/src/generated/resources/assets/tfmg/models/item/crushed_raw_lithium.json new file mode 100644 index 00000000..247f9008 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/crushed_raw_lithium.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:item/crushed_raw_lithium" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/crushed_raw_materials.json b/src/generated/resources/data/create/tags/items/crushed_raw_materials.json new file mode 100644 index 00000000..04bd6a7a --- /dev/null +++ b/src/generated/resources/data/create/tags/items/crushed_raw_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:crushed_raw_lithium" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts.json b/src/generated/resources/data/forge/tags/items/dusts.json new file mode 100644 index 00000000..8e5f5a17 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts.json @@ -0,0 +1,6 @@ +{ + "values": [ + "tfmg:sulfur_dust", + "tfmg:coal_coke_dust" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json new file mode 100644 index 00000000..a723c57e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots.json @@ -0,0 +1,6 @@ +{ + "values": [ + "tfmg:rubber_sheet", + "tfmg:silicon_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/items/nuggets.json new file mode 100644 index 00000000..2aad330f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets.json @@ -0,0 +1,11 @@ +{ + "values": [ + "tfmg:aluminum_nugget", + "tfmg:steel_nugget", + "tfmg:cast_iron_nugget", + "tfmg:constantan_nugget", + "tfmg:lead_nugget", + "tfmg:nickel_nugget", + "tfmg:lithium_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates.json b/src/generated/resources/data/forge/tags/items/plates.json new file mode 100644 index 00000000..c00e47c2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/plates.json @@ -0,0 +1,9 @@ +{ + "values": [ + "tfmg:heavy_plate", + "tfmg:aluminum_sheet", + "tfmg:nickel_sheet", + "tfmg:cast_iron_sheet", + "tfmg:lead_sheet" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/wires.json b/src/generated/resources/data/forge/tags/items/wires.json new file mode 100644 index 00000000..5227ed37 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/wires.json @@ -0,0 +1,7 @@ +{ + "values": [ + "tfmg:copper_wire", + "tfmg:aluminum_wire", + "tfmg:constantan_wire" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/compacting/aluminum_ingot.json b/src/generated/resources/data/tfmg/recipes/compacting/aluminum_ingot.json deleted file mode 100644 index 427cead9..00000000 --- a/src/generated/resources/data/tfmg/recipes/compacting/aluminum_ingot.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "create:compacting", - "ingredients": [ - { - "tag": "forge:ingots/aluminum" - } - ], - "processingTime": 50, - "results": [ - { - "item": "tfmg:aluminum_sheet" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/compacting/cast_iron_ingot.json b/src/generated/resources/data/tfmg/recipes/compacting/cast_iron_ingot.json deleted file mode 100644 index 67590699..00000000 --- a/src/generated/resources/data/tfmg/recipes/compacting/cast_iron_ingot.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "create:compacting", - "ingredients": [ - { - "tag": "forge:ingots/cast_iron" - } - ], - "processingTime": 50, - "results": [ - { - "item": "tfmg:cast_iron_sheet" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/compacting/lead_ingot.json b/src/generated/resources/data/tfmg/recipes/compacting/lead_ingot.json deleted file mode 100644 index e54a9a75..00000000 --- a/src/generated/resources/data/tfmg/recipes/compacting/lead_ingot.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "create:compacting", - "ingredients": [ - { - "tag": "forge:ingots/lead" - } - ], - "processingTime": 50, - "results": [ - { - "item": "tfmg:lead_sheet" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/compacting/nickel_ingot.json b/src/generated/resources/data/tfmg/recipes/compacting/nickel_ingot.json deleted file mode 100644 index ea65d988..00000000 --- a/src/generated/resources/data/tfmg/recipes/compacting/nickel_ingot.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "create:compacting", - "ingredients": [ - { - "tag": "forge:ingots/nickel" - } - ], - "processingTime": 50, - "results": [ - { - "item": "tfmg:nickel_sheet" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/compacting/synthetic_leather.json b/src/generated/resources/data/tfmg/recipes/compacting/synthetic_leather.json deleted file mode 100644 index 9501f576..00000000 --- a/src/generated/resources/data/tfmg/recipes/compacting/synthetic_leather.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "create:compacting", - "ingredients": [ - { - "item": "tfmg:rubber_sheet" - } - ], - "processingTime": 200, - "results": [ - { - "item": "tfmg:synthetic_leather" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/crushing/deepslate_lithium_ore.json b/src/generated/resources/data/tfmg/recipes/crushing/deepslate_lithium_ore.json new file mode 100644 index 00000000..c2c35da4 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/crushing/deepslate_lithium_ore.json @@ -0,0 +1,26 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "tfmg:deepslate_lithium_ore" + } + ], + "results": [ + { + "count": 2, + "item": "tfmg:crushed_raw_lithium" + }, + { + "chance": 0.25, + "item": "tfmg:crushed_raw_lithium" + }, + { + "chance": 0.75, + "item": "create:experience_nugget" + }, + { + "chance": 0.12, + "item": "minecraft:cobbled_deepslate" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/crushing/lithium_ore.json b/src/generated/resources/data/tfmg/recipes/crushing/lithium_ore.json new file mode 100644 index 00000000..47537261 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/crushing/lithium_ore.json @@ -0,0 +1,25 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "tfmg:lithium_ore" + } + ], + "results": [ + { + "item": "tfmg:crushed_raw_lithium" + }, + { + "chance": 0.25, + "item": "tfmg:crushed_raw_lithium" + }, + { + "chance": 0.75, + "item": "create:experience_nugget" + }, + { + "chance": 0.12, + "item": "minecraft:cobblestone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/crushing/raw_lithium.json b/src/generated/resources/data/tfmg/recipes/crushing/raw_lithium.json new file mode 100644 index 00000000..2f83f034 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/crushing/raw_lithium.json @@ -0,0 +1,17 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "tfmg:raw_lithium" + } + ], + "results": [ + { + "item": "tfmg:crushed_raw_lithium" + }, + { + "chance": 0.75, + "item": "create:experience_nugget" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/crushing/raw_lithium_block.json b/src/generated/resources/data/tfmg/recipes/crushing/raw_lithium_block.json new file mode 100644 index 00000000..3eb5b26a --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/crushing/raw_lithium_block.json @@ -0,0 +1,19 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "tfmg:raw_lithium_block" + } + ], + "results": [ + { + "count": 9, + "item": "tfmg:crushed_raw_lithium" + }, + { + "chance": 0.75, + "count": 9, + "item": "create:experience_nugget" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/item_application/coated_circuit_board.json b/src/generated/resources/data/tfmg/recipes/deploying/coated_circuit_board.json similarity index 84% rename from src/generated/resources/data/tfmg/recipes/item_application/coated_circuit_board.json rename to src/generated/resources/data/tfmg/recipes/deploying/coated_circuit_board.json index c2cb13b9..272deeaa 100644 --- a/src/generated/resources/data/tfmg/recipes/item_application/coated_circuit_board.json +++ b/src/generated/resources/data/tfmg/recipes/deploying/coated_circuit_board.json @@ -1,5 +1,5 @@ { - "type": "create:item_application", + "type": "create:deploying", "ingredients": [ { "item": "tfmg:empty_circuit_board" diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java index cf5325bb..902f7ed5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java @@ -1,5 +1,8 @@ package com.drmangotea.tfmg.content.decoration.pipes; +import com.drmangotea.tfmg.TFMG; +import com.drmangotea.tfmg.base.TFMGCreativeTabs; +import com.drmangotea.tfmg.base.TFMGRegistrate; import com.drmangotea.tfmg.config.TFMGStress; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSpriteShifts; @@ -36,6 +39,7 @@ public class TFMGPipes { public static final Map>> TFMG_PIPES = new HashMap<>(); + public static final TFMGRegistrate registrate = (TFMGRegistrate) REGISTRATE.setCreativeTab(TFMGCreativeTabs.TFMG_DECORATION); /* 0: pipe @@ -54,7 +58,7 @@ public class TFMGPipes { List> pipes = new ArrayList<>(); BlockEntry pipe = - REGISTRATE.block(pipeType.name + "_pipe", p -> new TFMGPipeBlock(p, pipeType)) + registrate.block(pipeType.name + "_pipe", p -> new TFMGPipeBlock(p, pipeType)) .initialProperties(SharedProperties::copperMetal) .transform(pickaxeOnly()) .blockstate(BlockStateGen.pipe()) @@ -73,7 +77,7 @@ public class TFMGPipes { pipes.add(pipe); BlockEntry copper_encased_pipe = - REGISTRATE.block("copper_encased_" + pipeType.name + "_pipe", p -> new TFMGEncasedPipeBlock(p, AllBlocks.COPPER_CASING::get, pipeType)) + registrate.block("copper_encased_" + pipeType.name + "_pipe", p -> new TFMGEncasedPipeBlock(p, AllBlocks.COPPER_CASING::get, pipeType)) .initialProperties(SharedProperties::copperMetal) .properties(p -> p.noOcclusion().mapColor(MapColor.TERRACOTTA_LIGHT_GRAY)) .transform(axeOrPickaxe()) @@ -98,7 +102,7 @@ public class TFMGPipes { //if(true) // break; BlockEntry glass_pipe = - REGISTRATE.block("glass_" + pipeType.name + "_pipe", p -> new TFMGGlassPipeBlock(p, pipeType)) + registrate.block("glass_" + pipeType.name + "_pipe", p -> new TFMGGlassPipeBlock(p, pipeType)) .initialProperties(SharedProperties::copperMetal) .addLayer(() -> RenderType::cutoutMipped) .transform(pickaxeOnly()) @@ -130,7 +134,7 @@ public class TFMGPipes { pipes.add(glass_pipe); BlockEntry fluid_pump = - REGISTRATE.block(pipeType.name + "_mechanical_pump", TFMGPumpBlock::new) + registrate.block(pipeType.name + "_mechanical_pump", TFMGPumpBlock::new) .initialProperties(SharedProperties::copperMetal) .transform(pickaxeOnly()) .blockstate(BlockStateGen.directionalBlockProviderIgnoresWaterlogged(true)) @@ -151,7 +155,7 @@ public class TFMGPipes { pipes.add(fluid_pump); BlockEntry smart_pipe = - REGISTRATE.block(pipeType.name + "_smart_fluid_pipe", TFMGSmartFluidPipeBlock::new) + registrate.block(pipeType.name + "_smart_fluid_pipe", TFMGSmartFluidPipeBlock::new) .initialProperties(SharedProperties::copperMetal) .transform(pickaxeOnly()) .blockstate(new SmartFluidPipeGenerator()::generate) @@ -171,7 +175,7 @@ public class TFMGPipes { pipes.add(smart_pipe); BlockEntry fluid_valve = - REGISTRATE.block(pipeType.name + "_fluid_valve", TFMGFluidValveBlock::new) + registrate.block(pipeType.name + "_fluid_valve", TFMGFluidValveBlock::new) .initialProperties(SharedProperties::copperMetal) .transform(pickaxeOnly()) .blockstate((c, p) -> BlockStateGen.directionalAxisBlock(c, p, diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGProcessingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGProcessingRecipeGen.java index f3d9b3f8..6af99743 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGProcessingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGProcessingRecipeGen.java @@ -29,7 +29,6 @@ public abstract class TFMGProcessingRecipeGen extends TFMGRecipeProvider { public static void registerAll(DataGenerator gen, PackOutput output) { - GENERATORS.add(new TFMGPressingRecipeGen(output)); GENERATORS.add(new CokingRecipeGen(output)); GENERATORS.add(new DistillationRecipeGen(output)); GENERATORS.add(new WindingRecipeGen(output)); @@ -39,7 +38,9 @@ public abstract class TFMGProcessingRecipeGen extends TFMGRecipeProvider { GENERATORS.add(new TFMGFillingRecipeGen(output)); GENERATORS.add(new TFMGMixingRecipeGen(output)); GENERATORS.add(new TFMGCompactingRecipeGen(output)); + GENERATORS.add(new TFMGPressingRecipeGen(output)); GENERATORS.add(new TFMGCrushingRecipeGen(output)); + GENERATORS.add(new TFMGDeployingRecipeGen(output)); gen.addProvider(true, new DataProvider() { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java index b10bef73..d43bf0f5 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java @@ -1,14 +1,14 @@ package com.drmangotea.tfmg.datagen.recipes.values.create; +import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.content.processing.recipe.HeatCondition; import net.minecraft.data.PackOutput; -import net.minecraft.world.item.Items; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; -public class TFMGCompactingRecipeGen extends TFMGPressingRecipeGen { +public class TFMGCompactingRecipeGen extends TFMGProcessingRecipeGen { GeneratedRecipe BITUMEN = create("bitumen", b -> b diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java index a91b971c..f9993780 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java @@ -1,13 +1,16 @@ package com.drmangotea.tfmg.datagen.recipes.values.create; +import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; import com.drmangotea.tfmg.registry.TFMGPaletteStoneTypes; import com.simibubi.create.AllRecipeTypes; import net.minecraft.data.PackOutput; +import net.minecraft.world.item.Items; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; +import static com.drmangotea.tfmg.registry.TFMGTags.forgeItemTag; public class TFMGCrushingRecipeGen extends TFMGProcessingRecipeGen { @@ -46,7 +49,30 @@ public class TFMGCrushingRecipeGen extends TFMGProcessingRecipeGen { SULFUR = create(() -> TFMGBlocks.SULFUR, b -> b .output(.2f, sulfurDust(), 1) .output(.1f, sulfurDust(), 1) - ); + ), + LITHIUM_ORE = create(() -> TFMGBlocks.LITHIUM_ORE, b -> b + .output(TFMGItems.CRUSHED_LITHIUM, 1) + .output(.25f, TFMGItems.CRUSHED_LITHIUM, 1) + .output(.75f, I.experienceNugget(), 1) + .output(.12f, Items.COBBLESTONE, 1) + ), + DEEPSLATE_LITHIUM_ORE = create(() -> TFMGBlocks.DEEPSLATE_LITHIUM_ORE, b -> b + .output(TFMGItems.CRUSHED_LITHIUM, 2) + .output(.25f, TFMGItems.CRUSHED_LITHIUM, 1) + .output(.75f, I.experienceNugget(), 1) + .output(.12f, Items.COBBLED_DEEPSLATE, 1) + ), + RAW_LITHIUM = create(() -> TFMGItems.RAW_LITHIUM, b -> b + .output(TFMGItems.CRUSHED_LITHIUM, 1) + .output(.75f, I.experienceNugget(), 1) + ), + RAW_LITHIUM_BLOCK = create(() -> TFMGBlocks.RAW_LITHIUM_BLOCK, b -> b + .output(TFMGItems.CRUSHED_LITHIUM, 9) + .output(.75f, I.experienceNugget(), 9) + ) + + + ; public TFMGCrushingRecipeGen(PackOutput output) { super(output); diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGDeployingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGDeployingRecipeGen.java new file mode 100644 index 00000000..e135742b --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGDeployingRecipeGen.java @@ -0,0 +1,29 @@ +package com.drmangotea.tfmg.datagen.recipes.values.create; + +import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; +import com.drmangotea.tfmg.registry.TFMGItems; +import com.simibubi.create.AllRecipeTypes; +import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; +import net.minecraft.data.PackOutput; + +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.goldSheet; + +public class TFMGDeployingRecipeGen extends TFMGProcessingRecipeGen { + + GeneratedRecipe + COATED_CIRCUIT_BOARD = create("coated_circuit_board", b -> b + .require(TFMGItems.EMPTY_CIRCUIT_BOARD) + .require(goldSheet()) + .output(TFMGItems.COATED_CIRCUIT_BOARD)) + + ; + + public TFMGDeployingRecipeGen(PackOutput generator) { + super(generator); + } + + @Override + protected IRecipeTypeInfo getRecipeType() { + return AllRecipeTypes.DEPLOYING; + } +} diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java index 92473d17..be22440b 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java @@ -19,14 +19,6 @@ public class TFMGItemApplicationRecipeGen extends TFMGProcessingRecipeGen { GeneratedRecipe HEAVY_CASING = casing("heavy_machinery", () -> Ingredient.of(steelSheet()), TFMGBlocks.HEAVY_MACHINERY_CASING::get, TFMGBlocks.STEEL_CASING::get); GeneratedRecipe ALUMINUM = casing("aluminum", () -> Ingredient.of(aluminumSheet()), TFMGBlocks.ALUMINUM_CASING::get, TFMGBlocks.STEEL_CASING::get); - - GeneratedRecipe - COATED_CIRCUIT_BOARD = create("coated_circuit_board", b -> b - .require(TFMGItems.EMPTY_CIRCUIT_BOARD) - .require(goldSheet()) - .output(TFMGItems.COATED_CIRCUIT_BOARD) - ); - protected TFMGRecipeProvider.GeneratedRecipe casing(String type, Supplier ingredient, Supplier output, Supplier block) { return create(type + "_casing", b -> b.require(block.get()) diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGPressingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGPressingRecipeGen.java index 03192e8f..675cdae7 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGPressingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGPressingRecipeGen.java @@ -10,7 +10,7 @@ public class TFMGPressingRecipeGen extends TFMGProcessingRecipeGen { GeneratedRecipe - CAST_IRON_SHEET = create("cast_iron_ingot", b -> b.require(castIronIngot()) + CAST_IRON_SHEET = create("cast_iron_ingot", b -> b.require(castIronIngot()) .output(castIronSheetTFMG()).duration(50)), ALUMINUM_SHEET = create("aluminum_ingot", b -> b.require(aluminumIngot()) diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java index a3c92473..2da7880c 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java @@ -66,30 +66,32 @@ public class TFMGItems { CAST_IRON_INGOT = taggedIngredient("cast_iron_ingot", forgeItemTag("ingots/cast_iron"), CREATE_INGOTS.tag), ALUMINUM_INGOT = taggedIngredient("aluminum_ingot", forgeItemTag("ingots/aluminum"), CREATE_INGOTS.tag), PLASTIC_SHEET = taggedIngredient("plastic_sheet", forgeItemTag("ingots/plastic"), CREATE_INGOTS.tag), - HEAVY_PLATE = taggedIngredient("heavy_plate", forgeItemTag("plates/steel")), - ALUMINUM_SHEET = taggedIngredient("aluminum_sheet", forgeItemTag("plates/aluminum")), - NICKEL_SHEET = taggedIngredient("nickel_sheet", forgeItemTag("plates/nickel")), - CAST_IRON_SHEET = taggedIngredient("cast_iron_sheet", forgeItemTag("plates/cast_iron")), - LEAD_SHEET = taggedIngredient("lead_sheet", forgeItemTag("plates/lead")), + HEAVY_PLATE = taggedIngredient("heavy_plate", forgeItemTag("plates/steel"), forgeItemTag("plates")), + ALUMINUM_SHEET = taggedIngredient("aluminum_sheet", forgeItemTag("plates/aluminum"), forgeItemTag("plates")), + NICKEL_SHEET = taggedIngredient("nickel_sheet", forgeItemTag("plates/nickel"), forgeItemTag("plates")), + CAST_IRON_SHEET = taggedIngredient("cast_iron_sheet", forgeItemTag("plates/cast_iron"), forgeItemTag("plates")), + LEAD_SHEET = taggedIngredient("lead_sheet", forgeItemTag("plates/lead"), forgeItemTag("plates")), LEAD_INGOT = taggedIngredient("lead_ingot", forgeItemTag("ingots/lead"), CREATE_INGOTS.tag), NICKEL_INGOT = taggedIngredient("nickel_ingot", forgeItemTag("ingots/nickel"), CREATE_INGOTS.tag), CONSTANTAN_INGOT = taggedIngredient("constantan_ingot", forgeItemTag("ingots/constantan"), CREATE_INGOTS.tag), LITHIUM_INGOT = taggedIngredient("lithium_ingot", forgeItemTag("ingots/lithium"), CREATE_INGOTS.tag), - ALUMINUM_NUGGET = taggedIngredient("aluminum_nugget", forgeItemTag("nuggets/aluminum")), - STEEL_NUGGET = taggedIngredient("steel_nugget", forgeItemTag("nuggets/steel")), - CAST_IRON_NUGGET = taggedIngredient("cast_iron_nugget", forgeItemTag("nuggets/cast_iron")), - CONSTANTAN_NUGGET = taggedIngredient("constantan_nugget", forgeItemTag("nuggets/constantan")), - LEAD_NUGGET = taggedIngredient("lead_nugget", forgeItemTag("nuggets/lead")), - NICKEL_NUGGET = taggedIngredient("nickel_nugget", forgeItemTag("nuggets/nickel")), - LITHIUM_NUGGET = taggedIngredient("lithium_nugget", forgeItemTag("nuggets/lithium")), + ALUMINUM_NUGGET = taggedIngredient("aluminum_nugget", forgeItemTag("nuggets/aluminum"), forgeItemTag("nuggets")), + STEEL_NUGGET = taggedIngredient("steel_nugget", forgeItemTag("nuggets/steel"), forgeItemTag("nuggets")), + CAST_IRON_NUGGET = taggedIngredient("cast_iron_nugget", forgeItemTag("nuggets/cast_iron"), forgeItemTag("nuggets")), + CONSTANTAN_NUGGET = taggedIngredient("constantan_nugget", forgeItemTag("nuggets/constantan"), forgeItemTag("nuggets")), + LEAD_NUGGET = taggedIngredient("lead_nugget", forgeItemTag("nuggets/lead"), forgeItemTag("nuggets")), + NICKEL_NUGGET = taggedIngredient("nickel_nugget", forgeItemTag("nuggets/nickel"), forgeItemTag("nuggets")), + LITHIUM_NUGGET = taggedIngredient("lithium_nugget", forgeItemTag("nuggets/lithium"), forgeItemTag("nuggets")), RAW_LEAD = taggedIngredient("raw_lead", forgeItemTag("raw_materials/lead"), forgeItemTag("raw_materials")), RAW_NICKEL = taggedIngredient("raw_nickel", forgeItemTag("raw_materials/nickel"), forgeItemTag("raw_materials")), RAW_LITHIUM = taggedIngredient("raw_lithium", forgeItemTag("raw_materials/lithium"), forgeItemTag("raw_materials")), SYNTHETIC_LEATHER = taggedIngredient("synthetic_leather", Tags.Items.LEATHER, AllTags.forgeItemTag("leather")), LIMESAND = taggedIngredient("limesand", TFMGTags.TFMGItemTags.FLUX.tag), - SULFUR_DUST = taggedIngredient("sulfur_dust", forgeItemTag("dusts/sulfur")), - RUBBER_SHEET = taggedIngredient("rubber_sheet", forgeItemTag("ingots/rubber")), - SILICON_INGOT = taggedIngredient("silicon_ingot", forgeItemTag("ingots/silicon")); + SULFUR_DUST = taggedIngredient("sulfur_dust", forgeItemTag("dusts/sulfur"), forgeItemTag("dusts")), + RUBBER_SHEET = taggedIngredient("rubber_sheet", forgeItemTag("ingots/rubber"), forgeItemTag("ingots")), + SILICON_INGOT = taggedIngredient("silicon_ingot", forgeItemTag("ingots/silicon"), forgeItemTag("ingots")), + CRUSHED_LITHIUM = taggedIngredient("crushed_raw_lithium", AllTags.AllItemTags.CRUSHED_RAW_MATERIALS.tag) + ; public static final ItemEntry @@ -102,11 +104,11 @@ public class TFMGItems { .register(); public static final ItemEntry - COPPER_WIRE = REGISTRATE.item("copper_wire", Item::new).tag(AllTags.forgeItemTag("wires/copper")) + COPPER_WIRE = REGISTRATE.item("copper_wire", Item::new).tag(AllTags.forgeItemTag("wires/copper"), forgeItemTag("wires")) .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/copper")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(), - ALUMINUM_WIRE = REGISTRATE.item("aluminum_wire", Item::new).tag(AllTags.forgeItemTag("wires/aluminum")) + ALUMINUM_WIRE = REGISTRATE.item("aluminum_wire", Item::new).tag(AllTags.forgeItemTag("wires/aluminum"), forgeItemTag("wires")) .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/aluminum")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(), - CONSTANTAN_WIRE = REGISTRATE.item("constantan_wire", Item::new).tag(AllTags.forgeItemTag("wires/constantan")) + CONSTANTAN_WIRE = REGISTRATE.item("constantan_wire", Item::new).tag(AllTags.forgeItemTag("wires/constantan"), forgeItemTag("wires")) .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/constantan")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(); public static final ItemEntry @@ -209,7 +211,7 @@ public class TFMGItems { // .properties(p -> p.stacksTo(1)) // .register(); public static final ItemEntry COAL_COKE_DUST = REGISTRATE.item("coal_coke_dust", CoalCokeItem::new) - .tag(forgeItemTag("dusts/coal_coke"), TFMGTags.TFMGItemTags.BLAST_FURNACE_FUEL.tag) + .tag(forgeItemTag("dusts/coal_coke"), TFMGTags.TFMGItemTags.BLAST_FURNACE_FUEL.tag, forgeItemTag("dusts")) .register(); public static final ItemEntry OIL_HAMMER = REGISTRATE.item("oil_hammer", OilHammerItem::new) diff --git a/src/main/resources/assets/tfmg/textures/item/crushed_raw_lithium.png b/src/main/resources/assets/tfmg/textures/item/crushed_raw_lithium.png new file mode 100644 index 0000000000000000000000000000000000000000..4041962c88a2a93c333e990c1bd2297aedc3a1bf GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`yF6VSLn`8yPE_P`aujg>FS^l# zg{hsfRh>hxp;5Zwh=O1N1CN;dA;GqiNot#KbDm`R_-W?5Ew}$mp2_*aF1V^Az_sN> znx*N6S-o@r{Yhu&Ie+}@yX%{a@8n+=Fch4jywQ_qlC=KvX8rnm`t50KA8PC*D?O6g zR&+^rH+;_9`+>pca>Km?w+$|zk)1J{K_*Ri!Dr=T-b)yxKg^YExPL+7z^_b)HD~tg ooLeLN+MIDg{EO#25KFb<|J&Tt+~Xy`2Ivb0Pgg&ebxsLQ0LuwtE&u=k literal 0 HcmV?d00001