tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse source 
Conflicts:
	src/main/java/mekanism/client/nei/PRCRecipeHandler.java
This commit is contained in:
Aidan C. Brady 2015-02-19 18:37:09 -05:00
parent bf4b74f535 b1caa56f5a
commit be400ec648
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/mekanism/client/nei/PRCRecipeHandler.java
View file

@ -1,6 +1,10 @@
package mekanism.client.nei;
import java.awt.*;
import static codechicken.lib.gui.GuiDraw.changeTexture;
import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect;
import java.awt.Point;
import java.awt.Rectangle;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -27,7 +31,6 @@ import mekanism.common.recipe.machines.PressurizedRecipe;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@ -41,9 +44,6 @@ import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.TemplateRecipeHandler;
import static codechicken.lib.gui.GuiDraw.changeTexture;
import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect;
public class PRCRecipeHandler extends BaseRecipeHandler
{
private int ticksPassed;
@ -192,7 +192,7 @@ public class PRCRecipeHandler extends BaseRecipeHandler
{
for(Map.Entry<PressurizedInput, PressurizedRecipe> irecipe : getRecipes())
{
if(irecipe.getValue().getInput().containsType((GasStack)results[0]))
if(irecipe.getValue().getOutput().getGasOutput().isGasEqual((GasStack)results[0]))
{
arecipes.add(new CachedIORecipe(irecipe));
}