mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

9
build.gradle
View File

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