From 699ea26ba459eed3ed516544fbbf6ed6e72e1607 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Tue, 13 Jun 2017 22:41:15 +0200 Subject: Attempt to fix not accepting fluids after fluidmapchange. #1081 #577 ect. --- src/main/java/gregtech/api/util/GT_Recipe.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 2c3134816d..7801860b1d 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -556,6 +556,7 @@ public class GT_Recipe implements Comparable { * HashMap of Recipes based on their Fluids */ public final Map> mRecipeFluidMap = new /*Concurrent*/HashMap>(); + public final HashSet mRecipeFluidNameMap = new HashSet(); /** * The List of all Recipes */ @@ -664,6 +665,8 @@ public class GT_Recipe implements Comparable { Collection tList = mRecipeFluidMap.get(aFluid.getFluid()); if (tList == null) mRecipeFluidMap.put(aFluid.getFluid(), tList = new HashSet(1)); tList.add(aRecipe); + if(!mRecipeFluidNameMap.contains(aFluid.getFluid().getName())) + mRecipeFluidNameMap.add(aFluid.getFluid().getName()); } return addToItemMap(aRecipe); } @@ -696,7 +699,7 @@ public class GT_Recipe implements Comparable { * @return if this Fluid is a valid Input for any for the Recipes */ public boolean containsInput(Fluid aFluid) { - return aFluid != null && mRecipeFluidMap.containsKey(aFluid); + return aFluid != null && mRecipeFluidNameMap.contains(aFluid.getName()); } public GT_Recipe findRecipe(IHasWorldObjectAndCoords aTileEntity, boolean aNotUnificated, long aVoltage, FluidStack[] aFluids, ItemStack... aInputs) { -- cgit