Skip to content

Commit

Permalink
Thaumic Tinkerer Unofficial intergration
Browse files Browse the repository at this point in the history
Updated mod version have lot of fixes and cool features.
Add better integration to the modpack like recipe to aquire `ichor` in skyblock.
  • Loading branch information
TabakaSIM committed Jun 24, 2024
1 parent 24ef1d2 commit 78b98ed
Show file tree
Hide file tree
Showing 6 changed files with 258 additions and 1 deletion.
1 change: 1 addition & 0 deletions config/materialchanger.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ changer {
ATTACK_DAMAGE;thaumcraft:elemental_axe;25
ATTACK_DAMAGE;thaumadditions:void_elemental_axe;28
ATTACK_DAMAGE;thaumadditions:adaminite_sword;42
ATTACK_DAMAGE;thaumictinkerer:blood_sword;30
EFFICIENCY;thaumcraft:elemental_axe;120
EFFICIENCY;thaumcraft:elemental_shovel;10
EFFICIENCY;thaumcraft:elemental_pick;24
Expand Down
64 changes: 64 additions & 0 deletions config/tcresearchpatcher/patches/manual_changes.json
Original file line number Diff line number Diff line change
Expand Up @@ -692,4 +692,68 @@
}
]}

,{"key":"TT_ICHOR_POUCH","ops":[
{"op":"remove",
"path":"stages/0/required_item"
},
{"op":"add",
"path":"stages/0/required_craft",
"value": ["thaumcraft:focus_pouch"]
}
]}

,{"key":"TT_GAS","ops":[
{"op":"replace",
"path":"stages/1/recipes",
"value":["thaumcraft:gas_light_item", "thaumcraft:gas_shadow_item"]}
]}

,{"key":"TT_ICHOR","ops":[
{"op":"replace",
"path":"stages/1/recipes",
"value":["thaumcraft:ichor"]}
,{"op":"replace",
"path":"stages/2/recipes",
"value":["thaumcraft:ichor"]}
]}

,{"key":"TT_ICHORARMOR","ops":[
{"op":"replace",
"path":"stages/1/recipes",
"value":["thaumcraft:ichor_cloth","thaumictinkerer:ichor_helm","thaumictinkerer:ichor_chest","thaumictinkerer:ichor_legs","thaumictinkerer:ichor_boots"]}
]}

,{"key":"TT_CAT_AMULET","ops":[
{"op":"replace",
"path":"stages/1/recipes",
"value":["thaumcraft:cat_amulet"]}
]}

,{"key":"TT_CLEANING_TALISMAN","ops":[
{"op":"replace",
"path":"stages/1/recipes",
"value":["thaumcraft:cleanser"]}
]}

,{"key":"TT_EXPERIENCE_CHARM","ops":[
{"op":"replace",
"path":"stages/1/recipes",
"value":["thaumcraft:experience_charm"]}
]}

,{"key":"TT_WARP_SERIES","ops":[
{"op":"replace",
"path":"stages/0/recipes",
"value":["thaumcraft:sky_pearl"]}
,{"op":"replace",
"path":"stages/1/recipes",
"value":["thaumcraft:sky_pearl", "thaumcraft:warp_gate"]}
]}

,{"key":"TT_SUMMONING","ops":[
{"op":"replace",
"path":"stages/1/recipes",
"value":["thaumcraft:blood_sword", "thaumcraft:summoner"]}
]}

]
23 changes: 23 additions & 0 deletions config/thaumictinkerer.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Configuration file

general {
# "AuraStrike" Modifier Damage Bonus
# Min: 0
# Max: 2147483647
I:"'AuraStrike' Modifier Damage Bonus"=5

# BedrockDim DimID
I:"Bedrock Dimension ID"=19

# Any Enchant ID's in this list can not be added by the Osmotic Enchanter
I:"Blacklisted Enchants" <
71
Expand All @@ -13,6 +21,21 @@ general {
# Is the dislocation focus enabled?
B:"Dislocation Focus Enabled"=true

# Change dimensional shard drop rate, The higher the value the higher the drop rate
# Min: -1
# Max: 64
D:EndShardDropRate=32.0

# Ichorium ToolPart Base Damage
# Min: 0
# Max: 2147483647
D:"Ichorium Weapon DamageBase"=3.5

# Change dimensional shard drop rate, The higher the value the higher the drop rate
# Min: -1
# Max: 64
D:NetherShardDropRate=16.0

# Are Shaders allowed? This effects purely cosmetic visual effects like the transparency for multiblock placeholder
B:"Shaders Enabled"=true

Expand Down
2 changes: 1 addition & 1 deletion scripts/jei/entity_drop.zs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ return list.map(({ groups: { id, display, items } }) => {
# add(<entity:thaumicaugmentation:celestial_observer> , []); // Celestial Observer
add(<entity:thaumicaugmentation:eldritch_guardian> , [<thaumcraft:curio:3> * 1, <thaumcraft:loot_bag:1> * 2, <thaumcraft:loot_bag> * 2]); // Eldritch Guardian
add(<entity:thaumicaugmentation:primal_wisp> , [<thaumcraft:loot_bag:1> * 100, <thaumcraft:primordial_pearl> * 100, <thaumcraft:crystal_essence>.withTag({Aspects: [{amount: 1, key: "amogus"}]}) * 2000, <randomthings:ingredient:2> * 1200, <rftools:infused_enderpearl> * 2]); // Primordial Wisp
# add(<entity:thaumicwonders:corruption_avatar> , []); // Avatar of Corruption
add(<entity:thaumicwonders:corruption_avatar> , [<thaumictinkerer:kamiresource:2> * 1900]); // Avatar of Corruption
add(<entity:thermalfoundation:basalz> , [<thermalfoundation:material:770> * 108, <thermalfoundation:material:2052> * 45]); // Basalz
add(<entity:thermalfoundation:blitz> , [<thermalfoundation:material:772> * 105, <thermalfoundation:material:2050> * 55]); // Blitz
add(<entity:thermalfoundation:blizz> , [<minecraft:snowball> * 188, <thermalfoundation:material:2048> * 46]); // Blizz
Expand Down
167 changes: 167 additions & 0 deletions scripts/mods/thaumictinkerer.zs
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,170 @@ mods.thaumcraft.Infusion.registerRecipe(
// Conversion recipe between Thaumic Tinkerer Black Quartz Block & Botania Block of Smokey Quartz
recipes.addShapeless(<botania:quartztypedark>, [<thaumictinkerer:black_quartz_block>]);
recipes.addShapeless(<thaumictinkerer:black_quartz_block>, [<botania:quartztypedark>]);

// [Nether shard]
mods.tconstruct.Casting.addTableRecipe(<thaumictinkerer:kamiresource:1>, <thaumcraft:nugget:9>, <fluid:xu_demonic_metal>, 48, true);
<thaumictinkerer:kamiresource:1>.addTooltip('§4Drops from zombie pigmens in the nether');

// [Ender shard]
mods.botania.ManaInfusion.addConjuration(<thaumictinkerer:kamiresource>, <enderio:item_material:62>, 1000);
<thaumictinkerer:kamiresource>.addTooltip('§3Drops from endermans in the end');

// [Ichor]
mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe('ichor',
'TT_ICHOR@0',
100,
[<aspect:ordo> * 3, <aspect:ignis> * 3, <aspect:aer> * 3, <aspect:aqua> * 3, <aspect:perditio> * 3, <aspect:terra> * 3],
<thaumictinkerer:kamiresource:2> * 5,
Grid(['pretty',
'A E A',
'B A I',
'A N A'], {
'E': <thaumictinkerer:kamiresource>, // Ender shard
'N': <thaumictinkerer:kamiresource:1>, // Nether shard
'B': <psi:material:3>, // Ebony psi metal
'I': <psi:material:4>, // Ivony psi metal
'A': <ore:gemAmber>, // Amber
}).shaped());

mods.astralsorcery.Lightwell.addLiquefaction(<thaumictinkerer:kamiresource:2>, <liquid:molten_ichorium>, 0.1, 15.0, 15630848);

recipes.remove(<thaumictinkerer:kamiresource:2>);
recipes.remove(<thaumictinkerer:ichor_block>);
mods.thaumcraft.Infusion.removeRecipe(<thaumictinkerer:ichor_block>);
recipes.addShapeless('ichorium_block',<thaumictinkerer:ichor_block>,
[<thaumictinkerer:kamiresource:3>,<thaumictinkerer:kamiresource:3>,<thaumictinkerer:kamiresource:3>,
<thaumictinkerer:kamiresource:3>,<thaumictinkerer:kamiresource:3>,<thaumictinkerer:kamiresource:3>,
<thaumictinkerer:kamiresource:3>,<thaumictinkerer:kamiresource:3>,<thaumictinkerer:kamiresource:3>,
]);
mods.thaumcraft.ArcaneWorkbench.removeRecipe(<thaumictinkerer:kamiresource:3>);
recipes.addShapeless('ichorium_block_to_ingot', <thaumictinkerer:kamiresource:3> * 9, [<thaumictinkerer:ichor_block>]);

mods.thaumcraft.ArcaneWorkbench.removeRecipe(<thaumictinkerer:kamiresource:4>);
mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe('ichor_cloth',
'TT_ICHORARMOR',
50,
[<aspect:terra> * 4, <aspect:ignis> * 4, <aspect:aqua> * 4],
<thaumictinkerer:kamiresource:4> * 4,
Grid(['pretty',
' E ',
'E I E',
' E '], {
'I': <thaumictinkerer:kamiresource:3>, // Ichorium ingot
'E': <thaumcraft:fabric>, // Enchanted fabric
}).shaped());

// [Light gas phial]
mods.thaumcraft.Crucible.removeRecipe(<thaumictinkerer:gas_light_item>);
mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe('gas_light_item',
'TT_GAS',
10,
[],
<thaumictinkerer:gas_light_item> * 8,
Grid(['pretty',
'P P P',
'P I P',
'P P P'], {
'P': <thaumcraft:phial>, // Phial
'I': <astralsorcery:itemusabledust>, // Illumination powder
}).shaped());

// [Shadow gas phial]
mods.thaumcraft.Crucible.removeRecipe(<thaumictinkerer:gas_shadow_item>);
mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe('gas_shadow_item',
'TT_GAS',
10,
[],
<thaumictinkerer:gas_shadow_item> * 8,
Grid(['pretty',
'P P P',
'P I P',
'P P P'], {
'P': <thaumcraft:phial>, // Phial
'I': <astralsorcery:itemusabledust:1>, // Illumination powder
}).shaped());

// [Feline Amulet]
mods.thaumcraft.Infusion.removeRecipe(<thaumictinkerer:cat_amulet>);
mods.thaumcraft.Infusion.registerRecipe(
'cat_amulet', // Name
'TT_CAT_AMULET', // Research
<thaumictinkerer:cat_amulet>, // Output
1, // Instability
[<aspect:bestia> * 50, <aspect:sonus> * 25, <aspect:imperium> * 50],
<thaumcraft:baubles>, // CentralItem
[<thaumictinkerer:kamiresource:2>, <actuallyadditions:item_hairy_ball>, <ore:listAllfishraw>, <actuallyadditions:item_hairy_ball>]
);

// [Cleansing charm]
mods.thaumcraft.Infusion.removeRecipe(<thaumictinkerer:cleaning_talisman>);
mods.thaumcraft.Infusion.registerRecipe(
'cleanser', // Name
'TT_CLEANING_TALISMAN', // Research
<thaumictinkerer:cleaning_talisman>, // Output
3, // Instability
[<aspect:victus> * 100, <aspect:ordo> * 50, <aspect:mana> * 50],
<thaumcraft:verdant_charm:*>, // CentralItem
[<botania:quartz:5>, <rustic:elixir>.withTag({ ElixirEffects: [{ Effect: 'minecraft:instant_health', Duration: 1, Amplifier: 1 }] }), <ore:quartzDark>, <thaumicwonders:panacea>]
);

mods.thaumcraft.Infusion.removeRecipe(<thaumictinkerer:experience_charm>);
mods.thaumcraft.Infusion.registerRecipe(
'experience_charm', // Name
'TT_EXPERIENCE_CHARM', // Research
<thaumictinkerer:experience_charm>, // Output
2, // Instability
[<aspect:vacuos> * 50, <aspect:desiderium> * 50, <aspect:cognitio> * 100],
<thaumictinkerer:kamiresource:1>, // CentralItem
[<ore:quartzDark>, <ore:quartzDark>, <minecraft:glass_bottle>, <ore:quartzDark>, <ore:quartzDark>, <minecraft:glass_bottle>]
);

// [Celestial gateway + Celestial pearl]
mods.thaumcraft.Infusion.removeRecipe(<thaumictinkerer:warp_gate>);
mods.thaumcraft.Infusion.registerRecipe(
'warp_gate', // Name
'TT_WARP_SERIES', // Research
<thaumictinkerer:warp_gate>, // Output
5, // Instability
[<aspect:motus> * 100, <aspect:alienis> * 200, <aspect:fluctus> * 100, <aspect:caeles> * 100],
<thaumicwonders:portal_anchor:*>, // CentralItem
[<botania:biomestonea>, <botania:biomestonea:1>, <botania:biomestonea:2>, <botania:biomestonea:3>, <botania:biomestonea:4>, <botania:biomestonea:5>, <botania:biomestonea:6>, <botania:biomestonea:7>]
);

mods.thaumcraft.Infusion.removeRecipe(<thaumictinkerer:sky_pearl>);
mods.thaumcraft.ArcaneWorkbench.registerShapedRecipe('sky_pearl',
'TT_WARP_SERIES@0',
50,
[<aspect:ordo> * 4, <aspect:aer> * 2],
<thaumictinkerer:sky_pearl>,
Grid(['pretty',
'I E I',
'E M E',
'I E I'], {
'I': <thaumictinkerer:kamiresource:5>, // Ichorium nugget
'M': <botania:manaresource:1>, // Mana pearl
'E': <thaumictinkerer:kamiresource>, // Ender shard
}).shaped());

mods.thaumcraft.ArcaneWorkbench.removeRecipe(<thaumictinkerer:summoner>);
mods.thaumcraft.Infusion.registerRecipe(
'summoner', // Name
'TT_SUMMONING', // Research
<thaumictinkerer:summoner>, // Output
8, // Instability
[<aspect:exanimis> * 100, <aspect:spiritus> * 100, <aspect:mythus> * 200, <aspect:alienis> * 100],
<botania:terraplate>, // CentralItem
[<thaumcraft:plate:3>, <thaumcraft:inlay>, <thaumcraft:plate:3>, <thaumcraft:inlay>, <thaumcraft:plate:3>, <thaumcraft:inlay>, <thaumcraft:plate:3>, <thaumcraft:inlay>]
);

mods.thaumcraft.Infusion.removeRecipe(<thaumictinkerer:blood_sword>);
mods.thaumcraft.Infusion.registerRecipe(
'blood_sword', // Name
'TT_SUMMONING', // Research
<thaumictinkerer:blood_sword>, // Output
5, // Instability
[<aspect:sanguis> * 100, <aspect:rattus> * 50, <aspect:mortuus> * 200],
<thaumcraft:thaumium_sword>, // CentralItem
[<extrautils2:goldenlasso:1>, <iceandfire:dread_shard>, <iceandfire:dread_shard>, <iceandfire:dread_shard>,
<extrautils2:goldenlasso:1>, <thaumictinkerer:kamiresource:1>, <thaumictinkerer:kamiresource:1>, <thaumictinkerer:kamiresource:1>]
);
2 changes: 2 additions & 0 deletions scripts/mods/thaumicwonders.zs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import crafttweaker.item.IItemStack;
import crafttweaker.recipes.IRecipeFunction;

<entity:thaumicwonders:corruption_avatar>.addDrop(<thaumictinkerer:kamiresource:2>, 13, 25);

// Cast quicksilver back to gem
recipes.removeByRecipeName('thaumicwonders:quicksilver_bucket');
recipes.removeByRecipeName('thaumicwonders:quicksilver_bucket_deconstruct');
Expand Down

0 comments on commit 78b98ed

Please sign in to comment.