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

Add botania into inf gear recipes #1190

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Add botania into inf gear recipes #1190

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7af7d11
Add botania into inf gear recipes
EnderProyects Feb 6, 2025
6b77d16
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 7, 2025
4b02754
Chnaged as requested
EnderProyects Feb 7, 2025
7173c02
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 7, 2025
a37c3f0
Merge branch 'master' into Botania_into_InfGear
EnderProyects Feb 8, 2025
a5be3e4
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 12, 2025
882f453
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 13, 2025
4c59967
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 13, 2025
04287df
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 13, 2025
930dc1a
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 14, 2025
8c558bc
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 15, 2025
f184bf6
Merge branch 'master' into Botania_into_InfGear
serenibyss Feb 17, 2025
fe49bcc
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 20, 2025
ca85401
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 20, 2025
6312ead
Merge branch 'master' into Botania_into_InfGear
EnderProyects Feb 20, 2025
6cb48e7
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 20, 2025
6002818
Merge branch 'master' into Botania_into_InfGear
Dream-Master Feb 21, 2025
5d2e757
Merge branch 'GTNewHorizons:master' into Botania_into_InfGear
EnderProyects Feb 25, 2025
2ec4a31
Merge branch 'master' into Botania_into_InfGear
EnderProyects Mar 4, 2025
79c58a7
Changed as requested
EnderProyects Mar 4, 2025
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
78 changes: 54 additions & 24 deletions src/main/java/com/dreammaster/scripts/ScriptAvaritia.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static gregtech.api.enums.Mods.Avaritia;
import static gregtech.api.enums.Mods.BloodArsenal;
import static gregtech.api.enums.Mods.BloodMagic;
import static gregtech.api.enums.Mods.Botania;
import static gregtech.api.enums.Mods.DraconicEvolution;
import static gregtech.api.enums.Mods.ElectroMagicTools;
import static gregtech.api.enums.Mods.EternalSingularity;
Expand All @@ -21,6 +22,7 @@
import static gregtech.api.enums.Mods.TinkerConstruct;
import static gregtech.api.enums.Mods.TinkersGregworks;
import static gregtech.api.enums.Mods.UniversalSingularities;
import static gregtech.api.enums.Mods.WitchingGadgets;
import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
Expand Down Expand Up @@ -85,6 +87,7 @@ public List<String> getDependencies() {
Avaritia.ID,
BloodArsenal.ID,
BloodMagic.ID,
Botania.ID,
DraconicEvolution.ID,
ElectroMagicTools.ID,
EternalSingularity.ID,
Expand All @@ -100,7 +103,8 @@ public List<String> getDependencies() {
Thaumcraft.ID,
ThaumicBases.ID,
Gadomancy.ID,
TaintedMagic.ID);
TaintedMagic.ID,
WitchingGadgets.ID);
}

@Override
Expand Down Expand Up @@ -442,7 +446,7 @@ public void loadRecipes() {
"----aea--",
"-f-aga---",
"--fha----",
"--if-----",
"--kf-----",
"-i--f----",
"j--------",
'a',
Expand All @@ -458,7 +462,7 @@ public void loadRecipes() {
'c',
getModItem(TaintedMagic.ID, "ItemPrimordialEdge", 1, 0, missing),
'd',
getModItem(IndustrialCraft2.ID, "itemNanoSaber", 1, wildcard, missing),
createItemStack(ElectroMagicTools.ID, "SuperchargedMjolnir", 1, 1, "{charge:2000000.0d}", missing),
'e',
getModItem(ThaumicTinkerer.ID, "ichorSwordGem", 1, wildcard, missing),
'f',
Expand All @@ -470,11 +474,13 @@ public void loadRecipes() {
'i',
"blockCosmicNeutronium",
'j',
getModItem(Avaritia.ID, "Resource", 1, 5, missing));
getModItem(Avaritia.ID, "Resource", 1, 5, missing),
'k',
getModItem(Botania.ID, "starSword", 1, 0, missing));
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
createItemStack(Avaritia.ID, "Infinity_Pickaxe", 1, 0, "{ench:[0:{lvl:10s,id:35s}]}", missing),
"-aaaaaaa-",
"abbcdebba",
"ablcdemba",
"aa-fgh-aa",
"----i----",
"----i----",
Expand Down Expand Up @@ -503,13 +509,17 @@ public void loadRecipes() {
'j',
getModItem(Avaritia.ID, "big_pearl", 1, 0, missing),
'k',
getModItem(Avaritia.ID, "Resource", 1, 5, missing));
getModItem(Avaritia.ID, "Resource", 1, 5, missing),
'l',
createItemStack(Botania.ID, "terraPick", 1, 0, "{mana:2147483421,tipped:1b}", missing),
'm',
getModItem(ForbiddenMagic.ID, "MorphPickaxe", 1, 0, missing));
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
getModItem(Avaritia.ID, "Infinity_Shovel", 1, 0, missing),
"------aaa",
"-----abca",
"------dea",
"-----f-a-",
"-----kdea",
"-----fla-",
"----f----",
"---f-----",
"-gf------",
Expand All @@ -534,22 +544,26 @@ public void loadRecipes() {
'i',
getModItem(TaintedMagic.ID, "ItemFocusTime", 1, 0, missing),
'j',
getModItem(Avaritia.ID, "Resource", 1, 5, missing));
getModItem(Avaritia.ID, "Resource", 1, 5, missing),
'k',
getModItem(Botania.ID, "elementiumShovel", 1, 0, missing),
'l',
getModItem(ForbiddenMagic.ID, "TaintShovel", 1, 0, missing));
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
createItemStack(Thaumcraft.ID, "WandCasting", 1, 9000, "{cap:\"matrix\",rod:\"infinity\"}", missing),
"--a------",
"-aba-----",
"acdef----",
"-nba-----",
"aodef----",
"-aegeh---",
"--iegej--",
"---kegea-",
"----ledma",
"-----aba-",
"-----abc-",
"------a--",
'a',
"plateInfinity",
'b',
getModItem(ThaumicTinkerer.ID, "blockTalisman", 1, 0, missing),
getModItem(ThaumicTinkerer.ID, "placementMirror", 1, 0, missing),
'c',
getModItem(TaintedMagic.ID, "ItemFocusEldritch", 1, 0, missing),
'd',
Expand Down Expand Up @@ -577,11 +591,15 @@ public void loadRecipes() {
'l',
getModItem(BloodMagic.ID, "earthScribeTool", 1, 0, missing),
'm',
getModItem(TaintedMagic.ID, "ItemFocusTime", 1, 0, missing));
getModItem(ForbiddenMagic.ID, "WandCaps", 1, 2, missing),
'n',
getModItem(Avaritia.ID, "Akashic_Record", 1, 0, missing),
'o',
getModItem(ForbiddenMagic.ID, "WandCaps", 1, 5, missing));
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
getModItem(Avaritia.ID, "Infinity_Axe", 1, 0, missing),
"-a-------",
"abaaa----",
"-aaa-----",
"abjka----",
"acda-----",
"-ae------",
"--e------",
Expand All @@ -604,15 +622,19 @@ public void loadRecipes() {
'g',
getModItem(Avaritia.ID, "Resource", 1, 5, missing),
'h',
getModItem(TaintedMagic.ID, "ItemFocusTime", 1, 0, missing));
getModItem(TaintedMagic.ID, "ItemFocusTime", 1, 0, missing),
'j',
getModItem(Botania.ID, "terraAxe", 1, 0, missing),
'k',
getModItem(WitchingGadgets.ID, "item.WG_PrimordialAxe", 1, 0, missing));
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
getModItem(Avaritia.ID, "Infinity_Bow", 1, 0, missing),
"---aab---",
"--a-c----",
"-a--c----",
"a---c----",
"a---cg---",
"d---ef---",
"a---c----",
"a---ch---",
"-a--c----",
"--a-c----",
"---aab---",
Expand All @@ -626,6 +648,10 @@ public void loadRecipes() {
getModItem(Avaritia.ID, "Resource", 1, 5, missing),
'e',
getModItem(DraconicEvolution.ID, "draconicBow", 1, 0, missing),
'g',
getModItem(Botania.ID, "crystalBow", 1, 0),
'h',
getModItem(GalaxySpace.ID, "item.QuantBow", 1, 0),
'f',
getModItem(TaintedMagic.ID, "ItemFocusTime", 1, 0, missing));
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
Expand Down Expand Up @@ -654,7 +680,7 @@ public void loadRecipes() {
'g',
getModItem(DraconicEvolution.ID, "draconicHelm", 1, 0, missing),
'h',
getModItem(BloodMagic.ID, "sanguineHelmet", 1, 0, missing),
getModItem(Botania.ID, "terrasteelHelmReveal", 1, 0, missing),
'i',
getModItem(GalaxySpace.ID, "item.spacesuit_helmetglasses", 1, 0, missing),
'j',
Expand Down Expand Up @@ -685,7 +711,7 @@ public void loadRecipes() {
'e',
getModItem(ThaumicTinkerer.ID, "ichorclothChestGem", 1, wildcard, missing),
'f',
getModItem(BloodMagic.ID, "sanguineRobe", 1, 0, missing),
getModItem(Botania.ID, "terrasteelChest", 1, 0, missing),
'g',
getModItem(GalaxySpace.ID, "item.spacesuit_jetplate", 1, 0, missing),
'h',
Expand All @@ -702,7 +728,7 @@ public void loadRecipes() {
getModItem(Avaritia.ID, "Infinity_Pants", 1, 0, missing),
"aaaaaaaaa",
"abcdefgha",
"aiiijiiia",
"amiijiina",
"aiaakaaia",
"aia---aia",
"ala---ala",
Expand Down Expand Up @@ -732,7 +758,11 @@ public void loadRecipes() {
'k',
getModItem(Avaritia.ID, "Resource", 1, 5, missing),
'l',
getModItem(Avaritia.ID, "big_pearl", 1, 0, missing));
getModItem(Avaritia.ID, "big_pearl", 1, 0, missing),
'm',
getModItem(Botania.ID, "terrasteelLegs", 1, 0, missing),
'n',
getModItem(WitchingGadgets.ID, "item.WG_PrimordialLegs", 1, 0, missing));
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
getModItem(Avaritia.ID, "Infinity_Shoes", 1, 0, missing),
"---------",
Expand All @@ -759,7 +789,7 @@ public void loadRecipes() {
'g',
getModItem(TaintedMagic.ID, "ItemFocusTime", 1, 0, missing),
'h',
getModItem(BloodMagic.ID, "sanguineBoots", 1, 0, missing),
getModItem(Botania.ID, "terrasteelBoots", 1, 0, missing),
'i',
getModItem(GalaxySpace.ID, "item.spacesuit_gravityboots", 1, 0, missing),
'j',
Expand Down