Fix build script error

This commit is contained in:
modmuss50 2019-01-16 18:37:56 +00:00
parent a9bd6ab44d
commit 9918adf6fc
2 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
.gradle/
*-merged.jar
*-mapped.jar
*-intermediary.jar
*.DS_Store
build/
out/

View File

@ -173,6 +173,10 @@ task mergeJars(dependsOn: downloadMcJars) {
def server = inputs.files.files.find {it.name.endsWith("-server.jar")}
def merged = mergedFile
if(merged.exists()){
return
}
def jarMerger = new JarMerger(client, server, merged)
jarMerger.merge()
jarMerger.close()
@ -439,11 +443,10 @@ void mapJar(File output, File input, File mappings, File libraries, String from,
remapper.read(file.toPath())
}
remapper.apply(input.toPath(), outputConsumer)
outputConsumer.close()
remapper.finish()
outputConsumer.close()
} catch (Exception e) {
remapper.finish();
outputConsumer.close()
remapper.finish()
throw new RuntimeException("Failed to remap jar", e);
}
}