From bc1ad5f52d93ef9126b11446976ba304a6de4654 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 9 Oct 2024 12:07:19 +0200 Subject: [PATCH] Datagen --- .../12afe0d97856fb2040b8407470e6d13529994eaa | 2 +- .../455c485c9c8ef171bbc1ce4d435b3110ba1557ba | 2 +- .../6ec3b5a261c9ae3df674f7595dc66530ce54feb9 | 2 +- .../82992cbf8f2794d83ac94034835eac0acd7915b9 | 10 +++++----- .../8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 | 2 +- .../b256105d8411632b0d585496ea8944a751a08034 | 4 ++-- .../c24b4d2b8d15abff51c78bd94f4403d9eae6c139 | 2 +- .../e0a39a97205b7149114f15de91b614248d05fd95 | 2 +- .../blasting/ingot_aluminium_compat_ic2.json | 20 +++++++++---------- .../smelting/ingot_aluminium_compat_ic2.json | 20 +++++++++---------- .../blasting/ingot_aluminium_compat_ic2.json | 18 ++++++++--------- .../smelting/ingot_aluminium_compat_ic2.json | 18 ++++++++--------- .../splashing/ic2/crushed_raw_aluminum.json | 16 +++++++-------- 13 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa b/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa index 87b990f7f..e988c048d 100644 --- a/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa +++ b/src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa @@ -1,4 +1,4 @@ -// 1.19.2 2024-09-02T22:02:10.2051947 Create's Sequenced Assembly Recipes +// 1.19.2 2024-10-09T12:03:41.3844677 Create's Sequenced Assembly Recipes dbaca5a5aa312f3bc7b826e51e665d32e798a5d7 data/create/recipes/sequenced_assembly/precision_mechanism.json dacafdb106304d183b00e21fb01517ac45eca800 data/create/recipes/sequenced_assembly/sturdy_sheet.json 1274315b5c570722d6f5b2ed7f5e53fe01b6288a data/create/recipes/sequenced_assembly/track.json diff --git a/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba b/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba index 8095db564..f94b389c1 100644 --- a/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba +++ b/src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba @@ -1,4 +1,4 @@ -// 1.19.2 2024-09-02T22:02:10.2066856 Create's Advancements +// 1.19.2 2024-10-09T12:03:41.3854644 Create's Advancements 2079ae09cf699108a8035ced7ca712fed4ab1577 data/create/advancements/andesite_alloy.json 082d3987c5e074ed50be4a94a6fdc17120af241b data/create/advancements/andesite_casing.json 4618109cfb4550fd8e19dc9d794ef24398b10a61 data/create/advancements/anvil_plough.json diff --git a/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 b/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 index a9030040f..cb676b15e 100644 --- a/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 +++ b/src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9 @@ -1,4 +1,4 @@ -// 1.19.2 2024-09-02T22:02:10.2804789 Create's Mechanical Crafting Recipes +// 1.19.2 2024-10-09T12:03:41.4004239 Create's Mechanical Crafting Recipes f076d64d9f30709bed34775136c9241097b28aa9 data/create/recipes/mechanical_crafting/crushing_wheel.json 694dca9dcff246bb7f560b3304fcc244c53217d5 data/create/recipes/mechanical_crafting/extendo_grip.json c03bc27f537e2d6531438bf58a17d977a7e16c7b data/create/recipes/mechanical_crafting/potato_cannon.json diff --git a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 index 455620bd8..9546884bb 100644 --- a/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 +++ b/src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 @@ -1,5 +1,5 @@ -// 1.19.2 2024-09-02T22:02:10.2086711 Create's Standard Recipes -d8e72e6e42d9d5157b98e565b8889d048d4d20cf data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_ic2.json +// 1.19.2 2024-10-09T12:03:41.444307 Create's Standard Recipes +6800157e64a8e1322bad29199c30cf3334cc69f7 data/create/advancements/recipes/building_blocks/blasting/ingot_aluminium_compat_ic2.json ff6a181c36dba79ed4fe7945823f7529bd7913fe data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json 106354a9eb7379a53eae40a1775f43bf67225919 data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json bb548877a89f41e1bdfe987dd3ec05b6023daa81 data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json @@ -24,7 +24,7 @@ f0570274cf54c73b95d9665ea17432b63b2da525 data/create/advancements/recipes/buildi 7c5a7a087bc6644b0944fd37211d4e69a863a8c2 data/create/advancements/recipes/building_blocks/smelting/glass_from_horizontal_framed_glass.json e83398ba06339e3bd559b839c725de4f7535be5e data/create/advancements/recipes/building_blocks/smelting/glass_from_tiled_glass.json 94ebf2a541daade4b3b6a50e13c6306418025c77 data/create/advancements/recipes/building_blocks/smelting/glass_from_vertical_framed_glass.json -c3190405474b5ba8d070f46aa3151c6da48cd81b data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_ic2.json +d84a85b7d72b12b33662773a6563309db89860cf data/create/advancements/recipes/building_blocks/smelting/ingot_aluminium_compat_ic2.json cf1480247e325842aca707d2cfd1ce58aa922f30 data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json fe585f32461cd784fda4832d727985a0e20e7cb3 data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json 847d5dc5141fd0cea5763466c092507771909054 data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json @@ -246,7 +246,7 @@ d4012346e139ef643ac4c83713cbe6b5a5beac8a data/create/advancements/recipes/food/s ab7d109fd99b2e6b84941955529941eea15196af data/create/advancements/recipes/transportation/crafting/kinetics/minecart_from_contraption_cart.json d6b68a6fb4b7872f800585a8616cfe1ff1a0428c data/create/recipes/blasting/copper_ingot_from_crushed.json 2f24bbc0a6197232c7df975cefa76f8bededb2e3 data/create/recipes/blasting/gold_ingot_from_crushed.json -1440ff91b1a458d554876ad3596176f988ca0626 data/create/recipes/blasting/ingot_aluminum_compat_ic2.json +f2d3636e3c828538b957e974bc4f58191d2fac83 data/create/recipes/blasting/ingot_aluminium_compat_ic2.json 403992a2ecfe88e639c0165b78d41c3baea5fc83 data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json c48b2f2981a7a45629bcb9b9dc3fad9150dd39a5 data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json 10b1df3b14d2854e3d7948b27f0b8703fde48012 data/create/recipes/blasting/ingot_lead_compat_mekanism.json @@ -463,7 +463,7 @@ b43d736230229587b24693f4059c974c83c99832 data/create/recipes/smelting/glass_from ac8519dc87331facee57802dad374c0b32b8bf0c data/create/recipes/smelting/glass_pane_from_tiled_glass_pane.json 1cfea94ee0c921056a6aee8ca381be4f84b9e2e1 data/create/recipes/smelting/glass_pane_from_vertical_framed_glass_pane.json 3a2656e86cdf82e99682242da9aa977031049ea1 data/create/recipes/smelting/gold_ingot_from_crushed.json -1f5b865d52bee67c37076bd623fde52d44c20df8 data/create/recipes/smelting/ingot_aluminum_compat_ic2.json +a30957a4b0b53fb2b62401847ab9efc0e23bd4d4 data/create/recipes/smelting/ingot_aluminium_compat_ic2.json b223054970e6571768319bb866d61635d726dce5 data/create/recipes/smelting/ingot_aluminum_compat_immersiveengineering.json 78467cf924ebeb24c53ef0ea10fca3eb180f914c data/create/recipes/smelting/ingot_lead_compat_immersiveengineering.json bd7bffd4bbd69abc1ee5e437c3f1098c075892fe data/create/recipes/smelting/ingot_lead_compat_mekanism.json diff --git a/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 b/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 index a8f73c926..065473c4e 100644 --- a/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 +++ b/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 @@ -1,4 +1,4 @@ -// 1.19.2 2024-09-02T22:02:10.2146561 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2024-10-09T12:03:41.4014222 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index bd1ebf7ad..eb1c1fe65 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.19.2 2024-09-02T22:02:10.2734972 Create's Processing Recipes +// 1.19.2 2024-10-09T12:03:41.3884566 Create's Processing Recipes 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json @@ -1102,7 +1102,7 @@ e3f12ec5d449caa54ebe1c453a89373492b8f48a data/create/recipes/splashing/endergeti 64535aaa3a5d4b98791337b1a8ce50ad3d39a8ac data/create/recipes/splashing/gravel.json dd9508767f68cc8b5cc2f642690961e0c22c9985 data/create/recipes/splashing/gray_concrete_powder.json 8908b452e6bc1290ebb8cfefc2c066460de93bff data/create/recipes/splashing/green_concrete_powder.json -869a639fd7069495693fd2106165b57ce674201b data/create/recipes/splashing/ic2/crushed_raw_aluminum.json +9764857ea6ee8d31ec37e6022f89dbe662e88591 data/create/recipes/splashing/ic2/crushed_raw_aluminum.json 6fd01478f838507f9e0daf7eb0a19e8315e03cb8 data/create/recipes/splashing/ic2/crushed_raw_silver.json b5a0a0fc79bf310965aa16e78044b3f6a8a9998f data/create/recipes/splashing/ic2/crushed_raw_tin.json 00b8d0c2577cc36da1c862234b61fb7d1cfe3e65 data/create/recipes/splashing/ic2/crushed_raw_uranium.json diff --git a/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 b/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 index 19f2ea123..1c2e850a3 100644 --- a/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 +++ b/src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139 @@ -1,2 +1,2 @@ -// 1.19.2 2024-09-02T22:02:10.2076734 Create's Custom Sounds +// 1.19.2 2024-10-09T12:03:41.3874594 Create's Custom Sounds bcfd9320f8ed54f3282b1757a41da0d1753e1754 assets/create/sounds.json diff --git a/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 b/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 index 93885c8a2..64425656c 100644 --- a/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 +++ b/src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95 @@ -1,2 +1,2 @@ -// 1.19.2 2024-09-02T22:02:10.2814764 Create's Recipe Serializer Tags +// 1.19.2 2024-10-09T12:03:41.3884566 Create's Recipe Serializer Tags 0d8718f7383761bc5d7bc45306ed266ebf25dc1d data/create/tags/recipe_serializer/automation_ignore.json diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminium_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminium_compat_ic2.json index 6d99a0525..8ca9199a1 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminium_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_aluminium_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:blasting/ingot_aluminium_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:blasting/ingot_aluminium_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:blasting/ingot_aluminium_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminium_compat_ic2.json b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminium_compat_ic2.json index 7abca1eaf..90aaeeac5 100644 --- a/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminium_compat_ic2.json +++ b/src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_aluminium_compat_ic2.json @@ -1,13 +1,7 @@ { "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/ingot_aluminium_compat_ic2" - ] - }, "criteria": { "has_item": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { @@ -16,13 +10,14 @@ ] } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "create:smelting/ingot_aluminium_compat_ic2" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ @@ -30,5 +25,10 @@ "has_item", "has_the_recipe" ] - ] + ], + "rewards": { + "recipes": [ + "create:smelting/ingot_aluminium_compat_ic2" + ] + } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/ingot_aluminium_compat_ic2.json b/src/generated/resources/data/create/recipes/blasting/ingot_aluminium_compat_ic2.json index 08f0c18dd..ae89d6d39 100644 --- a/src/generated/resources/data/create/recipes/blasting/ingot_aluminium_compat_ic2.json +++ b/src/generated/resources/data/create/recipes/blasting/ingot_aluminium_compat_ic2.json @@ -1,15 +1,15 @@ { "type": "minecraft:blasting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + } + ], + "cookingtime": 100, + "experience": 0.1, "ingredient": { "item": "create:crushed_raw_aluminum" }, - "result": "ic2:ingot_aluminium", - "experience": 0.1, - "cookingtime": 100, - "conditions": [ - { - "modid": "ic2", - "type": "forge:mod_loaded" - } - ] + "result": "ic2:ingot_aluminium" } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/smelting/ingot_aluminium_compat_ic2.json b/src/generated/resources/data/create/recipes/smelting/ingot_aluminium_compat_ic2.json index 92152e36c..766a12789 100644 --- a/src/generated/resources/data/create/recipes/smelting/ingot_aluminium_compat_ic2.json +++ b/src/generated/resources/data/create/recipes/smelting/ingot_aluminium_compat_ic2.json @@ -1,15 +1,15 @@ { "type": "minecraft:smelting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + } + ], + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "create:crushed_raw_aluminum" }, - "result": "ic2:ingot_aluminium", - "experience": 0.1, - "cookingtime": 200, - "conditions": [ - { - "modid": "ic2", - "type": "forge:mod_loaded" - } - ] + "result": "ic2:ingot_aluminium" } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/splashing/ic2/crushed_raw_aluminum.json b/src/generated/resources/data/create/recipes/splashing/ic2/crushed_raw_aluminum.json index 8871bb3ca..945276f36 100644 --- a/src/generated/resources/data/create/recipes/splashing/ic2/crushed_raw_aluminum.json +++ b/src/generated/resources/data/create/recipes/splashing/ic2/crushed_raw_aluminum.json @@ -1,5 +1,11 @@ { "type": "create:splashing", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "ic2" + } + ], "ingredients": [ { "item": "create:crushed_raw_aluminum" @@ -7,14 +13,8 @@ ], "results": [ { - "item": "ic2:nugget_aluminium", - "count": 9 - } - ], - "conditions": [ - { - "modid": "ic2", - "type": "forge:mod_loaded" + "count": 9, + "item": "ic2:nugget_aluminium" } ] } \ No newline at end of file