Merge remote-tracking branch 'origin/master'

This commit is contained in:
pahimar 2015-02-02 23:12:29 -05:00
commit 4230e77806
3 changed files with 9 additions and 2 deletions

View file

@ -168,7 +168,7 @@ curse {
projectId = project.ee3_curseforge_projectid
apiKey = project.ee3_curseforge_apikey
changelog = project.hasProperty('changelog') ? project.changelog : ''
releaseType = 'alpha'
releaseType = config.release_type
additionalArtifact devJar
}

View file

@ -3,3 +3,4 @@
minecraft_version = 1.7.10
forge_version = 10.13.2.1284
mod_version = 0.2
release_type = alpha

View file

@ -13,6 +13,7 @@ public class RecipeRegistry
private static RecipeRegistry recipeRegistry = null;
private Multimap<WrappedStack, List<WrappedStack>> recipeMap;
private ImmutableMultimap<WrappedStack, List<WrappedStack>> immutableRecipeMap;
private RecipeRegistry()
{
@ -69,7 +70,12 @@ public class RecipeRegistry
}
public Multimap<WrappedStack, List<WrappedStack>> getRecipeMappings()
{
if (immutableRecipeMap == null)
{
return ImmutableMultimap.copyOf(recipeRegistry.recipeMap);
}
return immutableRecipeMap;
}
}