@@ -58,17 +58,17 @@ class MergeJars {
5858
5959 static void merge (Project project , List<SourceSet > sourceSets ) {
6060 // Generate folders, merge the access transformers and neoforge.mods.toml files
61- project. mkdir(" $ project . layout . buildDirectory / generated/META-INF" )
61+ project. mkdir(project. layout. buildDirectory. dir( ' generated/META-INF' ) )
6262 mergeBasic(project, sourceSets, ' META-INF/accesstransformer.cfg' , (text, fileText) -> text + " \n " + fileText)
6363 mergeModsTOML(project, sourceSets)
6464 // Delete the data directory so that we don't accidentally leak bad old data into it
65- project. file(" $ project . layout . buildDirectory / generated/assets" ). deleteDir()
66- project. file(" $ project . layout . buildDirectory / generated/data" ). deleteDir()
67- project. file(" $ project . layout . buildDirectory / generated/META-INF/services" ). deleteDir()
65+ project. file(project. layout. buildDirectory. dir( ' generated/assets' ) ). deleteDir()
66+ project. file(project. layout. buildDirectory. dir( ' generated/data' ) ). deleteDir()
67+ project. file(project. layout. buildDirectory. dir( ' generated/META-INF/services' ) ). deleteDir()
6868 // And then recreate the directory so we can put stuff in it
69- project. mkdir(" $ project . layout . buildDirectory / generated/assets" )
70- project. mkdir(" $ project . layout . buildDirectory / generated/data" )
71- project. mkdir(" $ project . layout . buildDirectory / generated/META-INF/services" )
69+ project. mkdir(project. layout. buildDirectory. dir( ' generated/assets' ) )
70+ project. mkdir(project. layout. buildDirectory. dir( ' generated/data' ) )
71+ project. mkdir(project. layout. buildDirectory. dir( ' generated/META-INF/services' ) )
7272 mergeAtlases(project, sourceSets)
7373 mergeTags(project, sourceSets)
7474 mergeServices(project, sourceSets)
@@ -196,7 +196,7 @@ class MergeJars {
196196 }
197197
198198 private static void writeOutputFile (Project project , String outputPath , String text ) {
199- File outputFile = new File ( " $ project . layout . buildDirectory / generated" + outputPath)
199+ File outputFile = project . file( project. layout. buildDirectory. file( ' generated/ ' + outputPath) )
200200 // Make all parent directories needed
201201 outputFile. getParentFile(). mkdirs()
202202 outputFile. text = text
0 commit comments