tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #639 from garyyo/mc1.15/dev

Browse source 
Technically add support for Ice and Fire
This commit is contained in:
simibubi 2021-01-02 12:29:50 +01:00 committed by GitHub
commit f611102bf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 125 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/silver_ingot_compat_iceandfire.json Normal file
View file

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

32
src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/silver_ingot_compat_iceandfire.json Normal file
View file

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

15
src/generated/resources/data/create/recipes/blasting/silver_ingot_compat_iceandfire.json Normal file
View file

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

15
src/generated/resources/data/create/recipes/smelting/silver_ingot_compat_iceandfire.json Normal file
View file

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

25
src/generated/resources/data/create/recipes/splashing/iceandfire/crushed_silver_ore.json Normal file
View file

@ -0,0 +1,25 @@
{
"type": "create:splashing",
"ingredients": [
{
"item": "create:crushed_silver_ore"
}
],
"results": [
{
"item": "iceandfire:silver_nugget",
"count": 10
},
{
"item": "iceandfire:silver_nugget",
"count": 5,
"chance": 0.5
}
],
"conditions": [
{
"modid": "iceandfire",
"type": "forge:mod_loaded"
}
]
}

3
src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java
View file

@ -8,7 +8,8 @@ public enum Mods {
TH("thermal", false),
MW("mysticalworld", false),
SM("silents_mechanisms", false),
IE("immersiveengineering", true)
IE("immersiveengineering", true),
INF("iceandfire", false)
;

3
src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
View file

@ -5,6 +5,7 @@ import static com.simibubi.create.foundation.data.recipe.Mods.MEK;
import static com.simibubi.create.foundation.data.recipe.Mods.MW;
import static com.simibubi.create.foundation.data.recipe.Mods.SM;
import static com.simibubi.create.foundation.data.recipe.Mods.TH;
import static com.simibubi.create.foundation.data.recipe.Mods.INF;
import java.util.ArrayList;
import java.util.List;
@ -972,7 +973,7 @@ public class StandardRecipeGen extends CreateRecipeProvider {
CRUSHED_OSMIUM = blastModdedCrushedMetal(AllItems.CRUSHED_OSMIUM, "osmium", MEK),
CRUSHED_PLATINUM = blastModdedCrushedMetal(AllItems.CRUSHED_PLATINUM, "platinum", SM),
CRUSHED_SILVER = blastModdedCrushedMetal(AllItems.CRUSHED_SILVER, "silver", MW, TH, IE, SM),
CRUSHED_SILVER = blastModdedCrushedMetal(AllItems.CRUSHED_SILVER, "silver", MW, TH, IE, SM, INF),
CRUSHED_TIN = blastModdedCrushedMetal(AllItems.CRUSHED_TIN, "tin", MEK, TH, MW, SM),
CRUSHED_LEAD = blastModdedCrushedMetal(AllItems.CRUSHED_LEAD, "lead", MW, TH, IE, SM),
CRUSHED_QUICKSILVER = blastModdedCrushedMetal(AllItems.CRUSHED_QUICKSILVER, "quicksilver", MW),

3
src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java
View file

@ -5,6 +5,7 @@ import static com.simibubi.create.foundation.data.recipe.Mods.MEK;
import static com.simibubi.create.foundation.data.recipe.Mods.MW;
import static com.simibubi.create.foundation.data.recipe.Mods.SM;
import static com.simibubi.create.foundation.data.recipe.Mods.TH;
import static com.simibubi.create.foundation.data.recipe.Mods.INF;
import java.util.function.Supplier;
@ -52,7 +53,7 @@ public class WashingRecipeGen extends ProcessingRecipeGen {
CRUSHED_OSMIUM = moddedCrushedOre(AllItems.CRUSHED_OSMIUM, "osmium", MEK),
CRUSHED_PLATINUM = moddedCrushedOre(AllItems.CRUSHED_PLATINUM, "platinum", SM),
CRUSHED_SILVER = moddedCrushedOre(AllItems.CRUSHED_SILVER, "silver", TH, MW, IE, SM),
CRUSHED_SILVER = moddedCrushedOre(AllItems.CRUSHED_SILVER, "silver", TH, MW, IE, SM, INF),
CRUSHED_TIN = moddedCrushedOre(AllItems.CRUSHED_TIN, "tin", TH, MEK, MW, SM),
CRUSHED_LEAD = moddedCrushedOre(AllItems.CRUSHED_LEAD, "lead", TH, MW, IE, SM),
CRUSHED_QUICKSILVER = moddedCrushedOre(AllItems.CRUSHED_QUICKSILVER, "quicksilver", MW),