diff --git a/src/main/java/mod/icarus/crimsonrevelations/init/CRRecipes.java b/src/main/java/mod/icarus/crimsonrevelations/init/CRRecipes.java index 5864296..7797865 100644 --- a/src/main/java/mod/icarus/crimsonrevelations/init/CRRecipes.java +++ b/src/main/java/mod/icarus/crimsonrevelations/init/CRRecipes.java @@ -224,29 +224,118 @@ public static void initInfusion() { ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "bone_bow"), new InfusionRecipe("CR_BONE_BOW", new ItemStack(CRItems.boneBow), 2, new AspectList().add(Aspect.AIR, 40).add(Aspect.FLIGHT, 40).add(Aspect.ENTROPY, 40), - new ItemStack(Items.BOW), + Items.BOW, ThaumcraftApiHelper.makeCrystal(Aspect.ENTROPY, 1), - ThaumcraftApiHelper.makeCrystal(Aspect.ENTROPY, 1), new ItemStack(ItemsTC.nuggets, 1, 10), - new ItemStack(Blocks.BONE_BLOCK))); + ThaumcraftApiHelper.makeCrystal(Aspect.ENTROPY, 1), + new ItemStack(ItemsTC.nuggets, 1, 10), + Blocks.BONE_BLOCK)); ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "crimsonblade"), new InfusionRecipe("CR_CRIMSON_BLADE", new ItemStack(ItemsTC.crimsonBlade), 7, new AspectList().add(Aspect.AVERSION, 75).add(Aspect.DEATH, 75).add(Aspect.TRAP, 25).add(Aspect.DESIRE, 25), - new ItemStack(ItemsTC.voidSword), - ThaumcraftApiHelper.makeCrystal(Aspect.AVERSION), ThaumcraftApiHelper.makeCrystal(Aspect.DEATH), "plateVoid", "plateVoid", CRItems.crimsonFabric, CRItems.crimsonFabric)); + ItemsTC.voidSword, + ThaumcraftApiHelper.makeCrystal(Aspect.AVERSION), + ThaumcraftApiHelper.makeCrystal(Aspect.DEATH), + "plateVoid", + "plateVoid", + CRItems.crimsonFabric, + CRItems.crimsonFabric)); ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "praetor_helm"), new InfusionRecipe("CR_PRAETOR_ARMOR", new ItemStack(ItemsTC.crimsonPraetorHelm), 2, new AspectList().add(Aspect.METAL, 50).add(Aspect.ELDRITCH, 25).add(Aspect.PROTECT, 20), - new ItemStack(ItemsTC.crimsonPlateHelm), - CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.crimsonPlate)); + ItemsTC.crimsonPlateHelm, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.crimsonPlate)); ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "praetor_chestplate"), new InfusionRecipe("CR_PRAETOR_ARMOR", new ItemStack(ItemsTC.crimsonPraetorChest), 2, new AspectList().add(Aspect.METAL, 50).add(Aspect.ELDRITCH, 25).add(Aspect.PROTECT, 30), - new ItemStack(ItemsTC.crimsonPlateChest), - CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.embellishedCrimsonFabric)); + ItemsTC.crimsonPlateChest, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.embellishedCrimsonFabric)); ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "praetor_greaves"), new InfusionRecipe("CR_PRAETOR_ARMOR", new ItemStack(ItemsTC.crimsonPraetorLegs), 2, new AspectList().add(Aspect.METAL, 50).add(Aspect.ELDRITCH, 25).add(Aspect.PROTECT, 25), - new ItemStack(ItemsTC.crimsonPlateLegs), - CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.crimsonPlate, CRItems.embellishedCrimsonFabric)); + ItemsTC.crimsonPlateLegs, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.crimsonPlate, + CRItems.embellishedCrimsonFabric)); + ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "runic_amulet"), + new InfusionRecipe("CR_RUNIC_BAUBLES", new ItemStack(CRItems.runicAmulet), 2, + new AspectList().add(Aspect.ENERGY, 50).add(Aspect.MAGIC, 45).add(Aspect.PROTECT, 25), + new ItemStack(ItemsTC.baubles, 1, 4), + ItemsTC.salisMundus, + ItemsTC.amber, + ItemsTC.amber, + ItemsTC.fabric, + "nitor", + new ItemStack(ItemsTC.nuggets, 1, 10))); + ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "runic_girdle"), + new InfusionRecipe("CR_RUNIC_BAUBLES", new ItemStack(CRItems.runicGirdle), 2, + new AspectList().add(Aspect.ENERGY, 60).add(Aspect.MAGIC, 50).add(Aspect.PROTECT, 30), + new ItemStack(ItemsTC.baubles, 1, 6), + ItemsTC.salisMundus, + ItemsTC.amber, + ItemsTC.amber, + ItemsTC.amber, + ItemsTC.fabric, + "nitor", + new ItemStack(ItemsTC.nuggets, 1, 10))); + ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "runic_ring"), + new InfusionRecipe("CR_RUNIC_BAUBLES", new ItemStack(CRItems.runicRing), 2, + new AspectList().add(Aspect.ENERGY, 40).add(Aspect.MAGIC, 40).add(Aspect.PROTECT, 20), + new ItemStack(ItemsTC.baubles, 1, 5), + ItemsTC.salisMundus, + ItemsTC.amber, + ItemsTC.fabric, + "nitor", + new ItemStack(ItemsTC.nuggets, 1, 10))); + ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "runic_amulet_emergency"), + new InfusionRecipe("CR_SPECIAL_RUNIC_BAUBLES", new ItemStack(CRItems.runicAmuletEmergency), 4, + new AspectList().add(Aspect.EARTH, 75).add(Aspect.MAGIC, 50).add(Aspect.PROTECT, 75).add(Aspect.ENERGY, 50), + new ItemStack(CRItems.runicAmulet), + ItemsTC.salisMundus, + ThaumcraftApiHelper.makeCrystal(Aspect.EARTH, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.EARTH, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.PROTECT, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.EARTH, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.EARTH, 1))); + ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "runic_girdle_kinetic"), + new InfusionRecipe("CR_SPECIAL_RUNIC_BAUBLES", new ItemStack(CRItems.runicGirdleKinetic), 4, + new AspectList().add(Aspect.AIR, 100).add(Aspect.MAGIC, 50).add(Aspect.PROTECT, 50).add(Aspect.MOTION, 100), + new ItemStack(CRItems.runicGirdle), + ItemsTC.salisMundus, + ThaumcraftApiHelper.makeCrystal(Aspect.AIR, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.AIR, 1), + Items.GUNPOWDER, + ThaumcraftApiHelper.makeCrystal(Aspect.AIR, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.AIR, 1))); + ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "runic_ring_charged"), + new InfusionRecipe("CR_SPECIAL_RUNIC_BAUBLES", new ItemStack(CRItems.runicRingCharged), 4, + new AspectList().add(Aspect.FIRE, 75).add(Aspect.MAGIC, 45).add(Aspect.ENERGY, 70).add(Aspect.PROTECT, 30), + new ItemStack(CRItems.runicRing), + ItemsTC.salisMundus, + ThaumcraftApiHelper.makeCrystal(Aspect.FIRE, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.FIRE, 1), + ItemsTC.amber, + ThaumcraftApiHelper.makeCrystal(Aspect.FIRE, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.FIRE, 1))); + ThaumcraftApi.addInfusionCraftingRecipe(new ResourceLocation(NewCrimsonRevelations.MODID, "runic_ring_regen"), + new InfusionRecipe("CR_SPECIAL_RUNIC_BAUBLES", new ItemStack(CRItems.runicRingRegen), 4, + new AspectList().add(Aspect.WATER, 75).add(Aspect.MAGIC, 45).add(Aspect.LIFE, 70).add(Aspect.PROTECT, 30), + new ItemStack(CRItems.runicRing), + ItemsTC.salisMundus, + ThaumcraftApiHelper.makeCrystal(Aspect.WATER, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.WATER, 1), + Items.GHAST_TEAR, + ThaumcraftApiHelper.makeCrystal(Aspect.WATER, 1), + ThaumcraftApiHelper.makeCrystal(Aspect.WATER, 1))); } } diff --git a/src/main/resources/assets/crimsonrevelations/research/revelations.json b/src/main/resources/assets/crimsonrevelations/research/revelations.json index 3a1474c..a6bbc12 100644 --- a/src/main/resources/assets/crimsonrevelations/research/revelations.json +++ b/src/main/resources/assets/crimsonrevelations/research/revelations.json @@ -533,7 +533,7 @@ ] }, { - "text": "crimsonrevelations.research.metoer_boots.stage.1", + "text": "crimsonrevelations.research.meteor_boots.stage.1", "recipes": [ "crimsonrevelations:bone_bow" ] @@ -593,7 +593,12 @@ "reward_knowledge": [], "stages": [ { - "text": "crimsonrevelations.research.runic_baubles.stage.0" + "text": "crimsonrevelations.research.runic_baubles.stage.0", + "recipes": [ + "crimsonrevelations:runic_ring", + "crimsonrevelations:runic_amulet", + "crimsonrevelations:runic_girdle" + ] } ] }, @@ -635,7 +640,10 @@ { "text": "crimsonrevelations.research.special_runic_baubles.stage.1", "recipes": [ - "crimsonrevelations:bone_bow" + "crimsonrevelations:runic_ring_charged", + "crimsonrevelations:runic_ring_regen", + "crimsonrevelations:runic_amulet_emergency", + "crimsonrevelations:runic_girdle_kinetic" ] } ]