fix IMM Obsidian Tile recipe conflicts

Author: Nxer

src/main/java/com/Nxer/TwistSpaceTechnology/recipe/machineRecipe/expanded/IndustrialMagicMatrixRecipePool.java

@@ -10,16 +10,20 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 
 import com.Nxer.TwistSpaceTechnology.common.api.ModBlocksHandler;
 import com.Nxer.TwistSpaceTechnology.common.recipeMap.GTCMRecipe;
 import com.Nxer.TwistSpaceTechnology.common.recipeMap.metadata.IndustrialMagicMatrixRecipeIndexKey;
 import com.Nxer.TwistSpaceTechnology.system.Thaumcraft.TCRecipeTools;
+import com.Nxer.TwistSpaceTechnology.util.TSTArrayUtils;
 import com.Nxer.TwistSpaceTechnology.util.TextEnums;
 import com.Nxer.TwistSpaceTechnology.util.rewrites.TST_ItemID;
 
@@ -30,19 +34,23 @@
 import gregtech.api.interfaces.IRecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.util.GTOreDictUnificator;
-import thaumcraft.common.items.ItemEssence;
+import gregtech.api.util.GTUtility;
+import thaumcraft.api.aspects.AspectList;
 
 public class IndustrialMagicMatrixRecipePool {
 
     protected Collection<TST_ItemID> itemsUnconsumed = new HashSet<>();
+    protected Map<TST_ItemID, Integer> recipeSeparationMap = new HashMap<>();
 
     protected void prepare() {
         itemsUnconsumed.add(TST_ItemID.create(new ItemStack(bigPearl)));
+
+        recipeSeparationMap.put(TST_ItemID.create(blockCosmeticSolid), 11);
     }
 
     /**
      * Turn input item list to correct items for IMM recipe.
-     * 
+     *
      * @param origin Itemstacks from TC Infusion Matrix recipe.
      * @return Items for IMM recipes.
      */
@@ -106,13 +114,14 @@ public void loadRecipes() {
             // # Recipe required Essentia
             // #zh_CN 配方所需源质
             Essence.setStackDisplayName(TextEnums.tr("IndustrialMagicMatrixRecipeInputAspects"));
-            new ItemEssence().setAspects(Essence, Recipe.getInputAspects());
+            setAspects(Essence, Recipe.getInputAspects());
+
             GTValues.RA.stdBuilder()
                 .ignoreCollision()
                 .clearInvalid()
                 .special(Essence)
                 .metadata(IndustrialMagicMatrixRecipeIndexKey.INSTANCE, i)
-                .itemInputs(checkInputSpecial(Recipe.getInputItem()))
+                .itemInputs(lateCheck(TST_ItemID.create(Recipe.getOutput()), checkInputSpecial(Recipe.getInputItem())))
                 .itemOutputs((Recipe.getOutput()))
                 .fluidInputs()
                 .fluidOutputs()
@@ -131,4 +140,23 @@ public void loadRecipes() {
             .addTo(RecipeMaps.assemblerRecipes);
     }
 
+    public ItemStack[] lateCheck(TST_ItemID output, ItemStack... inputs) {
+        if (recipeSeparationMap.containsKey(output)) {
+            int tag = recipeSeparationMap.get(output);
+
+            return TSTArrayUtils.concatToLast(ItemStack.class, inputs, GTUtility.getIntegratedCircuit(tag));
+
+        }
+
+        return inputs;
+    }
+
+    public void setAspects(ItemStack itemstack, AspectList aspects) {
+        if (!itemstack.hasTagCompound()) {
+            itemstack.setTagCompound(new NBTTagCompound());
+        }
+
+        aspects.writeToNBT(itemstack.getTagCompound());
+    }
+
 }

src/main/java/com/Nxer/TwistSpaceTechnology/util/rewrites/TST_ItemID.java

@@ -2,6 +2,7 @@
 
 import java.util.Objects;
 
+import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -48,6 +49,26 @@ public static TST_ItemID create(ItemStack itemStack) {
         return new TST_ItemID(itemStack.getItem(), itemStack.getItemDamage(), itemStack.getTagCompound());
     }
 
+    public static TST_ItemID create(Item item) {
+        if (null == item) return NULL;
+        return new TST_ItemID(item, 0);
+    }
+
+    public static TST_ItemID create(Item item, int metaData) {
+        if (null == item) return NULL;
+        return new TST_ItemID(item, metaData);
+    }
+
+    public static TST_ItemID create(Block block) {
+        if (null == block) return NULL;
+        return create(new ItemStack(block));
+    }
+
+    public static TST_ItemID create(Block block, int metaData) {
+        if (null == block) return NULL;
+        return create(new ItemStack(block, 1, metaData));
+    }
+
     public static TST_ItemID createNoNBT(ItemStack itemStack) {
         if (null == itemStack) return NULL;
         return new TST_ItemID(itemStack.getItem(), itemStack.getItemDamage());