Import ancient and eldritch infusion altar fix from Thaumic Augmentation

If both mods are installed, it will just overwrite the recipe an additional time, which is fine. It will be removed from Thaumic Augmentation once TA starts depending on this mod.

src/main/java/thecodex6824/thaumcraftfix/common/event/CommonEventHandler.java

@@ -20,11 +20,26 @@
 
 package thecodex6824.thaumcraftfix.common.event;
 
+import java.lang.reflect.Field;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
+import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import thaumcraft.api.ThaumcraftApi;
+import thaumcraft.api.ThaumcraftApi.BluePrint;
+import thaumcraft.api.blocks.BlocksTC;
+import thaumcraft.api.crafting.IDustTrigger;
+import thaumcraft.api.crafting.Part;
+import thaumcraft.common.blocks.basic.BlockPillar;
+import thaumcraft.common.lib.crafting.DustTriggerMultiblock;
 import thaumcraft.common.lib.events.PlayerEvents;
 import thecodex6824.thaumcraftfix.api.ThaumcraftFixApi;
 
@@ -43,4 +58,114 @@ public static void onFallFirst(LivingAttackEvent event) {
 	}
     }
 
+    private static Field TRIGGER_RESEARCH = null;
+
+    private static String getDustTriggerResearch(DustTriggerMultiblock trigger) {
+	try {
+	    if (TRIGGER_RESEARCH == null) {
+		TRIGGER_RESEARCH = DustTriggerMultiblock.class.getDeclaredField("research");
+		TRIGGER_RESEARCH.setAccessible(true);
+	    }
+	    return (String) TRIGGER_RESEARCH.get(trigger);
+	}
+	catch (Exception ex) {
+	    FMLCommonHandler.instance().raiseException(ex, "Failed to access or invoke Thaumcraft's DustTriggerMultiblock#research", true);
+	    return null;
+	}
+    }
+
+    @SubscribeEvent
+    public static void onRegisterRecipes(RegistryEvent.Register<IRecipe> event) {
+	/**
+	 * The multiblock recipes registered by TC require a pedestal with a meta value
+	 * of 1 for ancient and 2 for eldritch. However, the meta value is for the redstone inlay power
+	 * going through the pedestal (the arcane/ancient/eldritch pillars are their own blocks).
+	 * Removing the metadata requirement fixes the multiblocks. This was probably an oversight in
+	 * the last few betas (since the stablizier mechanics were reworked).
+	 */
+
+	Part matrix = new Part(BlocksTC.infusionMatrix, null);
+
+	Part ancientStone = new Part(BlocksTC.stoneAncient, "AIR");
+	Part ancientPillarEast = new Part(BlocksTC.stoneAncient, new ItemStack(BlocksTC.pillarAncient, 1, BlockPillar.calcMeta(EnumFacing.EAST)));
+	Part ancientPillarNorth = new Part(BlocksTC.stoneAncient, new ItemStack(BlocksTC.pillarAncient, 1, BlockPillar.calcMeta(EnumFacing.NORTH)));
+	Part ancientPillarSouth = new Part(BlocksTC.stoneAncient, new ItemStack(BlocksTC.pillarAncient, 1, BlockPillar.calcMeta(EnumFacing.SOUTH)));
+	Part ancientPillarWest = new Part(BlocksTC.stoneAncient, new ItemStack(BlocksTC.pillarAncient, 1, BlockPillar.calcMeta(EnumFacing.WEST)));
+	Part ancientPedestal = new Part(BlocksTC.pedestalAncient, null);
+	Part[][][] ancientBlueprint = new Part[][][] {
+	    {
+		{null, null, null},
+		{null, matrix, null},
+		{null, null, null}
+	    },
+	    {
+		{ancientStone, null, ancientStone},
+		{null, null, null},
+		{ancientStone, null, ancientStone}
+	    },
+	    {
+		{ancientPillarEast, null, ancientPillarNorth},
+		{null, ancientPedestal, null},
+		{ancientPillarSouth, null, ancientPillarWest}
+	    }
+	};
+
+	// IDustTrigger stores an ArrayList of triggers, so we need to find / remove ourselves
+	for (int i = 0; i < IDustTrigger.triggers.size(); ++i) {
+	    IDustTrigger trigger = IDustTrigger.triggers.get(i);
+	    if (trigger instanceof DustTriggerMultiblock && getDustTriggerResearch((DustTriggerMultiblock) trigger).equals("INFUSIONANCIENT")) {
+		IDustTrigger.triggers.remove(i);
+		break;
+	    }
+	}
+
+	IDustTrigger.registerDustTrigger(new DustTriggerMultiblock("INFUSIONANCIENT", ancientBlueprint));
+	// the catalog is just a map so this is ok
+	ThaumcraftApi.addMultiblockRecipeToCatalog(new ResourceLocation("thaumcraft", "infusionaltarancient"), new BluePrint("INFUSIONANCIENT", ancientBlueprint, new ItemStack[] {
+		new ItemStack(BlocksTC.stoneAncient, 8),
+		new ItemStack(BlocksTC.pedestalAncient),
+		new ItemStack(BlocksTC.infusionMatrix)
+	}));
+
+	Part eldritchStone = new Part(BlocksTC.stoneEldritchTile, "AIR");
+	Part eldritchPillarEast = new Part(BlocksTC.stoneEldritchTile, new ItemStack(BlocksTC.pillarEldritch, 1, BlockPillar.calcMeta(EnumFacing.EAST)));
+	Part eldritchPillarNorth = new Part(BlocksTC.stoneEldritchTile, new ItemStack(BlocksTC.pillarEldritch, 1, BlockPillar.calcMeta(EnumFacing.NORTH)));
+	Part eldritchPillarSouth = new Part(BlocksTC.stoneEldritchTile, new ItemStack(BlocksTC.pillarEldritch, 1, BlockPillar.calcMeta(EnumFacing.SOUTH)));
+	Part eldritchPillarWest = new Part(BlocksTC.stoneEldritchTile, new ItemStack(BlocksTC.pillarEldritch, 1, BlockPillar.calcMeta(EnumFacing.WEST)));
+	Part eldritchPedestal = new Part(BlocksTC.pedestalEldritch, null);
+	Part[][][] eldritchBlueprint = new Part[][][] {
+	    {
+		{null, null, null},
+		{null, matrix, null},
+		{null, null, null}
+	    },
+	    {
+		{eldritchStone, null, eldritchStone},
+		{null, null, null},
+		{eldritchStone, null, eldritchStone}
+	    },
+	    {
+		{eldritchPillarEast, null, eldritchPillarNorth},
+		{null, eldritchPedestal, null},
+		{eldritchPillarSouth, null, eldritchPillarWest}
+	    }
+	};
+
+	for (int i = 0; i < IDustTrigger.triggers.size(); ++i) {
+	    IDustTrigger trigger = IDustTrigger.triggers.get(i);
+	    if (trigger instanceof DustTriggerMultiblock && getDustTriggerResearch((DustTriggerMultiblock) trigger).equals("INFUSIONELDRITCH")) {
+		IDustTrigger.triggers.remove(i);
+		break;
+	    }
+	}
+
+	IDustTrigger.registerDustTrigger(new DustTriggerMultiblock("INFUSIONELDRITCH", eldritchBlueprint));
+	ThaumcraftApi.addMultiblockRecipeToCatalog(new ResourceLocation("thaumcraft", "infusionaltareldritch"), new BluePrint("INFUSIONELDRITCH", eldritchBlueprint, new ItemStack[] {
+		new ItemStack(BlocksTC.stoneEldritchTile, 8),
+		new ItemStack(BlocksTC.pedestalEldritch),
+		new ItemStack(BlocksTC.infusionMatrix)
+	}));
+
+    }
+
 }