fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop Examining other mods recipes.

Browse Source
This commit is contained in:
AlgorithmX2
2014-06-02 12:01:37 -05:00
parent a82a03f3b9
commit ba525621a6
2 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java
+18 -24
View File
@@ -48,14 +48,11 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList(); List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe irecipe : allrecipes) for (IRecipe irecipe : allrecipes)
{ {
CachedShapedRecipe recipe = null;
if ( (irecipe instanceof ShapedRecipe) ) if ( (irecipe instanceof ShapedRecipe) )
recipe = new CachedShapedRecipe( (ShapedRecipe) irecipe );
if ( recipe != null )
{ {
CachedShapedRecipe recipe = new CachedShapedRecipe( (ShapedRecipe) irecipe );
recipe.computeVisuals(); recipe.computeVisuals();
this.arecipes.add( recipe ); arecipes.add( recipe );
} }
} }
} }
@@ -70,16 +67,13 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList(); List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe irecipe : allrecipes) for (IRecipe irecipe : allrecipes)
{ {
if ( NEIServerUtils.areStacksSameTypeCrafting( irecipe.getRecipeOutput(), result ) ) if ( (irecipe instanceof ShapedRecipe) )
{ {
CachedShapedRecipe recipe = null; if ( NEIServerUtils.areStacksSameTypeCrafting( irecipe.getRecipeOutput(), result ) )
if ( (irecipe instanceof ShapedRecipe) )
recipe = new CachedShapedRecipe( (ShapedRecipe) irecipe );
if ( recipe != null )
{ {
CachedShapedRecipe recipe = new CachedShapedRecipe( (ShapedRecipe) irecipe );
recipe.computeVisuals(); recipe.computeVisuals();
this.arecipes.add( recipe ); arecipes.add( recipe );
} }
} }
} }
@@ -90,17 +84,18 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList(); List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe irecipe : allrecipes) for (IRecipe irecipe : allrecipes)
{ {
CachedShapedRecipe recipe = null;
if ( (irecipe instanceof ShapedRecipe) ) if ( (irecipe instanceof ShapedRecipe) )
recipe = new CachedShapedRecipe( (ShapedRecipe) irecipe );
if ( (recipe != null) && (recipe.contains( recipe.ingredients, ingredient.getItem() )) )
{ {
recipe.computeVisuals(); CachedShapedRecipe recipe = new CachedShapedRecipe( (ShapedRecipe) irecipe );
if ( recipe.contains( recipe.ingredients, ingredient ) )
if ( recipe.contains( recipe.ingredients, ingredient.getItem() ) )
{ {
recipe.setIngredientPermutation( recipe.ingredients, ingredient ); recipe.computeVisuals();
this.arecipes.add( recipe ); if ( recipe.contains( recipe.ingredients, ingredient ) )
{
recipe.setIngredientPermutation( recipe.ingredients, ingredient );
arecipes.add( recipe );
}
} }
} }
} }
@@ -127,12 +122,12 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
{ {
IRecipeOverlayRenderer renderer = super.getOverlayRenderer( gui, recipe ); IRecipeOverlayRenderer renderer = super.getOverlayRenderer( gui, recipe );
if ( renderer != null ) if ( renderer != null )
{
return renderer; return renderer;
}
IStackPositioner positioner = RecipeInfo.getStackPositioner( gui, "crafting2x2" ); IStackPositioner positioner = RecipeInfo.getStackPositioner( gui, "crafting2x2" );
if ( positioner == null ) if ( positioner == null )
return null; return null;
return new DefaultOverlayRenderer( getIngredientStacks( recipe ), positioner ); return new DefaultOverlayRenderer( getIngredientStacks( recipe ), positioner );
} }
@@ -141,9 +136,8 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
{ {
IOverlayHandler handler = super.getOverlayHandler( gui, recipe ); IOverlayHandler handler = super.getOverlayHandler( gui, recipe );
if ( handler != null ) if ( handler != null )
{
return handler; return handler;
}
return RecipeInfo.getOverlayHandler( gui, "crafting2x2" ); return RecipeInfo.getOverlayHandler( gui, "crafting2x2" );
} }
integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java
+18 -25
View File
@@ -48,12 +48,9 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList(); List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe irecipe : allrecipes) for (IRecipe irecipe : allrecipes)
{ {
CachedShapelessRecipe recipe = null;
if ( (irecipe instanceof ShapelessRecipe) ) if ( (irecipe instanceof ShapelessRecipe) )
recipe = new CachedShapelessRecipe( (ShapelessRecipe) irecipe );
if ( recipe != null )
{ {
CachedShapelessRecipe recipe = new CachedShapelessRecipe( (ShapelessRecipe) irecipe );
recipe.computeVisuals(); recipe.computeVisuals();
this.arecipes.add( recipe ); this.arecipes.add( recipe );
} }
@@ -70,16 +67,13 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList(); List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe irecipe : allrecipes) for (IRecipe irecipe : allrecipes)
{ {
if ( NEIServerUtils.areStacksSameTypeCrafting( irecipe.getRecipeOutput(), result ) ) if ( (irecipe instanceof ShapelessRecipe) )
{ {
CachedShapelessRecipe recipe = null; if ( NEIServerUtils.areStacksSameTypeCrafting( irecipe.getRecipeOutput(), result ) )
if ( (irecipe instanceof ShapelessRecipe) )
recipe = new CachedShapelessRecipe( (ShapelessRecipe) irecipe );
if ( recipe != null )
{ {
CachedShapelessRecipe recipe = new CachedShapelessRecipe( (ShapelessRecipe) irecipe );
recipe.computeVisuals(); recipe.computeVisuals();
this.arecipes.add( recipe ); arecipes.add( recipe );
} }
} }
} }
@@ -90,17 +84,18 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList(); List<IRecipe> allrecipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe irecipe : allrecipes) for (IRecipe irecipe : allrecipes)
{ {
CachedShapelessRecipe recipe = null;
if ( (irecipe instanceof ShapelessRecipe) ) if ( (irecipe instanceof ShapelessRecipe) )
recipe = new CachedShapelessRecipe( (ShapelessRecipe) irecipe );
if ( (recipe != null) && (recipe.contains( recipe.ingredients, ingredient.getItem() )) )
{ {
recipe.computeVisuals(); CachedShapelessRecipe recipe = new CachedShapelessRecipe( (ShapelessRecipe) irecipe );
if ( recipe.contains( recipe.ingredients, ingredient ) )
if ( recipe.contains( recipe.ingredients, ingredient.getItem() ) )
{ {
recipe.setIngredientPermutation( recipe.ingredients, ingredient ); recipe.computeVisuals();
this.arecipes.add( recipe ); if ( recipe.contains( recipe.ingredients, ingredient ) )
{
recipe.setIngredientPermutation( recipe.ingredients, ingredient );
this.arecipes.add( recipe );
}
} }
} }
} }
@@ -127,12 +122,12 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
{ {
IRecipeOverlayRenderer renderer = super.getOverlayRenderer( gui, recipe ); IRecipeOverlayRenderer renderer = super.getOverlayRenderer( gui, recipe );
if ( renderer != null ) if ( renderer != null )
{
return renderer; return renderer;
}
IStackPositioner positioner = RecipeInfo.getStackPositioner( gui, "crafting2x2" ); IStackPositioner positioner = RecipeInfo.getStackPositioner( gui, "crafting2x2" );
if ( positioner == null ) if ( positioner == null )
return null; return null;
return new DefaultOverlayRenderer( getIngredientStacks( recipe ), positioner ); return new DefaultOverlayRenderer( getIngredientStacks( recipe ), positioner );
} }
@@ -141,9 +136,8 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
{ {
IOverlayHandler handler = super.getOverlayHandler( gui, recipe ); IOverlayHandler handler = super.getOverlayHandler( gui, recipe );
if ( handler != null ) if ( handler != null )
{
return handler; return handler;
}
return RecipeInfo.getOverlayHandler( gui, "crafting2x2" ); return RecipeInfo.getOverlayHandler( gui, "crafting2x2" );
} }
@@ -200,9 +194,8 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
public void computeVisuals() public void computeVisuals()
{ {
for (PositionedStack p : this.ingredients) for (PositionedStack p : this.ingredients)
{
p.generatePermutations(); p.generatePermutations();
}
this.result.generatePermutations(); this.result.generatePermutations();
} }
} }