From 38e772107c4c36754f38503b14a382771aa7e1ba Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 14 Aug 2013 11:01:44 -0400 Subject: [PATCH] Merged NEI module, bumped version --- common/mekanism/nei/AdvancedMachineRecipeHandler.java | 2 +- common/mekanism/nei/MachineRecipeHandler.java | 2 +- common/mekanism/nei/MekanismRecipeHandler.java | 4 ++++ common/mekanism/nei/NEIMekanismConfig.java | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/common/mekanism/nei/AdvancedMachineRecipeHandler.java b/common/mekanism/nei/AdvancedMachineRecipeHandler.java index ee5417160..4f85b77d6 100644 --- a/common/mekanism/nei/AdvancedMachineRecipeHandler.java +++ b/common/mekanism/nei/AdvancedMachineRecipeHandler.java @@ -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(); diff --git a/common/mekanism/nei/MachineRecipeHandler.java b/common/mekanism/nei/MachineRecipeHandler.java index a5121f5ab..9d1998958 100644 --- a/common/mekanism/nei/MachineRecipeHandler.java +++ b/common/mekanism/nei/MachineRecipeHandler.java @@ -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(); diff --git a/common/mekanism/nei/MekanismRecipeHandler.java b/common/mekanism/nei/MekanismRecipeHandler.java index bc7fc99d8..cb3d5a130 100644 --- a/common/mekanism/nei/MekanismRecipeHandler.java +++ b/common/mekanism/nei/MekanismRecipeHandler.java @@ -28,6 +28,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler if(outputId.equals("crafting") && getClass() == MekanismRecipeHandler.class) { List 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 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 allrecipes = CraftingManager.getInstance().getRecipeList(); + for(IRecipe irecipe : allrecipes) { if(irecipe instanceof MekanismRecipe) @@ -187,6 +190,7 @@ public class MekanismRecipeHandler extends ShapedRecipeHandler } } } + return false; } } diff --git a/common/mekanism/nei/NEIMekanismConfig.java b/common/mekanism/nei/NEIMekanismConfig.java index 1b145a46a..fde6c2076 100644 --- a/common/mekanism/nei/NEIMekanismConfig.java +++ b/common/mekanism/nei/NEIMekanismConfig.java @@ -49,6 +49,6 @@ public class NEIMekanismConfig implements IConfigureNEI @Override public String getVersion() { - return "1.0.3"; + return "1.0.4"; } }