diff --git a/build.gradle b/build.gradle index c104298..58a683f 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ repositories { dependencies { implementation "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:deobf" - implementation "dev.tilera:auracore:1.1.1:deobf" + implementation "dev.tilera:auracore:1.2.0:deobf" implementation "com.github.tox1cozZ:mixin-booter-legacy:1.1.2" } diff --git a/src/main/java/net/anvilcraft/classiccasting/items/wands/ItemWandCasting.java b/src/main/java/net/anvilcraft/classiccasting/items/wands/ItemWandCasting.java index c95d785..4b24b7b 100644 --- a/src/main/java/net/anvilcraft/classiccasting/items/wands/ItemWandCasting.java +++ b/src/main/java/net/anvilcraft/classiccasting/items/wands/ItemWandCasting.java @@ -3,8 +3,11 @@ package net.anvilcraft.classiccasting.items.wands; import java.util.List; import cpw.mods.fml.common.registry.LanguageRegistry; +import dev.tilera.auracore.api.AuracoreRecipes; import dev.tilera.auracore.api.IWand; +import dev.tilera.auracore.api.crafting.CrucibleRecipe; import dev.tilera.auracore.aura.AuraManager; +import dev.tilera.auracore.crafting.AuracoreCraftingManager; import net.anvilcraft.classiccasting.CCBlocks; import net.anvilcraft.classiccasting.ClassicCastingTab; import net.anvilcraft.classiccasting.WandManager; @@ -362,19 +365,18 @@ public abstract class ItemWandCasting extends Item implements IWand { tile2.spillRemnants(); return true; } - // TODO: worry about this when tilera implements the other recipe handler - // thingy - //if (WandManager.spendCharge( - // world, - // itemstack, - // player, - // ThaumcraftCraftingManager.getCrucibleOutputCost(tile2) - // )) { - // ThaumcraftCraftingManager.performCrucibleCrafting( - // world, player, tile2 - // ); - // return true; - //} + CrucibleRecipe recipe = AuracoreRecipes.getCrucibleRecipe(tile2.aspects, tile2); + if (WandManager.spendCharge( + world, + itemstack, + player, + AuracoreRecipes.getCrucibleOutputCost(tile2, recipe) + )) { + AuracoreCraftingManager.performCrucibleCrafting( + player, tile2 + ); + return true; + } } return result; } diff --git a/src/main/resources/classiccasting_at.cfg b/src/main/resources/META-INF/classiccasting_at.cfg similarity index 100% rename from src/main/resources/classiccasting_at.cfg rename to src/main/resources/META-INF/classiccasting_at.cfg