mirror of
https://github.com/Creators-of-Create/Create.git
synced 2025-01-13 15:56:38 +01:00
Ice and Fire Dragons Compat
- Silver Ingots
This commit is contained in:
parent
5277d5971d
commit
79aea176f3
9 changed files with 129 additions and 2 deletions
|
@ -210,6 +210,8 @@ dependencies {
|
|||
// runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge")
|
||||
//runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924")
|
||||
//runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212")
|
||||
implementation fg.deobf("curse.maven:citadel-331936:3783096")
|
||||
implementation fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465")
|
||||
|
||||
// https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
|
||||
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
|
||||
|
|
|
@ -2376,6 +2376,7 @@ fc0f45610d721610bd82dd94321c328f78b4e738 data/create/advancements/recipes/buildi
|
|||
3966a483e4b029465562721ff1a5083419fbda1f data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json
|
||||
f3ddc569b3f5bd157e969b824ce7e17cdc2dc261 data/create/advancements/recipes/building_blocks/blasting/nickel_ingot_compat_thermal.json
|
||||
9625c88577ce9ca6d5e5b70db6265d4017709074 data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_galosphere.json
|
||||
70513cec70272509878bcafbe0bd7fe1856bfe97 data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json
|
||||
68ed4ede9b3cb2c65e3570b19f8c20c925d3c8ba data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_oreganized.json
|
||||
b6e924d2e542b958646e2f2b04120734d0367752 data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_thermal.json
|
||||
345b9051fe78f0212f55a072641414ba27edae65 data/create/advancements/recipes/building_blocks/blasting/tin_ingot_compat_thermal.json
|
||||
|
@ -2405,6 +2406,7 @@ fa9c6cc212b0f9f919c5880daef86ff38c480f4b data/create/advancements/recipes/buildi
|
|||
c33131fc04d89a6565209690035d54dae3760fc5 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json
|
||||
9afbbb877bc24429c86f9667afdde9819aac26b3 data/create/advancements/recipes/building_blocks/smelting/nickel_ingot_compat_thermal.json
|
||||
07580b778d8e460fb3cdafe55a37512237876e43 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_galosphere.json
|
||||
28179d097dc9abda3d4f13ef86d4eb991c570a02 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json
|
||||
6c6a3aa0d79151573204b6900dc3cc3e299253b5 data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_oreganized.json
|
||||
0642ae7baaf393f14298c6aeaa83d9c53dae758f data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_thermal.json
|
||||
fd9808206c0d576dd32d7038dedbef0fbd6ca798 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json
|
||||
|
@ -3879,6 +3881,7 @@ cbc0e8b75baeedf026d38e1e5eec7d54c762c8b3 data/create/recipes/blasting/ingot_tin_
|
|||
6789be494dfa5aa9c7893e64e6e3b74652f08f0e data/create/recipes/blasting/lead_ingot_compat_thermal.json
|
||||
26e7e53ca4aad067d7a3ca46ffec08f6bc5ff921 data/create/recipes/blasting/nickel_ingot_compat_thermal.json
|
||||
49919977975eceeba0040904e6141b7f232346f2 data/create/recipes/blasting/silver_ingot_compat_galosphere.json
|
||||
b18c99938660f690d0b4bd34baa50d9adca63533 data/create/recipes/blasting/silver_ingot_compat_iceandfire.json
|
||||
352b2a1f360930944fac3d6c6bcab1df78525400 data/create/recipes/blasting/silver_ingot_compat_oreganized.json
|
||||
aef449162f48759aacc4ae2876c659812fb4c52f data/create/recipes/blasting/silver_ingot_compat_thermal.json
|
||||
c79ade249cc24fe0602c9a139497c07754f4d8e2 data/create/recipes/blasting/tin_ingot_compat_thermal.json
|
||||
|
@ -5589,6 +5592,7 @@ ef641b9cb51b6782d0ac3b69e90d06d31f93971b data/create/recipes/smelting/ingot_uran
|
|||
6e62cbe2af58aef632fe18ee812153a85e52bdd5 data/create/recipes/smelting/nickel_ingot_compat_thermal.json
|
||||
2c230522bb0946bde6a51442cb15c5efeea99b15 data/create/recipes/smelting/scoria.json
|
||||
9f3a21cf1f2beffe025e837d6e87d34eead1e0d0 data/create/recipes/smelting/silver_ingot_compat_galosphere.json
|
||||
a939f3de18b029e8c6a2166d03b2191e3211707d data/create/recipes/smelting/silver_ingot_compat_iceandfire.json
|
||||
73367e3ca4e767a03f13b26102b9f2fff25b5477 data/create/recipes/smelting/silver_ingot_compat_oreganized.json
|
||||
f1e87ad8bac9500058b92f1ed0de3ce36ceb854a data/create/recipes/smelting/silver_ingot_compat_thermal.json
|
||||
84b18e8f2f5b1faac98d1d47a05fc43b52992d65 data/create/recipes/smelting/tin_ingot_compat_thermal.json
|
||||
|
@ -5625,6 +5629,7 @@ f18f823c0274518a13da3be2850b916a6ece2900 data/create/recipes/splashing/ic2/crush
|
|||
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
|
||||
cb302e339d15701fbc4515aeeffe3059905b25e4 data/create/recipes/splashing/iceandfire/crushed_raw_silver.json
|
||||
9600bd69991140ceacb7d8440a84cba346856ecb data/create/recipes/splashing/immersiveengineering/crushed_raw_aluminum.json
|
||||
004392e61f33b411d1e376ea336ed5ac8bdf4196 data/create/recipes/splashing/immersiveengineering/crushed_raw_lead.json
|
||||
937d3343dfafb93297a10d5a5ef238056e4fd227 data/create/recipes/splashing/immersiveengineering/crushed_raw_nickel.json
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
"parent": "minecraft:recipes/root",
|
||||
"rewards": {
|
||||
"recipes": [
|
||||
"create:blasting/silver_ingot_compat_iceandfire"
|
||||
]
|
||||
},
|
||||
"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/silver_ingot_compat_iceandfire"
|
||||
}
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[
|
||||
"has_item",
|
||||
"has_the_recipe"
|
||||
]
|
||||
]
|
||||
}
|
|
@ -0,0 +1,34 @@
|
|||
{
|
||||
"parent": "minecraft:recipes/root",
|
||||
"rewards": {
|
||||
"recipes": [
|
||||
"create:smelting/silver_ingot_compat_iceandfire"
|
||||
]
|
||||
},
|
||||
"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/silver_ingot_compat_iceandfire"
|
||||
}
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[
|
||||
"has_item",
|
||||
"has_the_recipe"
|
||||
]
|
||||
]
|
||||
}
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "minecraft:blasting",
|
||||
"ingredient": {
|
||||
"item": "create:crushed_raw_silver"
|
||||
},
|
||||
"result": "iceandfire:silver_ingot",
|
||||
"experience": 0.1,
|
||||
"cookingtime": 100,
|
||||
"conditions": [
|
||||
{
|
||||
"modid": "iceandfire",
|
||||
"type": "forge:mod_loaded"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "minecraft:smelting",
|
||||
"ingredient": {
|
||||
"item": "create:crushed_raw_silver"
|
||||
},
|
||||
"result": "iceandfire:silver_ingot",
|
||||
"experience": 0.1,
|
||||
"cookingtime": 200,
|
||||
"conditions": [
|
||||
{
|
||||
"modid": "iceandfire",
|
||||
"type": "forge:mod_loaded"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
"type": "create:splashing",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "create:crushed_raw_silver"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "iceandfire:silver_nugget",
|
||||
"count": 9
|
||||
}
|
||||
],
|
||||
"conditions": [
|
||||
{
|
||||
"modid": "iceandfire",
|
||||
"type": "forge:mod_loaded"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -3,6 +3,7 @@ package com.simibubi.create.foundation.data.recipe;
|
|||
import static com.simibubi.create.foundation.data.recipe.Mods.GS;
|
||||
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.IF;
|
||||
import static com.simibubi.create.foundation.data.recipe.Mods.MEK;
|
||||
import static com.simibubi.create.foundation.data.recipe.Mods.OREGANIZED;
|
||||
import static com.simibubi.create.foundation.data.recipe.Mods.TH;
|
||||
|
@ -16,7 +17,7 @@ public enum CompatMetals {
|
|||
OSMIUM(MEK),
|
||||
PLATINUM(),
|
||||
QUICKSILVER(),
|
||||
SILVER(TH, IE, IC2, OREGANIZED, GS),
|
||||
SILVER(TH, IE, IC2, OREGANIZED, GS, IF),
|
||||
TIN(TH, MEK, IC2),
|
||||
URANIUM(MEK, IE, IC2);
|
||||
|
||||
|
|
|
@ -51,7 +51,8 @@ public enum Mods {
|
|||
GOOD("goodending"),
|
||||
BMK("biomemakeover"),
|
||||
NE("nethers_exoticism"),
|
||||
EO("elementaryores")
|
||||
EO("elementaryores"),
|
||||
IF("iceandfire")
|
||||
|
||||
;
|
||||
|
||||
|
|
Loading…
Reference in a new issue