|
1 | | -//version: 1656003793falsepattern32 |
| 1 | +//version: 1656003793falsepattern33 |
2 | 2 | /* |
3 | 3 | DO NOT CHANGE THIS FILE! |
4 | 4 |
|
@@ -325,9 +325,14 @@ dependencies { |
325 | 325 |
|
326 | 326 | apply from: 'dependencies.gradle' |
327 | 327 |
|
| 328 | +def mixinDir = new File(project.buildDir, 'mixins') |
| 329 | +if (!mixinDir.exists()) { |
| 330 | + mixinDir.mkdirs() |
| 331 | +} |
328 | 332 | def mixingConfigRefMap = "mixins." + modId + ".refmap.json" |
329 | | -def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap |
330 | | -def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg" |
| 333 | +def srgFile = new File(project.buildDir, 'srgs/mcp-srg.srg') |
| 334 | +def mixinSrg = new File(mixinDir, "${mixingConfigRefMap}.srg") |
| 335 | +def mixinRefMap = new File(mixinDir, mixingConfigRefMap) |
331 | 336 |
|
332 | 337 | task generateAssets { |
333 | 338 | if(usesMixins.toBoolean()) { |
@@ -399,9 +404,9 @@ afterEvaluate { |
399 | 404 | if(usesMixins.toBoolean()) { |
400 | 405 | tasks.compileJava { |
401 | 406 | options.compilerArgs += [ |
402 | | - "-AreobfSrgFile=${tasks.reobf.srg}", |
| 407 | + "-AreobfSrgFile=${srgFile}", |
403 | 408 | "-AoutSrgFile=${mixinSrg}", |
404 | | - "-AoutRefMapFile=${refMap}", |
| 409 | + "-AoutRefMapFile=${mixinRefMap}", |
405 | 410 | // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code |
406 | 411 | "-XDenableSunApiLintControl", |
407 | 412 | "-XDignore.symbol.file" |
@@ -488,7 +493,7 @@ processResources { |
488 | 493 | } |
489 | 494 |
|
490 | 495 | if(usesMixins.toBoolean()) { |
491 | | - from refMap |
| 496 | + from mixinRefMap |
492 | 497 | } |
493 | 498 |
|
494 | 499 | // copy everything else that's not the mcmod.info |
@@ -598,6 +603,14 @@ task apiJar(type: Jar) { |
598 | 603 | getArchiveClassifier().set('api') |
599 | 604 | } |
600 | 605 |
|
| 606 | +task copySrgs(type: Copy, dependsOn: 'genSrgs') { |
| 607 | + from plugins.getPlugin('forge').delayedFile('{SRG_DIR}') |
| 608 | + include '**/*.srg' |
| 609 | + into layout.buildDirectory.file('srgs') |
| 610 | +} |
| 611 | + |
| 612 | +compileJava.dependsOn(copySrgs) |
| 613 | + |
601 | 614 | artifacts { |
602 | 615 | archives sourcesJar |
603 | 616 | archives devJar |
|
0 commit comments