Add IC2 Metals compat

This commit is contained in:
attackeight 2023-06-28 11:21:32 -04:00 committed by Attack8
parent 39ef3da5df
commit cdab3b5f66
24 changed files with 501 additions and 5 deletions

View file

@ -187,6 +187,7 @@ dependencies {
runtimeOnly fg.deobf("org.squiddev:cc-tweaked-${cc_tweaked_minecraft_version}:${cc_tweaked_version}")
}
// implementation fg.deobf("curse.maven:ic2-classic-242942:4563059")
// implementation fg.deobf("curse.maven:druidcraft-340991:3101903")
// implementation fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-1.16.5:0.10.0-Beta25")
// runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69")

View file

@ -2359,13 +2359,17 @@ aec7192be51a921f7c2f9e52ca64e65cf92abf1f data/create/advancements/pipe_organ.jso
abf054890da41c46221fddc2474e18d077b3c1a2 data/create/advancements/precision_mechanism.json
9eb2508128ae938f0e654f3b316aa324dd6a18e8 data/create/advancements/pulley_maxed.json
99361c643eb6fd9e0a97420f6b5d3df8bf7dbc3f data/create/advancements/recipes/building_blocks/andesite_from_stone_types_andesite_stonecutting.json
0989187987645c6b13ed453e0499a59962b8c767 data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_ic2.json
29a2f29f50306abaac8aa361102d3a30677fcd85 data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json
c6095aa02996b040d7a1ead9d32d720cd311ae7e data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json
60e56e5c1d38762c04634f9c8e43c5e42a002046 data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json
7ec1b529d342bbc15549643f2a3a4cb5589f3b2d data/create/advancements/recipes/building_blocks/blasting/ingot_nickel_compat_immersiveengineering.json
5aff04a8b41bf04d7834092d74fc0efe1ed135b1 data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json
b016623ec3371bc32c821fc3ee8ba8aedfea18fe data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_ic2.json
78aa3ec5002ea00740b3774ce72c19a3bcf785d0 data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_immersiveengineering.json
bc1a403b51363151d25a084bac89c338e75dae34 data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_ic2.json
1e28c51241a2f42a009adaafcf71c477d2fa2cbe data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json
2294db07c59e76782c4ed47aa23b23f7cd8fe098 data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_ic2.json
6113983ce70c4d57bb34adb87466a41a7ee01800 data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json
fc0f45610d721610bd82dd94321c328f78b4e738 data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json
3966a483e4b029465562721ff1a5083419fbda1f data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json
@ -2381,13 +2385,17 @@ d252ea6ae1f88ab2286357d3a05a643eec7d92c3 data/create/advancements/recipes/buildi
78972bdf05d79e5357ff5771caa13d631e2c2740 data/create/advancements/recipes/building_blocks/smelting/glass_from_horizontal_framed_glass.json
c8edb1be5163aaeebdd94f4c25ef45bf839200c0 data/create/advancements/recipes/building_blocks/smelting/glass_from_tiled_glass.json
c70af1a552a80137cf25780b481387a585e551f3 data/create/advancements/recipes/building_blocks/smelting/glass_from_vertical_framed_glass.json
96fdd3a575b158b657ddd0709a05ffa7ab4b0457 data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_ic2.json
4b86c2a3784cc837ab8b49c678517b53db188916 data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json
cd59dee91b03d293a8e6501acc734261858cdb56 data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json
80e276bd06ac555aa9203247a24f97c779cb80db data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json
d59bde1473b5c20cc134febad308378d9804baa6 data/create/advancements/recipes/building_blocks/smelting/ingot_nickel_compat_immersiveengineering.json
dbd5528e37c89ee07f387524c34ec25f85ba957d data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json
e5b50846b6f2c5b2936a2f114bd7b6f5b6e12bdc data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_ic2.json
7e64cb68ef1e6bfb17aafccac2ec013b4601f397 data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_immersiveengineering.json
60b34d6e4338c8d684b75ef8e0ff8fba139ecd9c data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_ic2.json
1dfe9a72f1395dd6c00a20b80e1bb7ccc52bce66 data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json
d9ab6b00a1095446ae3d6f6bcaace5a2b461679f data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_ic2.json
fa9c6cc212b0f9f919c5880daef86ff38c480f4b data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json
61f6c25e268c28eee6fdfde2b5ac6890cebe7f6a data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json
c33131fc04d89a6565209690035d54dae3760fc5 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json
@ -3846,13 +3854,17 @@ a133d4d2542c0b9309873d06a72e7efff4cee219 data/create/recipes/asurine_pillar_from
288d80210f7efb4664e2e9c9d9111049863e5f60 data/create/recipes/birch_window_pane.json
70b34d9573875b9bc15f8d71baac81ecd7c0ab60 data/create/recipes/blasting/copper_ingot_from_crushed.json
9f9f50e6f65d3077ee7c39403fffb31fea3bb408 data/create/recipes/blasting/gold_ingot_from_crushed.json
1002fb0e5f3ab0068c381ebc6488b868671d9f66 data/create/recipes/blasting/ingot_aluminum_compat_ic2.json
172904335190876e7b52bad7031b7d8f3fba426e data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json
9ba4fc584e7a275cf5b3785fead3dd21fd0d2172 data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json
020618b989b39ab6e6d5ce5fcf786afc23fb0dc0 data/create/recipes/blasting/ingot_lead_compat_mekanism.json
a53b681eabe30b87fba1b2a2840a556106a07dca data/create/recipes/blasting/ingot_nickel_compat_immersiveengineering.json
56c54d8ebd3c0fea9e7d1ee448586fdb1a2e615d data/create/recipes/blasting/ingot_osmium_compat_mekanism.json
27e2d0db8117af9f4a674b171e3c1c85ae3e318c data/create/recipes/blasting/ingot_silver_compat_ic2.json
1ed5036de40ecb51e22b9f7d6115f9d712ac9d08 data/create/recipes/blasting/ingot_silver_compat_immersiveengineering.json
3c7728e1dc13ba64444ace546d114ade492f37b8 data/create/recipes/blasting/ingot_tin_compat_ic2.json
cbc0e8b75baeedf026d38e1e5eec7d54c762c8b3 data/create/recipes/blasting/ingot_tin_compat_mekanism.json
6787fcc47db35e4733dce9f41256fba1f0059a63 data/create/recipes/blasting/ingot_uranium_compat_ic2.json
0a8c1c62450a9ec438173422f338cfd812eb5894 data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json
78c75f2c211e89b59b397532eda4bbd2c05287d3 data/create/recipes/blasting/ingot_uranium_compat_mekanism.json
9d255e4af4c1317d514714ad34ced6924df9fb00 data/create/recipes/blasting/iron_ingot_from_crushed.json
@ -5235,13 +5247,17 @@ daaa640dbfaa86685de636b89afe2fdd74cd0cf9 data/create/recipes/smelting/glass_pane
48bdeff8ca1ae7bf732fc870fb0fa294de56188a data/create/recipes/smelting/glass_pane_from_tiled_glass_pane.json
7035be7cce5a38c794d9cc872801329af81bac46 data/create/recipes/smelting/glass_pane_from_vertical_framed_glass_pane.json
a4fb256e4cc6cd9e450b054e8489f26655f6a1d2 data/create/recipes/smelting/gold_ingot_from_crushed.json
1d173fd2909e08c70d52051789e838757df6a1fa data/create/recipes/smelting/ingot_aluminum_compat_ic2.json
57996aea2f6456c936e248e4fd84fa5387fd3c4f data/create/recipes/smelting/ingot_aluminum_compat_immersiveengineering.json
cadbfc99cab88f87a431cc8853e280d3871c4542 data/create/recipes/smelting/ingot_lead_compat_immersiveengineering.json
1b029da974db92f0bfa456c6aae9ffb709441ea7 data/create/recipes/smelting/ingot_lead_compat_mekanism.json
58b3bc5dc35e0cfd695a14b6c7817b0d97d63581 data/create/recipes/smelting/ingot_nickel_compat_immersiveengineering.json
47f6d91d7e7cf53a6c31e3724fd7417197a4d19a data/create/recipes/smelting/ingot_osmium_compat_mekanism.json
2b08f9a34885a195830476c1656da926954b6b8c data/create/recipes/smelting/ingot_silver_compat_ic2.json
901c8a8738d2e42925a1e52db6321b84b179ff4f data/create/recipes/smelting/ingot_silver_compat_immersiveengineering.json
913ad5aae10f6a4fe7a376072eb43db8bea873e6 data/create/recipes/smelting/ingot_tin_compat_ic2.json
f1e5c83018a185bf4193dbd6ea0f37ab9c07ff63 data/create/recipes/smelting/ingot_tin_compat_mekanism.json
e2ca6b9ce56a29a4577553374dbd1e5f47ea12ea data/create/recipes/smelting/ingot_uranium_compat_ic2.json
e51fc95b348f7b90d4945b1d3ec0b24dc1d325eb data/create/recipes/smelting/ingot_uranium_compat_immersiveengineering.json
ef641b9cb51b6782d0ac3b69e90d06d31f93971b data/create/recipes/smelting/ingot_uranium_compat_mekanism.json
01b247fd6f2910bade840628fe10dcfd73c8d662 data/create/recipes/smelting/iron_ingot_from_crushed.json
@ -5265,6 +5281,10 @@ b875e2fe5b287ee9538de7754565b70a0c7af163 data/create/recipes/splashing/crushed_r
c4d680eed98791fe45fa93aeeae9e8dbd508d6f5 data/create/recipes/splashing/gravel.json
7af4d9ae50af13da0d4fc814687f9586ff872798 data/create/recipes/splashing/gray_concrete_powder.json
23fb61c0e4bcca58fa7241db9cbef07bf4bd9a9b data/create/recipes/splashing/green_concrete_powder.json
82707bd9a72c35926ebf116fea1c4d9aea9a127a data/create/recipes/splashing/ic2/crushed_raw_aluminum.json
f18f823c0274518a13da3be2850b916a6ece2900 data/create/recipes/splashing/ic2/crushed_raw_silver.json
71b4e6a4d62ec437f02bd2029455eb7ba5bb3943 data/create/recipes/splashing/ic2/crushed_raw_tin.json
8da1397c440f27a5af4cbfc169bcf74f83bf3c8a data/create/recipes/splashing/ic2/crushed_raw_uranium.json
0a15fffe26190b78d2177c8302c92fc2232ce398 data/create/recipes/splashing/ice.json
9600bd69991140ceacb7d8440a84cba346856ecb data/create/recipes/splashing/immersiveengineering/crushed_raw_aluminum.json
004392e61f33b411d1e376ea336ed5ac8bdf4196 data/create/recipes/splashing/immersiveengineering/crushed_raw_lead.json

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_aluminum_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_aluminum"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_aluminum_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_silver_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_silver"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_silver_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_tin_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_tin"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_tin_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_uranium_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_uranium"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_uranium_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:smelting/ingot_aluminum_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_aluminum"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:smelting/ingot_aluminum_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:smelting/ingot_silver_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_silver"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:smelting/ingot_silver_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:smelting/ingot_tin_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_tin"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:smelting/ingot_tin_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:smelting/ingot_uranium_compat_ic2"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:crushed_raw_uranium"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:smelting/ingot_uranium_compat_ic2"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,15 @@
{
"type": "minecraft:blasting",
"ingredient": {
"item": "create:crushed_raw_aluminum"
},
"result": "ic2:ingot_aluminum",
"experience": 0.1,
"cookingtime": 100,
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,15 @@
{
"type": "minecraft:blasting",
"ingredient": {
"item": "create:crushed_raw_silver"
},
"result": "ic2:ingot_silver",
"experience": 0.1,
"cookingtime": 100,
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,15 @@
{
"type": "minecraft:blasting",
"ingredient": {
"item": "create:crushed_raw_tin"
},
"result": "ic2:ingot_tin",
"experience": 0.1,
"cookingtime": 100,
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,15 @@
{
"type": "minecraft:blasting",
"ingredient": {
"item": "create:crushed_raw_uranium"
},
"result": "ic2:ingot_uranium",
"experience": 0.1,
"cookingtime": 100,
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,15 @@
{
"type": "minecraft:smelting",
"ingredient": {
"item": "create:crushed_raw_aluminum"
},
"result": "ic2:ingot_aluminum",
"experience": 0.1,
"cookingtime": 200,
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,15 @@
{
"type": "minecraft:smelting",
"ingredient": {
"item": "create:crushed_raw_silver"
},
"result": "ic2:ingot_silver",
"experience": 0.1,
"cookingtime": 200,
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,15 @@
{
"type": "minecraft:smelting",
"ingredient": {
"item": "create:crushed_raw_tin"
},
"result": "ic2:ingot_tin",
"experience": 0.1,
"cookingtime": 200,
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,15 @@
{
"type": "minecraft:smelting",
"ingredient": {
"item": "create:crushed_raw_uranium"
},
"result": "ic2:ingot_uranium",
"experience": 0.1,
"cookingtime": 200,
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,20 @@
{
"type": "create:splashing",
"ingredients": [
{
"item": "create:crushed_raw_aluminum"
}
],
"results": [
{
"item": "ic2:nugget_aluminum",
"count": 9
}
],
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,20 @@
{
"type": "create:splashing",
"ingredients": [
{
"item": "create:crushed_raw_silver"
}
],
"results": [
{
"item": "ic2:nugget_silver",
"count": 9
}
],
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,20 @@
{
"type": "create:splashing",
"ingredients": [
{
"item": "create:crushed_raw_tin"
}
],
"results": [
{
"item": "ic2:nugget_tin",
"count": 9
}
],
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -0,0 +1,20 @@
{
"type": "create:splashing",
"ingredients": [
{
"item": "create:crushed_raw_uranium"
}
],
"results": [
{
"item": "ic2:nugget_uranium",
"count": 9
}
],
"conditions": [
{
"modid": "ic2",
"type": "forge:mod_loaded"
}
]
}

View file

@ -1,5 +1,6 @@
package com.simibubi.create.foundation.data.recipe;
import static com.simibubi.create.foundation.data.recipe.Mods.IC2;
import static com.simibubi.create.foundation.data.recipe.Mods.IE;
import static com.simibubi.create.foundation.data.recipe.Mods.MEK;
import static com.simibubi.create.foundation.data.recipe.Mods.TH;
@ -7,15 +8,15 @@ import static com.simibubi.create.foundation.data.recipe.Mods.TH;
import com.simibubi.create.foundation.utility.Lang;
public enum CompatMetals {
ALUMINUM(IE),
ALUMINUM(IE, IC2),
LEAD(MEK, TH, IE),
NICKEL(TH, IE),
OSMIUM(MEK),
PLATINUM(),
QUICKSILVER(),
SILVER(TH, IE),
TIN(TH, MEK),
URANIUM(MEK, IE);
SILVER(TH, IE, IC2),
TIN(TH, MEK, IC2),
URANIUM(MEK, IE, IC2);
private final Mods[] mods;
private final String name;

View file

@ -26,6 +26,8 @@ public enum Mods {
TF("twilightforest"),
ECO("ecologics"),
IC2("ic2", b -> b.reverseMetalPrefix())
;
private final String id;
@ -63,7 +65,7 @@ public enum Mods {
public ResourceLocation asResource(String id) {
return new ResourceLocation(this.id, id);
}
public String recipeId(String id) {
return "compat/" + this.id + "/" + id;
}