oredict circuits working now hopfully

1 files changed, 18 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
index 7b634ae9f0..07d4a6c54f 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
@@ -10,6 +10,7 @@ import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_ModHandler.RecipeBits;
+import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
 import ic2.core.Ic2Items;
@@ -657,10 +658,26 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
             case 2:
                 return (!mRequiresFluidForFiltering || getFillableStack() != null) && (((getInputAt(0) != null && getInputAt(1) != null) || (getInputAt(0) == null && getInputAt(1) == null ? getRecipeList().containsInput(aStack) : (getRecipeList().containsInput(aStack) && null != getRecipeList().findRecipe(getBaseMetaTileEntity(), mLastRecipe, true, V[mTier], new FluidStack[]{getFillableStack()}, getSpecialSlot(), aIndex == getInputSlot() ? new ItemStack[]{aStack, getInputAt(1)} : new ItemStack[]{getInputAt(0), aStack})))));
             default:
-                return getRecipeList().containsInput(aStack);
+                GT_Recipe_Map gt_recipe_map = getRecipeList();
+                if (GT_Recipe_Map.sCircuitAssemblerRecipes == gt_recipe_map) // assemblers IDs
+                {
+                    if (GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitBasic") ||
+                            GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitGood") ||
+                            GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitAdvanced") ||
+                            GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitData") ||
+                            GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitElite") ||
+                            GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitUltimate") ||
+                            GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitSuperconductor") ||
+                            GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitInfinity") ||
+                            GT_OreDictUnificator.isItemStackInstanceOf(aStack, "circuitBio"))return true;;
+                    // allow input all of this oredict circuits for assemblers
+                    return getRecipeList().containsInput(aStack);
+                }
         }
+        return true;
     }
 
+
     @Override
     public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPreTick(aBaseMetaTileEntity, aTick);