Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added research and recipe for Crimson Rites Book and Crimson Cult Banner #826

Merged
merged 7 commits into from
Apr 30, 2024
Merged

Added research and recipe for Crimson Rites Book and Crimson Cult Banner #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2f22014
Added research and recipe for Crimson Rites book
Mar 19, 2024
66db9d3
Added recipe for the Crimson Cult Banner
Mar 19, 2024
2ac7323
Fixed imports
Mar 19, 2024
8736864
Added Broken Spawner recipe. Fixed not being able to add Crimson Cult…
Mar 20, 2024
f67adfe
Revert "Added Broken Spawner recipe. Fixed not being able to add Crim…
Mar 20, 2024
77d6c43
Fixed not being able to add Crimson Cult Banner to the Thaumonomicon
Mar 20, 2024
01cd731
Merge branch 'master' into master
Dream-Master Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 69 additions & 1 deletion src/main/java/com/dreammaster/scripts/ScriptThaumcraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
import static gregtech.api.enums.Mods.Railcraft;
import static gregtech.api.enums.Mods.RandomThings;
import static gregtech.api.enums.Mods.StevesCarts2;
import static gregtech.api.enums.Mods.TaintedMagic;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.ThaumicBases;
import static gregtech.api.enums.Mods.TinkerConstruct;
import static gregtech.api.enums.Mods.TwilightForest;
import static gregtech.api.enums.Mods.Witchery;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
Expand Down Expand Up @@ -92,7 +94,9 @@ public List<String> getDependencies() {
ExtraUtilities.ID,
BartWorks.ID,
PamsHarvestTheNether.ID,
StevesCarts2.ID);
StevesCarts2.ID,
TaintedMagic.ID,
Witchery.ID);
}

@Override
Expand Down Expand Up @@ -5580,6 +5584,70 @@ private void eldritch() {
.add(Aspect.getAspect("aer"), 9).add(Aspect.getAspect("ordo"), 9)
.add(Aspect.getAspect("praecantatio"), 6).add(Aspect.getAspect("alienis"), 3));
TCHelper.setResearchComplexity("ADVALCHEMYFURNACE", 3);
new ResearchItem(
"CRIMSONRITES",
"ELDRITCH",
new AspectList().add(Aspect.getAspect("alienis"), 12).add(Aspect.getAspect("praecantatio"), 6)
.add(Aspect.getAspect("cognitio"), 3).add(Aspect.getAspect("spiritus"), 12)
.add(Aspect.getAspect("vacuos"), 9).add(Aspect.getAspect("infernus"), 2)
.add(Aspect.getAspect("vitium"), 5),
-3,
-3,
5,
getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 1, missing)).setParents("ELDRITCHMAJOR")
.setConcealed().setPages(new ResearchPage("tc.research_page.CRIMSONRITES"))
.registerResearchItem();
ThaumcraftApi.addWarpToResearch("CRIMSONRITES", 10);
ThaumcraftApi.addInfusionCraftingRecipe(
"CRIMSONRITES",
getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 1, missing),
10,
new AspectList().add(Aspect.getAspect("alienis"), 32).add(Aspect.getAspect("praecantatio"), 64)
.add(Aspect.getAspect("infernus"), 16),
getModItem(Thaumcraft.ID, "ItemThaumonomicon", 1, 0, missing),
new ItemStack[] { getModItem(TaintedMagic.ID, "ItemCrystalDagger", 1, 0, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing),
getModItem(ThaumicBases.ID, "knoseFragment", 1, 6, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 17, missing),
getModItem(TaintedMagic.ID, "ItemMaterial", 1, 7, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 17, missing),
getModItem(ThaumicBases.ID, "knoseFragment", 1, 6, missing),
getModItem(Minecraft.ID, "ender_eye", 21, 0, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 16, missing),
getModItem(Minecraft.ID, "ender_eye", 21, 0, missing),
getModItem(ThaumicBases.ID, "knoseFragment", 1, 6, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 17, missing),
getModItem(TaintedMagic.ID, "ItemMaterial", 1, 7, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 17, missing),
getModItem(ThaumicBases.ID, "knoseFragment", 1, 6, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 15, missing) });
TCHelper.addResearchPage(
"CRIMSONRITES",
new ResearchPage(
TCHelper.findInfusionRecipe(getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 1, missing))));
ThaumcraftApi.addArcaneCraftingRecipe(
"CRIMSONRITES",
getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 8, missing),
new AspectList().add(Aspect.getAspect("aqua"), 5).add(Aspect.getAspect("terra"), 5)
.add(Aspect.getAspect("perditio"), 5),
"aba",
"bcb",
"ada",
'a',
getModItem(Witchery.ID, "ingredient", 1, 102, missing),
'b',
getModItem(TaintedMagic.ID, "ItemMaterial", 1, 2, missing),
'c',
getModItem(TaintedMagic.ID, "ItemMaterial", 1, 8, missing),
'd',
getModItem(Thaumcraft.ID, "WandRod", 1, 0, missing));
TCHelper.addResearchPage(
"CRIMSONRITES",
new ResearchPage(
TCHelper.findArcaneRecipe(
getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 8, missing),
false)));
TCHelper.refreshResearchPages("CRIMSONRITES");
TCHelper.refreshResearchPages("ELDRITCHMINOR");
TCHelper.refreshResearchPages("VOIDMETAL");
TCHelper.refreshResearchPages("CAP_void");
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/dreammaster/thaumcraft/TCHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ public static IArcaneRecipe findArcaneRecipe(ItemStack stack) {
return null;
}

public static IArcaneRecipe findArcaneRecipe(ItemStack stack, boolean ignoreNBT) {
for (Object craft : ThaumcraftApi.getCraftingRecipes()) {
if (craft instanceof IArcaneRecipe) {
if (((IArcaneRecipe) craft).getRecipeOutput() != null
&& GT_Utility.areStacksEqual(((IArcaneRecipe) craft).getRecipeOutput(), stack, ignoreNBT))
return (IArcaneRecipe) craft;
}
}
return null;
}

public static CrucibleRecipe findCrucibleRecipe(ItemStack stack) {
for (Object craft : ThaumcraftApi.getCraftingRecipes()) {
if (craft instanceof CrucibleRecipe) {
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/dreamcraft/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,6 +1527,9 @@ Witchery.research_page.WAYSTONE=A waystone is an etched piece of flint that is a
tc.research_name.RUNEDTABLET=Runed Tablet
tc.research_text.RUNEDTABLET=[NH] Boss...? Yeee is farming time
kosh.research_page.RUNEDTABLET=Your desire get to the boss? DO IT !!!
tc.research_name.CRIMSONRITES=Crimson Rites
tc.research_text.CRIMSONRITES=Unlocking the Unknown
tc.research_page.CRIMSONRITES=You have seen glimpses of powerful magic users. You think you might have found a way to unlock their secrets.

# Tinker's Construct manual contents
item.tconstruct.manual.common.recipes=Recipes
Expand Down