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

Merged NEI module, bumped version

Browse source
This commit is contained in:
Aidan C. Brady 2013-08-14 11:01:44 -04:00
parent ed9def2010
commit 38e772107c
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/nei/AdvancedMachineRecipeHandler.java
View file

@ -17,7 +17,7 @@ import static codechicken.core.gui.GuiDraw.*;
public abstract class AdvancedMachineRecipeHandler extends TemplateRecipeHandler
{
int ticksPassed;
private int ticksPassed;
public abstract String getRecipeId();

2
common/mekanism/nei/MachineRecipeHandler.java
View file

@ -18,7 +18,7 @@ import static codechicken.core.gui.GuiDraw.*;
public abstract class MachineRecipeHandler extends TemplateRecipeHandler
{
int ticksPassed;
private int ticksPassed;
public abstract String getRecipeId();

4
common/mekanism/nei/MekanismRecipeHandler.java
View file

@ -28,6 +28,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler
if(outputId.equals("crafting") && getClass() == MekanismRecipeHandler.class)
{
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for(IRecipe irecipe : allrecipes)
{
if(irecipe instanceof MekanismRecipe)
@ -47,6 +48,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler
public void loadCraftingRecipes(ItemStack result)
{
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for(IRecipe irecipe : allrecipes)
{
if(irecipe instanceof MekanismRecipe && areItemsEqual(irecipe.getRecipeOutput(), result))
@ -62,6 +64,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler
public void loadUsageRecipes(ItemStack ingredient)
{
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for(IRecipe irecipe : allrecipes)
{
if(irecipe instanceof MekanismRecipe)
@ -187,6 +190,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler
}
}
}
return false;
}
}

2
common/mekanism/nei/NEIMekanismConfig.java
View file

@ -49,6 +49,6 @@ public class NEIMekanismConfig implements IConfigureNEI
@Override
public String getVersion()
{
return "1.0.3";
return "1.0.4";
}
}