diff --git a/build.gradle b/build.gradle index e522f8d81f..092c4fb89e 100644 --- a/build.gradle +++ b/build.gradle @@ -94,6 +94,7 @@ dependencies { modCompileOnly("com.unascribed:ears-api:${project.ears_version}") modCompileOnly("maven.modrinth:create-fabric:${project.create_version}") { transitive = false } modCompileOnly("maven.modrinth:neepmeat:${project.neepmeat_version}") { transitive = false } + modCompileOnly("maven.modrinth:lodestonelib:${project.lodestone_version}") { transitive = false} modCompileOnly("maven.modrinth:malum:${project.malum_version}") { transitive = false} // modCompileOnly("maven.modrinth:enchantment-descriptions:${project.enchantment_descriptions_version}") modCompileOnly("maven.modrinth:travelersbackpack:${project.travelers_backpack_version}") diff --git a/gradle.properties b/gradle.properties index 17d636588a..48eead171e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,6 +59,8 @@ create_version=0.5.1-f-build.1417+mc1.20.1 neepmeat_version=0.6.2-beta+1.20.1 # https://modrinth.com/mod/malum malum_version=1.20.1-1.6.3.0b-fabric +# https://modrinth.com/mod/lodestonelib +lodestone_version=1.20.1-1.6.2.3f port_lib_version = 2.3.4+1.20.1 port_lib_modules = lazy_registration # https://modrinth.com/mod/exclusions-lib diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/CloversFavorEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/CloversFavorEnchantment.java index 7b791e4086..f57aeff659 100644 --- a/src/main/java/de/dafuqs/spectrum/enchantments/CloversFavorEnchantment.java +++ b/src/main/java/de/dafuqs/spectrum/enchantments/CloversFavorEnchantment.java @@ -1,10 +1,17 @@ package de.dafuqs.spectrum.enchantments; +import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem; +import com.sammy.malum.registry.common.item.EnchantmentRegistry; import de.dafuqs.spectrum.*; +import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks; import de.dafuqs.spectrum.helpers.*; import de.dafuqs.spectrum.registries.*; import net.minecraft.enchantment.*; import net.minecraft.entity.*; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolItem; +import net.minecraft.item.TridentItem; import net.minecraft.util.*; public class CloversFavorEnchantment extends SpectrumEnchantment { @@ -37,10 +44,23 @@ public int getMaxPower(int level) { public int getMaxLevel() { return SpectrumCommon.CONFIG.CloversFavorMaxLevel; } + + @Override + public boolean isAcceptableItem(ItemStack stack) { + var item = stack.getItem(); + if(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && + item instanceof MalumScytheItem) + { + return true; + } + + return super.isAcceptableItem(stack); + } @Override public boolean canAccept(Enchantment other) { - return super.canAccept(other) && other != Enchantments.LOOTING; + return super.canAccept(other) && other != Enchantments.LOOTING && + !(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && other == EnchantmentRegistry.SPIRIT_PLUNDER.get()); } } diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/ExuberanceEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/ExuberanceEnchantment.java index e19c96265a..f50e671dc8 100644 --- a/src/main/java/de/dafuqs/spectrum/enchantments/ExuberanceEnchantment.java +++ b/src/main/java/de/dafuqs/spectrum/enchantments/ExuberanceEnchantment.java @@ -1,6 +1,8 @@ package de.dafuqs.spectrum.enchantments; +import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem; import de.dafuqs.spectrum.*; +import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks; import de.dafuqs.spectrum.items.tools.*; import de.dafuqs.spectrum.registries.*; import net.minecraft.enchantment.*; @@ -45,7 +47,8 @@ public int getMaxLevel() { @Override public boolean isAcceptableItem(ItemStack stack) { - return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || EnchantmentTarget.DIGGER.isAcceptableItem(stack.getItem()) || stack.getItem() instanceof SpectrumFishingRodItem; + return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || EnchantmentTarget.DIGGER.isAcceptableItem(stack.getItem()) || stack.getItem() instanceof SpectrumFishingRodItem || + (SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem); } } \ No newline at end of file diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/FirstStrikeEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/FirstStrikeEnchantment.java index da9ef7e1b1..0c7503533f 100644 --- a/src/main/java/de/dafuqs/spectrum/enchantments/FirstStrikeEnchantment.java +++ b/src/main/java/de/dafuqs/spectrum/enchantments/FirstStrikeEnchantment.java @@ -1,6 +1,8 @@ package de.dafuqs.spectrum.enchantments; +import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem; import de.dafuqs.spectrum.*; +import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks; import net.minecraft.enchantment.*; import net.minecraft.entity.*; import net.minecraft.item.*; @@ -29,7 +31,8 @@ public int getMaxLevel() { @Override public boolean isAcceptableItem(ItemStack stack) { - return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem; + return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || + (SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem); } } diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/ImprovedCriticalEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/ImprovedCriticalEnchantment.java index 3adc14dcf9..2cae72b0b3 100644 --- a/src/main/java/de/dafuqs/spectrum/enchantments/ImprovedCriticalEnchantment.java +++ b/src/main/java/de/dafuqs/spectrum/enchantments/ImprovedCriticalEnchantment.java @@ -1,6 +1,9 @@ package de.dafuqs.spectrum.enchantments; +import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem; +import com.sammy.malum.registry.common.item.EnchantmentRegistry; import de.dafuqs.spectrum.*; +import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks; import net.minecraft.enchantment.*; import net.minecraft.entity.*; import net.minecraft.item.*; @@ -38,12 +41,14 @@ public int getMaxLevel() { @Override public boolean canAccept(Enchantment other) { - return other != Enchantments.SHARPNESS && super.canAccept(other); + return other != Enchantments.SHARPNESS && !(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && other == EnchantmentRegistry.HAUNTED.get()) + && super.canAccept(other); } @Override public boolean isAcceptableItem(ItemStack stack) { - return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem; + return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || + (SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem); } } diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/InventoryInsertionEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/InventoryInsertionEnchantment.java index 26e4371a64..5363bc9970 100644 --- a/src/main/java/de/dafuqs/spectrum/enchantments/InventoryInsertionEnchantment.java +++ b/src/main/java/de/dafuqs/spectrum/enchantments/InventoryInsertionEnchantment.java @@ -1,5 +1,7 @@ package de.dafuqs.spectrum.enchantments; +import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem; +import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks; import de.dafuqs.spectrum.items.tools.*; import net.minecraft.enchantment.*; import net.minecraft.entity.*; @@ -42,7 +44,8 @@ public boolean isAcceptableItem(ItemStack stack) { || EnchantmentTarget.BOW.isAcceptableItem(item) || EnchantmentTarget.CROSSBOW.isAcceptableItem(item) || stack.getItem() instanceof ShearsItem - || stack.getItem() instanceof SpectrumFishingRodItem; + || stack.getItem() instanceof SpectrumFishingRodItem + || (SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem); } } \ No newline at end of file diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/TightGripEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/TightGripEnchantment.java index 022d08b98e..f4a2edb649 100644 --- a/src/main/java/de/dafuqs/spectrum/enchantments/TightGripEnchantment.java +++ b/src/main/java/de/dafuqs/spectrum/enchantments/TightGripEnchantment.java @@ -1,8 +1,12 @@ package de.dafuqs.spectrum.enchantments; +import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem; +import com.sammy.malum.registry.common.item.EnchantmentRegistry; import de.dafuqs.spectrum.*; +import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks; import net.minecraft.enchantment.*; import net.minecraft.entity.*; +import net.minecraft.item.ItemStack; import net.minecraft.util.*; public class TightGripEnchantment extends SpectrumEnchantment { @@ -26,5 +30,22 @@ public int getMaxLevel() { return SpectrumCommon.CONFIG.TightGripMaxLevel; } + @Override + public boolean isAcceptableItem(ItemStack stack) { + var item = stack.getItem(); + if(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && + item instanceof MalumScytheItem) + { + return true; + } + + return super.isAcceptableItem(stack); + } + @Override + public boolean canAccept(Enchantment other) { + return super.canAccept(other) && + !(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && other == EnchantmentRegistry.REBOUND.get()); + } + } diff --git a/src/main/java/de/dafuqs/spectrum/enchantments/TreasureHunterEnchantment.java b/src/main/java/de/dafuqs/spectrum/enchantments/TreasureHunterEnchantment.java index 879b734df4..f7b076800b 100644 --- a/src/main/java/de/dafuqs/spectrum/enchantments/TreasureHunterEnchantment.java +++ b/src/main/java/de/dafuqs/spectrum/enchantments/TreasureHunterEnchantment.java @@ -1,6 +1,9 @@ package de.dafuqs.spectrum.enchantments; +import com.sammy.malum.common.item.curiosities.weapons.scythe.MalumScytheItem; +import com.sammy.malum.registry.common.item.EnchantmentRegistry; import de.dafuqs.spectrum.*; +import de.dafuqs.spectrum.compat.SpectrumIntegrationPacks; import de.dafuqs.spectrum.registries.*; import net.minecraft.enchantment.*; import net.minecraft.entity.*; @@ -56,12 +59,14 @@ public int getMaxLevel() { @Override public boolean canAccept(Enchantment other) { - return super.canAccept(other) && other != Enchantments.LOOTING; + return super.canAccept(other) && other != Enchantments.LOOTING && + !(SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && other == EnchantmentRegistry.SPIRIT_PLUNDER.get()); } @Override public boolean isAcceptableItem(ItemStack stack) { - return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || stack.isIn(ItemTags.AXES); + return super.isAcceptableItem(stack) || stack.getItem() instanceof AxeItem || stack.isIn(ItemTags.AXES) || + (SpectrumIntegrationPacks.isIntegrationPackActive(SpectrumIntegrationPacks.MALUM_ID) && stack.getItem() instanceof MalumScytheItem); } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 228c4ff23d..d589a2ad02 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -4100,7 +4100,7 @@ "enchantment.spectrum.razing.desc": "Higher mining speed the harder a block is to break", "enchantment.spectrum.resonance": "Resonance", "enchantment.spectrum.resonance.desc": "Uses gentle vibrations to allow some blocks to either drop themselves or preserve special properties", - "enchantment.spectrum.serendipity_reel": "Serendipity_reel", + "enchantment.spectrum.serendipity_reel": "Serendipity Reel", "enchantment.spectrum.serendipity_reel.desc": "Chance to reel in double loot", "enchantment.spectrum.sniper": "Sniping", "enchantment.spectrum.sniper.desc": "Increased projectile speed", @@ -5062,6 +5062,7 @@ "spectrum.rei.potion_workshop_reacting.botania.mana_powder": "• +25% duration\n• 15% chance to add last effect", "spectrum.rei.potion_workshop_reacting.botania.pixie_dust": "• creates Lingering Potions & Tipped Arrows\n• -25% potency", "spectrum.rei.potion_workshop_reacting.hexcasting.charged_amethyst": "\n• +15-120s duration. Sometimes more, sometimes less", + "spectrum.rei.potion_workshop_reacting.malum.void_salts": "• +200% duration\n• -2 yield", "spectrum.rei.potion_workshop_reacting.minecraft.dragon_breath": "• Creates Lingering Potions - also requires Gunpowder as reagent\n• Allows you to create Tipped Arrows, if you supply Arrows instead of Bottles", "spectrum.rei.potion_workshop_reacting.minecraft.glowstone_dust": "• +1 potency", "spectrum.rei.potion_workshop_reacting.minecraft.gunpowder": "• creates Splash Potions", diff --git a/src/main/resources/data/spectrum/advancements/mod_integration/malum/haunted.json b/src/main/resources/data/spectrum/advancements/mod_integration/malum/haunted.json new file mode 100644 index 0000000000..90dff02d9a --- /dev/null +++ b/src/main/resources/data/spectrum/advancements/mod_integration/malum/haunted.json @@ -0,0 +1,32 @@ +{ + "criteria": { + "built_enchanting_structure": { + "trigger": "revelationary:advancement_gotten", + "conditions": { "advancement_identifier": "spectrum:midgame/build_enchanting_structure" } + }, + "obtain_umbral": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "malum:umbral_spirit" + ] + } + ] + } + }, + "collected_storm_stone": { + "trigger": "revelationary:advancement_gotten", + "conditions": { "advancement_identifier": "spectrum:midgame/collect_storm_stone" } + } + }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/mod_integration/malum/replenishing.json b/src/main/resources/data/spectrum/advancements/mod_integration/malum/replenishing.json new file mode 100644 index 0000000000..1bb2540bd4 --- /dev/null +++ b/src/main/resources/data/spectrum/advancements/mod_integration/malum/replenishing.json @@ -0,0 +1,32 @@ +{ + "criteria": { + "built_enchanting_structure": { + "trigger": "revelationary:advancement_gotten", + "conditions": { "advancement_identifier": "spectrum:midgame/build_enchanting_structure" } + }, + "obtain_umbral": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "malum:umbral_spirit" + ] + } + ] + } + }, + "collected_neolith": { + "trigger": "revelationary:advancement_gotten", + "conditions": { "advancement_identifier": "spectrum:midgame/collect_neolith" } + } + }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/mod_integration/malum/understand_color_and_spirit.json b/src/main/resources/data/spectrum/advancements/mod_integration/malum/understand_color_and_spirit.json new file mode 100644 index 0000000000..775485ae73 --- /dev/null +++ b/src/main/resources/data/spectrum/advancements/mod_integration/malum/understand_color_and_spirit.json @@ -0,0 +1,30 @@ +{ + "criteria": { + "understand_color": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:lategame/collect_grayscale_pigments" + } + }, + "understand_spirit": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "malum:umbral_spirit" + ] + } + ] + } + } + }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/mod_integration/malum/visited_well.json b/src/main/resources/data/spectrum/advancements/mod_integration/malum/visited_well.json new file mode 100644 index 0000000000..2c85c5a23d --- /dev/null +++ b/src/main/resources/data/spectrum/advancements/mod_integration/malum/visited_well.json @@ -0,0 +1,28 @@ +{ + "criteria": { + "found_well": { + "trigger": "minecraft:location", + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "location": { + "structure": "malum:weeping_well" + } + } + } + ] + } + } + }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json b/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json index a700876599..fce1cdcc65 100644 --- a/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json +++ b/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json @@ -1,20 +1,37 @@ { "criteria": { "placed_pedestal": { - "trigger":"revelationary:advancement_gotten", + "trigger": "revelationary:advancement_gotten", "conditions": { "advancement_identifier": "spectrum:place_pedestal" } }, "collected_ender_eye": { - "trigger":"revelationary:advancement_gotten", + "trigger": "revelationary:advancement_gotten", "conditions": { "advancement_identifier": "spectrum:hidden/collect_vanilla/ender_eye" } }, + "collected_warp_flux": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "malum:warp_flux" + ] + } + ] + } + }, "gotten_radiating_ender": { - "trigger":"revelationary:advancement_gotten", + "trigger": "revelationary:advancement_gotten", "conditions": { "advancement_identifier": "spectrum:get_radiating_ender" } } - } + }, + "requirements": [ + [ "placed_pedestal" ], + [ "collected_ender_eye", "collected_warp_flux" ], + [ "gotten_radiating_ender" ] + ] } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_haunted.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_haunted.json new file mode 100644 index 0000000000..ae684ce36b --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_haunted.json @@ -0,0 +1,54 @@ +{ + "type": "spectrum:enchanter", + "time": 500, + "required_experience": 200, + "ingredients": [ + { + "item": "minecraft:book" + }, + { + "item": "spectrum:purple_pigment" + }, + { + "item": "spectrum:purple_pigment" + }, + { + "item": "malum:malignant_lead" + }, + { + "item": "spectrum:storm_stone" + }, + { + "item": "spectrum:purple_pigment" + }, + { + "item": "spectrum:purple_pigment" + }, + { + "item": "malum:malignant_lead" + }, + { + "item": "spectrum:storm_stone" + } + ], + "result": { + "item": "minecraft:enchanted_book", + "nbt": { + "StoredEnchantments": [ + { + "id": "malum:haunted", + "lvl": "1s" + } + ] + } + }, + "required_advancement": "spectrum:mod_integration/malum/haunted", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_rebound.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_rebound.json new file mode 100644 index 0000000000..c67ada016a --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_rebound.json @@ -0,0 +1,54 @@ +{ + "type": "spectrum:enchanter", + "time": 300, + "required_experience": 100, + "ingredients": [ + { + "item": "minecraft:book" + }, + { + "item": "spectrum:green_pigment" + }, + { + "item": "spectrum:green_pigment" + }, + { + "item": "malum:cursed_sapball" + }, + { + "item": "minecraft:iron_ingot" + }, + { + "item": "spectrum:green_pigment" + }, + { + "item": "spectrum:green_pigment" + }, + { + "item": "malum:cursed_sapball" + }, + { + "item": "minecraft:iron_ingot" + } + ], + "result": { + "item": "minecraft:enchanted_book", + "nbt": { + "StoredEnchantments": [ + { + "id": "malum:rebound", + "lvl": "1s" + } + ] + } + }, + "required_advancement": "spectrum:midgame/build_enchanting_structure", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_replenishing.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_replenishing.json new file mode 100644 index 0000000000..f647903606 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_replenishing.json @@ -0,0 +1,54 @@ +{ + "type": "spectrum:enchanter", + "time": 500, + "required_experience": 200, + "ingredients": [ + { + "item": "minecraft:book" + }, + { + "item": "spectrum:black_pigment" + }, + { + "item": "spectrum:black_pigment" + }, + { + "item": "malum:mnemonic_fragment" + }, + { + "item": "spectrum:neolith" + }, + { + "item": "spectrum:black_pigment" + }, + { + "item": "spectrum:black_pigment" + }, + { + "item": "malum:mnemonic_fragment" + }, + { + "item": "spectrum:neolith" + } + ], + "result": { + "item": "minecraft:enchanted_book", + "nbt": { + "StoredEnchantments": [ + { + "id": "malum:replenishing", + "lvl": "1s" + } + ] + } + }, + "required_advancement": "spectrum:mod_integration/malum/replenishing", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_spirit_plunder.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_spirit_plunder.json new file mode 100644 index 0000000000..e1fbbdc054 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchanter/book_spirit_plunder.json @@ -0,0 +1,54 @@ +{ + "type": "spectrum:enchanter", + "time": 300, + "required_experience": 100, + "ingredients": [ + { + "item": "minecraft:book" + }, + { + "item": "spectrum:light_blue_pigment" + }, + { + "item": "spectrum:light_blue_pigment" + }, + { + "item": "malum:processed_soulstone" + }, + { + "item": "spectrum:four_leaf_clover" + }, + { + "item": "spectrum:light_blue_pigment" + }, + { + "item": "spectrum:light_blue_pigment" + }, + { + "item": "malum:processed_soulstone" + }, + { + "item": "spectrum:four_leaf_clover" + } + ], + "result": { + "item": "minecraft:enchanted_book", + "nbt": { + "StoredEnchantments": [ + { + "id": "malum:spirit_plunder", + "lvl": "1s" + } + ] + } + }, + "required_advancement": "spectrum:unlocks/enchantments/clovers_favor", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/haunted.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/haunted.json new file mode 100644 index 0000000000..4709078a26 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/haunted.json @@ -0,0 +1,30 @@ +{ + "type": "spectrum:enchantment_upgrade", + "enchantment": "malum:haunted", + "levels": [ + { + "experience": 400, + "item": "spectrum:purple_pigment", + "item_count": 8 + }, + { + "experience": 1600, + "item": "spectrum:purple_pigment", + "item_count": 32 + }, + { + "experience": 3200, + "item": "spectrum:purple_pigment", + "item_count": 128 + } + ], + "required_advancement": "spectrum:mod_integration/malum/haunted", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/rebound.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/rebound.json new file mode 100644 index 0000000000..4bf813175e --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/rebound.json @@ -0,0 +1,40 @@ +{ + "type": "spectrum:enchantment_upgrade", + "enchantment": "malum:rebound", + "levels": [ + { + "experience": 200, + "item": "spectrum:green_pigment", + "item_count": 8 + }, + { + "experience": 400, + "item": "spectrum:green_pigment", + "item_count": 32 + }, + { + "experience": 200, + "item": "spectrum:green_pigment", + "item_count": 128 + }, + { + "experience": 10000, + "item": "spectrum:green_pigment", + "item_count": 512 + }, + { + "experience": 40000, + "item": "spectrum:green_pigment", + "item_count": 512 + } + ], + "required_advancement": "spectrum:midgame/build_enchanting_structure", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/replenishing.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/replenishing.json new file mode 100644 index 0000000000..7427ea1e7b --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/replenishing.json @@ -0,0 +1,30 @@ +{ + "type": "spectrum:enchantment_upgrade", + "enchantment": "malum:replenishing", + "levels": [ + { + "experience": 400, + "item": "spectrum:black_pigment", + "item_count": 8 + }, + { + "experience": 1600, + "item": "spectrum:black_pigment", + "item_count": 32 + }, + { + "experience": 3200, + "item": "spectrum:black_pigment", + "item_count": 128 + } + ], + "required_advancement": "spectrum:mod_integration/malum/replenishing", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/spirit_plunder.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/spirit_plunder.json new file mode 100644 index 0000000000..51ab2460e5 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/enchantment_upgrade/spirit_plunder.json @@ -0,0 +1,35 @@ +{ + "type": "spectrum:enchantment_upgrade", + "enchantment": "malum:spirit_plunder", + "levels": [ + { + "experience": 200, + "item": "spectrum:light_blue_pigment", + "item_count": 8 + }, + { + "experience": 1600, + "item": "spectrum:light_blue_pigment", + "item_count": 32 + }, + { + "experience": 3200, + "item": "spectrum:light_blue_pigment", + "item_count": 128 + }, + { + "experience": 6400, + "item": "spectrum:light_blue_pigment", + "item_count": 256 + } + ], + "required_advancement": "spectrum:unlocks/enchantments/clovers_favor", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_bag_of_holding.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_bag_of_holding.json new file mode 100644 index 0000000000..c734b1cd01 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_bag_of_holding.json @@ -0,0 +1,40 @@ +{ + "type": "spectrum:pedestal", + "time": 240, + "tier": "basic", + "magenta": 4, + "yellow": 0, + "cyan": 4, + "black": 0, + "white": 0, + "experience": 2.0, + "pattern": [ + "OOO", + "TWT", + "OOO" + ], + "key": { + "O": { + "item": "minecraft:obsidian" + }, + "W": { + "item": "malum:warp_flux" + }, + "T": { + "item": "spectrum:radiating_ender" + } + }, + "result": { + "item": "spectrum:bag_of_holding", + "count": 1 + }, + "required_advancement": "spectrum:unlocks/items/bag_of_holding", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_glow_phantom_frame.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_glow_phantom_frame.json new file mode 100644 index 0000000000..1c27386af9 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_glow_phantom_frame.json @@ -0,0 +1,44 @@ +{ + "type": "spectrum:pedestal", + "group": "phantom_frames", + "time": 80, + "tier": "basic", + "cyan": 0, + "magenta": 0, + "yellow": 4, + "white": 0, + "black": 0, + "experience": 0.5, + "pattern": [ + "SGS", + "CLC", + "SSS" + ], + "key": { + "L": { + "item": "malum:astral_weave" + }, + "S": { + "item": "minecraft:stick" + }, + "C": { + "item": "spectrum:shimmerstone_gem" + }, + "G": { + "item": "minecraft:glow_ink_sac" + } + }, + "result": { + "item": "spectrum:glow_phantom_frame", + "count": 2 + }, + "required_advancement": "spectrum:unlocks/items/phantom_frames", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_phantom_frame.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_phantom_frame.json new file mode 100644 index 0000000000..019152b4aa --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/alt_phantom_frame.json @@ -0,0 +1,41 @@ +{ + "type": "spectrum:pedestal", + "group": "phantom_frames", + "time": 80, + "tier": "basic", + "cyan": 0, + "magenta": 0, + "yellow": 2, + "white": 0, + "black": 0, + "experience": 0.5, + "pattern": [ + "SSS", + "CLC", + "SSS" + ], + "key": { + "L": { + "item": "malum:astral_weave" + }, + "S": { + "item": "minecraft:stick" + }, + "C": { + "item": "spectrum:shimmerstone_gem" + } + }, + "result": { + "item": "spectrum:phantom_frame", + "count": 2 + }, + "required_advancement": "spectrum:unlocks/items/phantom_frames", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/chorusless_ender_splice.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/chorusless_ender_splice.json new file mode 100644 index 0000000000..997271484d --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/chorusless_ender_splice.json @@ -0,0 +1,43 @@ +{ + "type": "spectrum:pedestal", + "time": 240, + "tier": "advanced", + "magenta": 4, + "yellow": 0, + "cyan": 4, + "black": 0, + "white": 0, + "experience": 2.0, + "pattern": [ + "PCP", + "ETE", + "PCP" + ], + "key": { + "T": { + "item": "spectrum:radiating_ender" + }, + "C": { + "item": "malum:warp_flux" + }, + "E": { + "item": "spectrum:neolith" + }, + "P": { + "item": "spectrum:cyan_pigment" + } + }, + "result": { + "item": "spectrum:ender_splice", + "count": 4 + }, + "required_advancement": "spectrum:unlocks/items/ender_splice", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/malum_alt_enchantment_canvas.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/malum_alt_enchantment_canvas.json new file mode 100644 index 0000000000..cbce18d0ea --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/pedestal/malum_alt_enchantment_canvas.json @@ -0,0 +1,37 @@ +{ + "type": "spectrum:pedestal", + "time": 40, + "tier": "simple", + "cyan": 8, + "magenta": 2, + "yellow": 0, + "black": 0, + "white": 0, + "experience": 2.0, + "pattern": [ + "PCP", + "C C", + "PCP" + ], + "key": { + "C": { + "item": "malum:astral_weave" + }, + "P": { + "item": "spectrum:purple_pigment" + } + }, + "result": { + "item": "spectrum:enchantment_canvas", + "count": 2 + }, + "required_advancement": "spectrum:unlocks/items/enchantment_canvas", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_brewing/alt_invisibility.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_brewing/alt_invisibility.json new file mode 100644 index 0000000000..59c00bf36c --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_brewing/alt_invisibility.json @@ -0,0 +1,26 @@ +{ + "type": "spectrum:potion_workshop_brewing", + "group": "malum", + "ingredient1": { + "item": "minecraft:nether_wart" + }, + "ingredient2": { + "item": "malum:astral_weave" + }, + "effect": "minecraft:invisibility", + "base_duration_ticks": 3600, + "potency_modifier": 0.0, + "applicable_to_potions": true, + "applicable_to_tipped_arrows": true, + "applicable_to_potion_fillables": true, + "ink_color": "spectrum:green", + "ink_cost": 8, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_brewing/alt_poison.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_brewing/alt_poison.json new file mode 100644 index 0000000000..3f9841a326 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_brewing/alt_poison.json @@ -0,0 +1,26 @@ +{ + "type": "spectrum:potion_workshop_brewing", + "group": "malum", + "ingredient1": { + "item": "minecraft:nether_wart" + }, + "ingredient2": { + "item": "malum:rotting_essence" + }, + "effect": "minecraft:poison", + "base_duration_ticks": 900, + "potency_modifier": 1.0, + "applicable_to_potions": true, + "applicable_to_tipped_arrows": true, + "applicable_to_potion_fillables": true, + "ink_color": "spectrum:pink", + "ink_cost": 2, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_crafting/concentrated_gluttony.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_crafting/concentrated_gluttony.json new file mode 100644 index 0000000000..70b04ec59d --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_crafting/concentrated_gluttony.json @@ -0,0 +1,26 @@ +{ + "type": "spectrum:potion_workshop_crafting", + "base_ingredient": { + "item": "minecraft:honey_bottle" + }, + "use_up_base_ingredient": true, + "color": 867887, + "ingredient1": { + "item": "malum:rotting_essence" + }, + "ingredient2": { + "item": "malum:living_flesh" + }, + "result": { + "item": "malum:concentrated_gluttony", + "count": 3 + }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_crafting/splash_of_gluttony.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_crafting/splash_of_gluttony.json new file mode 100644 index 0000000000..39b4af43ca --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_crafting/splash_of_gluttony.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:potion_workshop_crafting", + "base_ingredient": { + "item": "minecraft:honey_bottle" + }, + "use_up_base_ingredient": true, + "color": 867887, + "ingredient1": { + "item": "malum:rotting_essence" + }, + "ingredient2": { + "item": "malum:living_flesh" + }, + "ingredient3": { + "item": "minecraft:gunpowder" + }, + "result": { + "item": "malum:splash_of_gluttony", + "count": 3 + }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_reacting/void_salts.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_reacting/void_salts.json new file mode 100644 index 0000000000..dd1d5d944a --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/potion_workshop_reacting/void_salts.json @@ -0,0 +1,17 @@ +{ + "type": "spectrum:potion_workshop_reacting", + "item": "malum:void_salts", + "modifiers": { + "duration_multiplier": 3.0, + "flat_yield_bonus": -2.0 + }, + "required_advancement": "spectrum:mod_integration/malum/visited_well", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/aerial_spirit.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/aerial_spirit.json new file mode 100644 index 0000000000..443eebfd42 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/aerial_spirit.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:spirit_instiller", + "time": 150, + "experience": 0.75, + "ingredient1": { + "item": "spectrum:paltaeria_gem" + }, + "ingredient2": { + "item": "spectrum:cyan_pigment", + "count": 4 + }, + "center_ingredient": { + "item": "malum:null_slate", + "count": 2 + }, + "result": { + "item": "malum:aerial_spirit", + "count": 2 + }, + "required_advancement": "spectrum:mod_integration/malum/understand_color_and_spirit", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/aqueous_spirit.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/aqueous_spirit.json new file mode 100644 index 0000000000..78f422a67b --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/aqueous_spirit.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:spirit_instiller", + "time": 150, + "experience": 0.75, + "ingredient1": { + "item": "spectrum:mermaids_gem" + }, + "ingredient2": { + "item": "spectrum:light_blue_pigment", + "count": 4 + }, + "center_ingredient": { + "item": "malum:null_slate", + "count": 2 + }, + "result": { + "item": "malum:aqueous_spirit", + "count": 2 + }, + "required_advancement": "spectrum:mod_integration/malum/understand_color_and_spirit", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/arcane_spirit.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/arcane_spirit.json new file mode 100644 index 0000000000..3b773bc49b --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/arcane_spirit.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:spirit_instiller", + "time": 150, + "experience": 0.75, + "ingredient1": { + "item": "malum:blighted_gunk" + }, + "ingredient2": { + "item": "spectrum:light_gray_pigment", + "count": 4 + }, + "center_ingredient": { + "item": "malum:null_slate", + "count": 2 + }, + "result": { + "item": "malum:arcane_spirit", + "count": 2 + }, + "required_advancement": "spectrum:mod_integration/malum/understand_color_and_spirit", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/earthen_spirit.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/earthen_spirit.json new file mode 100644 index 0000000000..1ace5968b3 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/earthen_spirit.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:spirit_instiller", + "time": 150, + "experience": 0.75, + "ingredient1": { + "item": "spectrum:bedrock_dust" + }, + "ingredient2": { + "item": "spectrum:brown_pigment", + "count": 4 + }, + "center_ingredient": { + "item": "malum:null_slate", + "count": 2 + }, + "result": { + "item": "malum:earthen_spirit", + "count": 2 + }, + "required_advancement": "spectrum:mod_integration/malum/understand_color_and_spirit", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/eldritch_spirit.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/eldritch_spirit.json new file mode 100644 index 0000000000..a6d12a1122 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/eldritch_spirit.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:spirit_instiller", + "time": 150, + "experience": 0.75, + "ingredient1": { + "item": "spectrum:stardust" + }, + "ingredient2": { + "item": "spectrum:gray_pigment", + "count": 4 + }, + "center_ingredient": { + "item": "malum:null_slate", + "count": 2 + }, + "result": { + "item": "malum:eldritch_spirit", + "count": 2 + }, + "required_advancement": "spectrum:mod_integration/malum/understand_color_and_spirit", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/infernal_spirit.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/infernal_spirit.json new file mode 100644 index 0000000000..27074d3c69 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/infernal_spirit.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:spirit_instiller", + "time": 150, + "experience": 0.75, + "ingredient1": { + "item": "malum:blazing_quartz" + }, + "ingredient2": { + "item": "spectrum:orange_pigment", + "count": 4 + }, + "center_ingredient": { + "item": "malum:null_slate", + "count": 2 + }, + "result": { + "item": "malum:infernal_spirit", + "count": 2 + }, + "required_advancement": "spectrum:mod_integration/malum/understand_color_and_spirit", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/sacred_spirit.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/sacred_spirit.json new file mode 100644 index 0000000000..ca66a08b7b --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/sacred_spirit.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:spirit_instiller", + "time":150, + "experience": 0.75, + "ingredient1": { + "item": "spectrum:moonstone_powder" + }, + "ingredient2": { + "item": "spectrum:white_pigment", + "count": 4 + }, + "center_ingredient": { + "item": "malum:null_slate", + "count": 2 + }, + "result": { + "item": "malum:sacred_spirit", + "count": 2 + }, + "required_advancement": "spectrum:mod_integration/malum/understand_color_and_spirit", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/wicked_spirit.json b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/wicked_spirit.json new file mode 100644 index 0000000000..2918401e63 --- /dev/null +++ b/src/main/resources/data/spectrum/recipes/mod_integration/malum/spirit_instiller/wicked_spirit.json @@ -0,0 +1,29 @@ +{ + "type": "spectrum:spirit_instiller", + "time": 150, + "experience": 0.75, + "ingredient1": { + "item": "spectrum:quitoxic_powder" + }, + "ingredient2": { + "item": "spectrum:black_pigment", + "count": 4 + }, + "center_ingredient": { + "item": "malum:null_slate", + "count": 2 + }, + "result": { + "item": "malum:wicked_spirit", + "count": 2 + }, + "required_advancement": "spectrum:mod_integration/malum/understand_color_and_spirit", + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "malum" + ] + } + ] +} \ No newline at end of file