diff --git a/addon.json b/addon.json index 078ad09..a714b13 100644 --- a/addon.json +++ b/addon.json @@ -1178,7 +1178,7 @@ { "qualifier": "mod-auracore", "link": [ - "https://maven.tilera.xyz/dev/tilera/auracore/1.8.0/auracore-1.8.4.jar" + "https://maven.tilera.xyz/dev/tilera/auracore/1.8.5/auracore-1.8.5.jar" ], "flags": { "both": ["required"] @@ -1193,7 +1193,7 @@ { "qualifier": "mod-classiccasting", "link": [ - "https://maven.tilera.xyz/net/anvilcraft/classic-casting/1.2.0/classic-casting-1.2.0.jar" + "https://maven.tilera.xyz/net/anvilcraft/classic-casting/1.3.0/classic-casting-1.3.0.jar" ], "flags": { "both": ["required"] diff --git a/src/modpack.json b/src/modpack.json index 1e1fc52..641646a 100644 --- a/src/modpack.json +++ b/src/modpack.json @@ -1091,7 +1091,7 @@ { "id": "mod-auracore", "file": { - "link": "https://maven.tilera.xyz/dev/tilera/auracore/1.8.0/auracore-1.8.4.jar", + "link": "https://maven.tilera.xyz/dev/tilera/auracore/1.8.5/auracore-1.8.5.jar", "installer": "internal.dir:mods" }, "type": "mod", @@ -1105,7 +1105,7 @@ { "id": "mod-classiccasting", "file": { - "link": "https://maven.tilera.xyz/net/anvilcraft/classic-casting/1.2.0/classic-casting-1.2.0.jar", + "link": "https://maven.tilera.xyz/net/anvilcraft/classic-casting/1.3.0/classic-casting-1.3.0.jar", "installer": "internal.dir:mods" }, "type": "mod", diff --git a/src/overrides/config/AuraCore.cfg b/src/overrides/config/AuraCore.cfg new file mode 100644 index 0000000..727c5f0 --- /dev/null +++ b/src/overrides/config/AuraCore.cfg @@ -0,0 +1,40 @@ +# Configuration file + +aspects { + # Use TC3 item aspects [default: false] + B:legacyAspects=true +} + + +client { + # Replace some aspect textures [default: true] + B:replaceAspects=true +} + + +crucible { + # Use TC3 crucible mechanics [default: true] + B:legacyCrucibleMechanics=true +} + + +research { + # Know all Aspects from beginning [default: true] + B:knowAllAspects=true +} + + +worldgen { + # Generate Eldritch Ring structures [default: true] + B:generateEldritchRing=false + + # Rarity of TC4 nodes generating instead of TC3 nodes (-1 to disable TC4 nodes) [range: -1 ~ 2147483647, default: 20] + I:newNodeRarity=20 + I:nodeRarity=55 + + # Replace Silverwood trees with TC3 Silverwood [default: true] + B:replaceSilverwood=true + I:specialNodeRarity=75 +} + + diff --git a/src/overrides/config/Thaumcraft.cfg b/src/overrides/config/Thaumcraft.cfg index 3ef4857..2bd85e3 100644 --- a/src/overrides/config/Thaumcraft.cfg +++ b/src/overrides/config/Thaumcraft.cfg @@ -114,7 +114,7 @@ general { B:wand_dial_bottom=false # Setting this to true disables Warp and similar mechanics. You wuss. - B:wuss_mode=false + B:wuss_mode=true } diff --git a/src/overrides/scripts/thaumcraft.zs b/src/overrides/scripts/thaumcraft.zs index cc933ae..c62cfc0 100644 --- a/src/overrides/scripts/thaumcraft.zs +++ b/src/overrides/scripts/thaumcraft.zs @@ -2,6 +2,7 @@ import mods.auracore.Infusion; import mods.auracore.Crucible; import mods.thaumcraft.Arcane; import mods.thaumcraft.Research; +import minetweaker.item.IItemStack; recipes.remove(); //Axe @@ -91,3 +92,176 @@ Research.addPrereq("DISTILESSENTIA", "BASICFLUX"); Research.addPrereq("INFUSION", "THETHEORYOFEVERYTHING", true); Research.clearPrereqs("JARLABEL"); Research.addPrereq("JARLABEL", "UNIFIEDTHAUMICFIELDTHEORY"); +Arcane.removeRecipe(); +Research.clearPages("DISTILESSENTIA"); +Research.addPage("DISTILESSENTIA", "tc.research_page.DISTILESSENTIA.1"); +Research.addArcanePage("DISTILESSENTIA", ); +Research.addPage("DISTILESSENTIA", "tc.research_page.DISTILESSENTIA.2"); +Research.addArcanePage("DISTILESSENTIA", ); +Research.addArcanePage("DISTILESSENTIA", ); +Arcane.removeRecipe(); +Arcane.addShaped("JARLABEL", , "aqua 20", [[, , ], [, null, ], [, , ]]); +//Research.moveResearch("JARLABEL", "CLASSICCASTING", -2, 3); +// Traveler Boots +Infusion.addShaped("BOOTSTRAVELLER", "BOOTSTRAVELLER", 100, , "motus 24, volatus 16, terra 8, tutamen 8, aqua 8", [ + [, null, ], + [, null, ], + [, null, ] +]); +mods.thaumcraft.Infusion.removeRecipe(); +Research.clearPages("BOOTSTRAVELLER"); +Research.addPage("BOOTSTRAVELLER", "tc.research_page.BOOTSTRAVELLER.1"); +mods.auracore.Research.addInfusionPage("BOOTSTRAVELLER", "BOOTSTRAVELLER"); +Research.clearPrereqs("BOOTSTRAVELLER"); +Research.addPrereq("BOOTSTRAVELLER", "UNIFIEDTHAUMICFIELDTHEORY", true); +Research.setAspects("BOOTSTRAVELLER", "motus 24, volatus 24, terra 16, tutamen 16, aqua 16"); +// Goggles +Infusion.addShaped("GOGGLES", "GOGGLES", 60, , "praecantatio 8, visum 8, mutatio 8", [ + [, , ], + [, null, ], + [, , ] +]); +Arcane.removeRecipe(); +Research.clearPages("GOGGLES"); +Research.addPage("GOGGLES", "tc.research_page.GOGGLES.1"); +mods.auracore.Research.addInfusionPage("GOGGLES", "GOGGLES"); +Research.clearPrereqs("GOGGLES"); +Research.addPrereq("GOGGLES", "UNIFIEDTHAUMICFIELDTHEORY", true); +Research.addPrereq("GOGGLES", "AURACOMPASS", true); +Research.setAspects("GOGGLES", "praecantatio 16, visum 16, mutatio 8, cognitio 12, tutamen 4"); +// Hover Harness +Infusion.addShaped("HOVERHARNESS", "HOVERHARNESS", 500, , "machina 32, potentia 24, aer 24, tutamen 16, volatus 64", [ + [, , ], + [, , ], + [, , ] +]); +mods.thaumcraft.Infusion.removeRecipe(); +Research.clearPages("HOVERHARNESS"); +Research.addPage("HOVERHARNESS", "tc.research_page.HOVERHARNESS.1"); +mods.auracore.Research.addInfusionPage("HOVERHARNESS", "HOVERHARNESS"); +Research.addPage("HOVERHARNESS", "tc.research_page.HOVERHARNESS.2"); +Research.clearPrereqs("HOVERHARNESS"); +Research.addPrereq("HOVERHARNESS", "THETHEORYOFEVERYTHING"); +Research.addPrereq("HOVERHARNESS", "JARLABEL", true); +Research.addPrereq("HOVERHARNESS", "LEVITATOR", true); +Research.setAspects("HOVERHARNESS", "imperito 16, potentia 32, aer 32, tutamen 8, volatus 48"); +// Bellows +Infusion.addShaped("BELLOWS", "BELLOWS", 50, , "aer 24, motus 16", [ + [, , null], + [, , ], + [, , null] +]); +Arcane.removeRecipe(); +Research.clearPages("BELLOWS"); +Research.addPage("BELLOWS", "tc.research_page.BELLOWS.1"); +mods.auracore.Research.addInfusionPage("BELLOWS", "BELLOWS"); +Research.addPage("BELLOWS", "tc.research_page.BELLOWS.2"); +Research.clearPrereqs("INFERNALFURNACE"); +Research.addPrereq("INFERNALFURNACE", "UNIFIEDTHAUMICFIELDTHEORY"); +Research.setAspects("INFERNALFURNACE", "ignis 16, saxum 16, imperito 8, vinculum 8, praecantatio 8, spiritus 8"); +Research.setAspects("BELLOWS", "imperito 4, aer 16, motus 16, instrumentum 8"); +// Brain Jar +Infusion.addShaped("JARBRAIN", "JARBRAIN", 66, , "spiritus 8, malum 8, cognitio 8", [ + [, , ], + [null, , null], + [null, , null] +]); +mods.thaumcraft.Infusion.removeRecipe(); +Research.clearPages("JARBRAIN"); +Research.addPage("JARBRAIN", "tc.research_page.JARBRAIN.1"); +mods.auracore.Research.addInfusionPage("JARBRAIN", "JARBRAIN"); +Research.clearPrereqs("JARBRAIN"); +Research.addPrereq("JARBRAIN", "JARLABEL", true); +Research.setAspects("JARBRAIN", "spiritus 16, malum 16, cognitio 16, permutatio 16"); +// Mirror +Infusion.addShaped("MIRROR", "MIRROR", 100, , "motus 16", [ + [, , ], + [, , ], + [, , ] +]); +mods.thaumcraft.Infusion.removeRecipe(); +Arcane.removeRecipe(); +Infusion.addShapeless("MIRRORGLASS", "MIRROR", 10, , "vitreus 4, visum 4", [, ]); +Research.clearPages("MIRROR"); +Research.addPage("MIRROR", "tc.research_page.MIRROR.1"); +Research.addPage("MIRROR", "tc.research_page.MIRROR.2"); +mods.auracore.Research.addInfusionPage("MIRROR", "MIRROR"); +Research.addPage("MIRROR", "tc.research_page.MIRROR.3"); +mods.auracore.Research.addInfusionPage("MIRROR", "MIRRORGLASS"); +Research.clearPrereqs("MIRROR"); +Research.addPrereq("MIRROR", "PORTABLEHOLE", true); +Research.setAspects("MIRROR", "motus 24, vacuos 24, alienis 24, permutatio 24, vitreus 16, visum 16"); +// Hand Mirror +Infusion.addShaped("MIRRORHAND", "MIRRORHAND", 150, , "instrumentum 16", [ + [null, ], + [, null] +]); +mods.thaumcraft.Infusion.removeRecipe(); +Research.clearPages("MIRRORHAND"); +Research.addPage("MIRRORHAND", "tc.research_page.MIRRORHAND.1"); +mods.auracore.Research.addInfusionPage("MIRRORHAND", "MIRRORHAND"); +Research.setAspects("MIRRORHAND", "motus 12, vacuos 12, alienis 12, permutatio 12, instrumentum 12, visum 12"); +// Paving Stone +Infusion.addShaped("PAVETRAVEL", "PAVETRAVEL", 100, * 8, "terra 8, volatus 8, motus 16, saxum 8", [ + [], + [], + [] +]); +Arcane.removeRecipe(); +Research.clearPages("PAVETRAVEL"); +Research.addPage("PAVETRAVEL", "tc.research_page.PAVETRAVEL.1"); +mods.auracore.Research.addInfusionPage("PAVETRAVEL", "PAVETRAVEL"); +Research.clearPrereqs("PAVETRAVEL"); +Research.addPrereq("PAVETRAVEL", "BOOTSTRAVELLER"); +Research.setAspects("PAVETRAVEL", "terra 16, volatus 8, motus 16, saxum 16"); +// Levitator +Infusion.addShaped("LEVITATOR", "LEVITATOR", 50, , "terra 8, volatus 8, motus 8, machina 8", [ + [, , ], + [, , ], + [, , ] +]); +Arcane.removeRecipe(); +Research.clearPages("LEVITATOR"); +Research.addPage("LEVITATOR", "tc.research_page.LEVITATOR.1"); +mods.auracore.Research.addInfusionPage("LEVITATOR", "LEVITATOR"); +Research.clearPrereqs("LEVITATOR"); +Research.addPrereq("LEVITATOR", "UNIFIEDTHAUMICFIELDTHEORY", true); +Research.setAspects("LEVITATOR", "terra 12, volatus 16, motus 12, machina 16, aer 12"); +// Arcane Ear +Infusion.addShaped("ARCANEEAR", "ARCANEEAR", 30, , "aer 8, machina 8, sonus 16", [ + [, , ], + [, , ], + [, , ] +]); +Arcane.removeRecipe(); +Research.clearPages("ARCANEEAR"); +Research.addPage("ARCANEEAR", "tc.research_page.ARCANEEAR.1"); +mods.auracore.Research.addInfusionPage("ARCANEEAR", "ARCANEEAR"); +Research.clearPrereqs("ARCANEEAR"); +Research.addPrereq("ARCANEEAR", "UNIFIEDTHAUMICFIELDTHEORY", true); +Research.setAspects("ARCANEEAR", "aer 12, machina 12, sonus 24, visum 8, imperito 12"); +// Arcane Bore +Infusion.addShaped("ARCANEBORE", "ARCANEBORE", 125, , "vacuos 24, potentia 32, machina 32, metallum 64, motus 16", [ + [, , ], + [, , ], + [, , ] +]); +mods.thaumcraft.Infusion.removeRecipe(); +Arcane.removeRecipe(); +Arcane.addShaped("ARCANEBORE", , "ordo 25, aer 25", [ + [, , ], + [, , ], + [, , ] +]); +Research.clearPages("ARCANEBORE"); +Research.addPage("ARCANEBORE", "tc.research_page.ARCANEBORE.1"); +mods.auracore.Research.addInfusionPage("ARCANEBORE", "ARCANEBORE"); +Research.addPage("ARCANEBORE", "tc.research_page.ARCANEBORE.2"); +Research.addArcanePage("ARCANEBORE", ); +Research.addPage("ARCANEBORE", "tc.research_page.ARCANEBORE.3"); +Research.clearPrereqs("ARCANEBORE"); +Research.addPrereq("ARCANEBORE", "THETHEORYOFEVERYTHING", true); +Research.addPrereq("ARCANEBORE", "PORTABLEHOLE", true); +Research.addPrereq("ARCANEBORE", "WANDEXCAVATE", true); +Research.addPrereq("ARCANEBORE", "ELEMENTALPICK", true); +Research.setAspects("ARCANEBORE", "vacuos 24, potentia 24, machina 32, metallum 32, motus 24, terra 32, saxum 32, instrumentum 32");