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

Thaum Rebalance #925

Closed
wants to merge 4 commits into from
Closed

Thaum Rebalance #925

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f000302
Thaum Rebalance
Alastors Aug 9, 2024
eec976b
Minor tweak
Alastors Aug 9, 2024
581de45
Wildcard failure
Alastors Aug 9, 2024
e8789ee
Merge branch 'master' into Thaum-Rebalance
Alastors Aug 26, 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
14 changes: 7 additions & 7 deletions src/main/java/com/dreammaster/scripts/ScriptAutomagy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ public void loadRecipes() {
"REDCRYSTAL",
getModItem(Automagy.ID, "blockRedcrystal", 9, 0, missing),
getModItem(Minecraft.ID, "redstone_block", 1, 0, missing),
new AspectList().add(Aspect.getAspect("machina"), 3).add(Aspect.getAspect("praecantatio"), 9)
.add(Aspect.getAspect("vitreus"), 18));
new AspectList().add(Aspect.getAspect("machina"), 4).add(Aspect.getAspect("praecantatio"), 8)
.add(Aspect.getAspect("vitreus"), 8));
TCHelper.setResearchAspects(
"REDCRYSTAL",
new AspectList().add(Aspect.getAspect("praecantatio"), 15).add(Aspect.getAspect("machina"), 12)
.add(Aspect.getAspect("potentia"), 9).add(Aspect.getAspect("vitreus"), 6)
.add(Aspect.getAspect("ignis"), 3));
new AspectList().add(Aspect.getAspect("praecantatio"), 16).add(Aspect.getAspect("machina"), 12)
.add(Aspect.getAspect("potentia"), 8).add(Aspect.getAspect("vitreus"), 6)
.add(Aspect.getAspect("ignis"), 4));
TCHelper.setResearchComplexity("REDCRYSTAL", 3);
ThaumcraftApi.addArcaneCraftingRecipe(
"REDCRYSTAL_AMP",
Expand Down Expand Up @@ -594,8 +594,8 @@ public void loadRecipes() {
new ResearchItem(
"InfusedGoldGTNH",
"AUTOMAGY",
new AspectList().add(Aspect.getAspect("lucrum"), 12).add(Aspect.getAspect("praecantatio"), 9)
.add(Aspect.getAspect("aer"), 6).add(Aspect.getAspect("metallum"), 3),
new AspectList().add(Aspect.getAspect("lucrum"), 12).add(Aspect.getAspect("praecantatio"), 8)
.add(Aspect.getAspect("aer"), 6).add(Aspect.getAspect("metallum"), 4),
-5,
-2,
3,
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/dreammaster/scripts/ScriptGadomancy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ public void loadRecipes() {
'a',
getModItem(Thaumcraft.ID, "blockTube", 1, 6, missing),
'b',
"stickIridium",
"stickTungstenSteel",
'c',
getModItem(Thaumcraft.ID, "blockTube", 1, 6, missing),
'd',
Expand All @@ -587,7 +587,7 @@ public void loadRecipes() {
'g',
getModItem(Thaumcraft.ID, "blockTube", 1, 6, missing),
'h',
"stickIridium",
"stickTungstenSteel",
'i',
getModItem(Thaumcraft.ID, "blockTube", 1, 6, missing));
TCHelper.setResearchAspects(
Expand All @@ -605,23 +605,23 @@ public void loadRecipes() {
"def",
"ghi",
'a',
"screwOsmiridium",
"screwTitanium",
'b',
getModItem(Thaumcraft.ID, "ItemResource", 1, 1, missing),
'c',
"screwOsmiridium",
"screwTitanium",
'd',
getModItem(Thaumcraft.ID, "ItemResource", 1, 0, missing),
'e',
getModItem(Gadomancy.ID, "ItemAuraCore", 1, 2, missing),
'f',
getModItem(Thaumcraft.ID, "ItemResource", 1, 0, missing),
'g',
"stickIridium",
"stickTungstenSteel",
'h',
getModItem(Gadomancy.ID, "BlockAuraPylon", 1, 0, missing),
'i',
"stickIridium");
"stickTungstenSteel");
ThaumcraftApi.addArcaneCraftingRecipe(
"GADOMANCY.KNOWLEDGE_BOOK",
getModItem(Gadomancy.ID, "BlockKnowledgeBook", 1, 0, missing),
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/dreammaster/scripts/ScriptTCCoreMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,23 +464,23 @@ public void loadRecipes() {
"def",
"ghi",
'a',
"ringAluminium",
"ringSteel",
'b',
"stickLongBlaze",
'c',
"ringAluminium",
"ringSteel",
'd',
"stickAluminium",
"stickSteel",
'e',
"stickLongBlaze",
'f',
"stickAluminium",
"stickSteel",
'g',
"screwAluminium",
"screwSteel",
'h',
getModItem(Minecraft.ID, "cauldron", 1, 0, missing),
'i',
"screwAluminium");
"screwSteel");
TCHelper.addResearchPage(
"BREWINGSTAND",
new ResearchPage(TCHelper.findArcaneRecipe(getModItem(Minecraft.ID, "brewing_stand", 1, 0, missing))));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/scripts/ScriptTaintedMagic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2074,7 +2074,7 @@ public void loadRecipes() {
'd',
getModItem(TaintedMagic.ID, "ItemMaterial", 1, 8, missing),
'e',
getModItem(TaintedMagic.ID, "ItemWandCap", 1, 3, missing),
getModItem(TaintedMagic.ID, "ItemWandCap", 1, 1, missing),
'f',
getModItem(TaintedMagic.ID, "ItemMaterial", 1, 8, missing),
'g',
Expand Down
83 changes: 42 additions & 41 deletions 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 @@ -61,6 +61,7 @@
import thaumcraft.api.research.ResearchCategories;
import thaumcraft.api.research.ResearchItem;
import thaumcraft.api.research.ResearchPage;
import thaumcraft.common.config.ConfigItems;

public class ScriptThaumcraft implements IScriptLoader {

Expand Down Expand Up @@ -464,15 +465,15 @@ private void thaumaturgy() {
0,
"{aqua:0,terra:0,ignis:0,ordo:0,perditio:0,aer:0}",
missing),
getModItem(TwilightForest.ID, "item.nagaScale", 1, 0, missing),
"screwAluminium",
new ItemStack(ConfigItems.itemShard, 1, 32767),
"screwSteel",
getModItem(Thaumcraft.ID, "WandCap", 1, 0, missing),
"screwAluminium",
"screwSteel",
getModItem(Forestry.ID, "oakStick", 1, 0, missing),
"screwAluminium",
"screwSteel",
getModItem(Thaumcraft.ID, "WandCap", 1, 0, missing),
"screwAluminium",
getModItem(TwilightForest.ID, "item.nagaScale", 1, 0, missing));
"screwSteel",
new ItemStack(ConfigItems.itemShard, 1, 32767));

TCHelper.removeArcaneRecipe(getModItem(ThaumicBases.ID, "resource", 1, 2, missing));
TCHelper.removeArcaneRecipe(getModItem(Thaumcraft.ID, "WandCap", 1, 1, missing));
Expand Down Expand Up @@ -537,23 +538,23 @@ private void thaumaturgy() {
"def",
"ghi",
'a',
"screwSteel",
"screwIron",
'b',
"foilCopper",
'c',
"screwSteel",
"screwIron",
'd',
"foilCopper",
'e',
"ringCopper",
'f',
"foilCopper",
'g',
"screwSteel",
"screwIron",
'h',
"foilCopper",
'i',
"screwSteel");
"screwIron");
TCHelper.addResearchPage(
"CAP_copper",
new ResearchPage(TCHelper.findArcaneRecipe(getModItem(Thaumcraft.ID, "WandCap", 1, 3, missing))));
Expand All @@ -574,23 +575,23 @@ private void thaumaturgy() {
"def",
"ghi",
'a',
"screwAluminium",
"screwSteel",
'b',
"foilGold",
'c',
"screwAluminium",
"screwSteel",
'd',
"foilGold",
'e',
"ringGold",
'f',
"foilGold",
'g',
"screwAluminium",
"screwSteel",
'h',
"foilGold",
'i',
"screwAluminium");
"screwSteel");
TCHelper.addResearchPage(
"CAP_gold",
new ResearchPage(TCHelper.findArcaneRecipe(getModItem(Thaumcraft.ID, "WandCap", 1, 1, missing))));
Expand All @@ -610,23 +611,23 @@ private void thaumaturgy() {
"def",
"ghi",
'a',
"screwStainlessSteel",
"screwSteel",
'b',
"foilSilver",
'c',
"screwStainlessSteel",
"screwSteel",
'd',
"foilSilver",
'e',
"ringSilver",
'f',
"foilSilver",
'g',
"screwStainlessSteel",
"screwSteel",
'h',
"foilSilver",
'i',
"screwStainlessSteel");
"screwSteel");
TCHelper.addResearchPage(
"CAP_silver",
new ResearchPage(TCHelper.findArcaneRecipe(getModItem(Thaumcraft.ID, "WandCap", 1, 5, missing))));
Expand Down Expand Up @@ -2319,7 +2320,7 @@ private void alchemy() {
.add(Aspect.getAspect("sano"), 16).add(Aspect.getAspect("aqua"), 32)
.add(Aspect.getAspect("machina"), 8),
getModItem(Thaumcraft.ID, "blockJar", 1, 0, missing),
new ItemStack[] { CustomItemList.StainlessSteelBars.get(1L),
new ItemStack[] { CustomItemList.AluminiumBars.get(1L),
Alastors marked this conversation as resolved.
Show resolved Hide resolved
getModItem(Minecraft.ID, "quartz_block", 1, 0, missing),
getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 6, missing),
getModItem(Thaumcraft.ID, "blockCosmeticSolid", 1, 7, missing),
Expand Down Expand Up @@ -2416,7 +2417,7 @@ private void artifice() {
getModItem(Thaumcraft.ID, "ItemShard", 1, 1, missing),
getModItem(Thaumcraft.ID, "ItemShard", 1, 2, missing),
"itemCasingGold",
"lensDiamond",
new ItemStack(ConfigItems.itemShard, 1, 6),
"itemCasingGold",
getModItem(Thaumcraft.ID, "ItemShard", 1, 3, missing),
getModItem(Thaumcraft.ID, "ItemShard", 1, 4, missing),
Expand Down Expand Up @@ -2813,7 +2814,7 @@ private void artifice() {
'd',
getModItem(Thaumcraft.ID, "blockCrystal", 1, 6, missing),
'e',
getModItem(Minecraft.ID, "ender_eye", 1, 0, missing),
getModItem(Minecraft.ID, "ender_pearl", 1, 0, missing),
'f',
getModItem(Thaumcraft.ID, "blockCrystal", 1, 6, missing),
'g',
Expand Down Expand Up @@ -2935,23 +2936,23 @@ private void artifice() {
"def",
"ghi",
'a',
"screwSteel",
"screwIron",
'b',
CustomItemList.SteelBars.get(1L),
'c',
"screwSteel",
"screwIron",
'd',
"wireGt01RedAlloy",
'e',
CustomItemList.AluminiumBars.get(1L),
CustomItemList.SteelBars.get(1L),
'f',
"craftingToolScrewdriver",
'g',
"screwSteel",
"screwIron",
'h',
CustomItemList.SteelBars.get(1L),
'i',
"screwSteel");
"screwIron");
TCHelper.addResearchPage(
"GRATE",
new ResearchPage(
Expand Down Expand Up @@ -3734,11 +3735,11 @@ private void artifice() {
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L),
getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 6, missing),
getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L),
getModItem(ProjectRedIntegration.ID, "projectred.integration.gate", 1, 26, missing),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing),
getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 6, missing), });
TCHelper.setResearchAspects(
Expand All @@ -3758,10 +3759,10 @@ private void artifice() {
new ItemStack[] { getModItem(Thaumcraft.ID, "blockCrystal", 1, 0, missing),
getModItem(Minecraft.ID, "feather", 1, 0, missing),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
getModItem(Thaumcraft.ID, "blockCrystal", 1, 3, missing),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 1L),
getModItem(TwilightForest.ID, "item.tfFeather", 1, 0, missing), });
TCHelper.setResearchAspects(
Expand Down Expand Up @@ -4106,14 +4107,14 @@ private void golemancy() {
new AspectList().add(Aspect.getAspect("iter"), 16).add(Aspect.getAspect("motus"), 16)
.add(Aspect.getAspect("spiritus"), 16).add(Aspect.getAspect("vacuos"), 32),
getModItem(Thaumcraft.ID, "blockChestHungry", 1, 0, missing),
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 1L),
GT_OreDictUnificator.get(OrePrefixes.ring, Materials.StainlessSteel, 1L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1L),
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L),
GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Steel, 1L),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L),
getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 6, missing),
getModItem(Thaumcraft.ID, "ItemGolemPlacer", 1, 1, missing),
getModItem(Thaumcraft.ID, "blockWoodenDevice", 1, 6, missing),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.StainlessSteel, 1L),
GT_OreDictUnificator.get(OrePrefixes.ring, Materials.StainlessSteel, 1L), });
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 1L),
GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Steel, 1L), });
TCHelper.setResearchAspects(
"TRAVELTRUNK",
new AspectList().add(Aspect.getAspect("spiritus"), 12).add(Aspect.getAspect("vacuos"), 12)
Expand Down Expand Up @@ -5300,23 +5301,23 @@ private void eldritch() {
"def",
"ghi",
'a',
"screwTungstenSteel",
"screwStainlessSteel",
'b',
"foilVoid",
'c',
"screwTungstenSteel",
"screwStainlessSteel",
'd',
"foilVoid",
'e',
"ringVoid",
'f',
"foilVoid",
'g',
"screwTungstenSteel",
"screwStainlessSteel",
'h',
"foilVoid",
'i',
"screwTungstenSteel");
"screwStainlessSteel");
TCHelper.addResearchPage(
"CAP_void",
new ResearchPage(TCHelper.findArcaneRecipe(getModItem(Thaumcraft.ID, "WandCap", 1, 8, missing))));
Expand Down Expand Up @@ -5612,9 +5613,9 @@ private void eldritch() {
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(Minecraft.ID, "ender_pearl", 21, 0, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 16, missing),
getModItem(Minecraft.ID, "ender_eye", 21, 0, missing),
getModItem(Minecraft.ID, "ender_pearl", 21, 0, missing),
getModItem(ThaumicBases.ID, "knoseFragment", 1, 6, missing),
getModItem(Thaumcraft.ID, "ItemResource", 1, 17, missing),
getModItem(TaintedMagic.ID, "ItemMaterial", 1, 7, missing),
Expand Down
Loading