diff --git a/build.gradle b/build.gradle index c06346b5..5dcf491c 100644 --- a/build.gradle +++ b/build.gradle @@ -108,6 +108,16 @@ neoForge { "${mod_id}" { sourceSet(sourceSets.main) } + if (findProject(':SophisticatedCore') != null) { + "sophisticatedcore" { + sourceSet(project(':SophisticatedCore').sourceSets.main) + } + } + if (findProject(':SophisticatedBackpacks') != null) { + "sophisticatedbackpacks" { + sourceSet(project(':SophisticatedBackpacks').sourceSets.main) + } + } } unitTest { diff --git a/gradle.properties b/gradle.properties index 8dfbd98c..03b92141 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ loader_version_range=[4,) mod_id=sophisticatedstorage mod_name=Sophisticated Storage mod_license=GNU General Public License v3.0 -mod_version=0.10.40 +mod_version=0.10.41 mod_group_id=sophisticatedstorage mod_authors=P3pp3rF1y, Ridanisaurus mod_description=Fancy and functional storage containers. diff --git a/src/generated/resources/data/sophisticatedstorage/advancement/recipes/misc/basic_to_iron_tier_from_basic_to_copper_tier.json b/src/generated/resources/data/sophisticatedstorage/advancement/recipes/misc/basic_to_iron_tier_from_basic_to_copper_tier.json new file mode 100644 index 00000000..c4c6eafc --- /dev/null +++ b/src/generated/resources/data/sophisticatedstorage/advancement/recipes/misc/basic_to_iron_tier_from_basic_to_copper_tier.json @@ -0,0 +1,38 @@ +{ + "neoforge:conditions": [ + { + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedstorage:basic_to_iron_tier_upgrade" + } + ], + "parent": "minecraft:recipes/root", + "criteria": { + "has_redstone_torch": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone_torch" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "sophisticatedstorage:basic_to_iron_tier_from_basic_to_copper_tier" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_redstone_torch" + ] + ], + "rewards": { + "recipes": [ + "sophisticatedstorage:basic_to_iron_tier_from_basic_to_copper_tier" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/sophisticatedstorage/recipe/basic_to_iron_tier_from_basic_to_copper_tier.json b/src/generated/resources/data/sophisticatedstorage/recipe/basic_to_iron_tier_from_basic_to_copper_tier.json new file mode 100644 index 00000000..df2fc745 --- /dev/null +++ b/src/generated/resources/data/sophisticatedstorage/recipe/basic_to_iron_tier_from_basic_to_copper_tier.json @@ -0,0 +1,27 @@ +{ + "neoforge:conditions": [ + { + "type": "sophisticatedcore:item_enabled", + "itemRegistryName": "sophisticatedstorage:basic_to_iron_tier_upgrade" + } + ], + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "tag": "c:ingots/iron" + }, + "R": { + "item": "sophisticatedstorage:basic_to_copper_tier_upgrade" + } + }, + "pattern": [ + " I ", + "IRI", + " I " + ], + "result": { + "count": 1, + "id": "sophisticatedstorage:basic_to_iron_tier_upgrade" + } +} \ No newline at end of file diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/data/StorageRecipeProvider.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/data/StorageRecipeProvider.java index e7ee196c..60c5e87a 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/data/StorageRecipeProvider.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/data/StorageRecipeProvider.java @@ -453,6 +453,15 @@ private void addTierUpgradeItemRecipes(RecipeOutput recipeOutput) { .unlockedBy(HAS_REDSTONE_TORCH_CRITERION_NAME, has(Items.REDSTONE_TORCH)) .save(recipeOutput); + ShapeBasedRecipeBuilder.shaped(ModItems.BASIC_TO_IRON_TIER_UPGRADE.get()) + .pattern(" I ") + .pattern("IRI") + .pattern(" I ") + .define('R', ModItems.BASIC_TO_COPPER_TIER_UPGRADE.get()) + .define('I', Tags.Items.INGOTS_IRON) + .unlockedBy(HAS_REDSTONE_TORCH_CRITERION_NAME, has(Items.REDSTONE_TORCH)) + .save(recipeOutput, SophisticatedStorage.getRL("basic_to_iron_tier_from_basic_to_copper_tier")); + ShapeBasedRecipeBuilder.shaped(ModItems.BASIC_TO_GOLD_TIER_UPGRADE.get()) .pattern("GGG") .pattern("GTG")