diff options
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/build.properties b/build.properties index aa9a58c099..ad1092fbce 100644 --- a/build.properties +++ b/build.properties @@ -23,7 +23,7 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=5 -buildNumber=2_pre17 +buildNumber=2_pre18 APIVersion=8 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java index ab17f787c9..c210a5e170 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java @@ -2,13 +2,20 @@ package com.github.bartimaeusnek.crossmod.tectech; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.util.BW_Util; +import com.github.bartimaeusnek.crossmod.BartWorksCrossmod; import com.github.technus.tectech.recipe.TT_recipeAdder; +import com.github.technus.tectech.thing.CustomItemList; +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import net.minecraftforge.fluids.FluidStack; +import java.util.HashSet; + public class TecTechResearchLoader { public static void runResearches(){ @@ -47,14 +54,17 @@ public class TecTechResearchLoader { // toRem.add(recipe); // } // } -// HashSet<GT_Recipe> toRemVisual = new HashSet<>(); +// HashSet<GT_Recipe> toRemVisualScanner = new HashSet<>(); +// HashSet<GT_Recipe> toRemVisualAssLine = new HashSet<>(); // GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.removeAll(toRem); // // for (GT_Recipe.GT_Recipe_AssemblyLine recipe : toRem){ -// GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.mRecipeList.stream().filter(re -> GT_Utility.areStacksEqual(re.mOutputs[0],recipe.mOutput)).forEach(toRemVisual::add); +// GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList.stream().filter(re -> GT_Utility.areStacksEqual(re.mOutputs[0],recipe.mOutput)).forEach(toRemVisualAssLine::add); +// GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.mRecipeList.stream().filter(re -> GT_Utility.areStacksEqual(re.mOutputs[0],recipe.mOutput)).forEach(toRemVisualScanner::add); // TT_recipeAdder.addResearchableAssemblylineRecipe(recipe.mResearchItem, recipe.mResearchTime, recipe.mResearchTime/1000, recipe.mEUt, GT_Utility.getTier(recipe.mEUt)-2, recipe.mInputs, recipe.mFluidInputs, recipe.mOutput, recipe.mDuration, recipe.mEUt); // } // -// GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.mRecipeList.removeAll(toRemVisual); +// GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.mRecipeList.removeAll(toRemVisualScanner); +// GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList.removeAll(toRemVisualAssLine); } } |