From 739d0ab89291ce9484223cfb04c104d87296646f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 11 Jul 2014 17:05:22 +0200 Subject: [PATCH] Fixed recursive recipe includes. Closes #387. --- src/main/scala/li/cil/oc/common/recipe/Recipes.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala index 8e7dc5982..ada929c2f 100644 --- a/src/main/scala/li/cil/oc/common/recipe/Recipes.scala +++ b/src/main/scala/li/cil/oc/common/recipe/Recipes.scala @@ -68,7 +68,7 @@ object Recipes { if (!userRecipes.exists()) { FileUtils.copyURLToFile(getClass.getResource("/assets/opencomputers/recipes/user.recipes"), userRecipes) } - val config = ConfigParseOptions.defaults. + lazy val config: ConfigParseOptions = ConfigParseOptions.defaults. setSyntax(ConfigSyntax.CONF). setIncluder(new ConfigIncluder with ConfigIncluderFile { var fallback: ConfigIncluder = _ @@ -82,7 +82,7 @@ object Recipes { override def includeFile(context: ConfigIncludeContext, what: File) = { val in = if (what.isAbsolute) new FileReader(what) else new FileReader(new File(userRecipes.getParentFile, what.getPath)) - val result = ConfigFactory.parseReader(in) + val result = ConfigFactory.parseReader(in, config) in.close() result.root() }