Skip to content

Commit 9d7e854

Browse files
committed
update buildscript
1 parent 42543dc commit 9d7e854

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

build.gradle

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//version: 1656003793falsepattern32
1+
//version: 1656003793falsepattern33
22
/*
33
DO NOT CHANGE THIS FILE!
44
@@ -325,9 +325,14 @@ dependencies {
325325

326326
apply from: 'dependencies.gradle'
327327

328+
def mixinDir = new File(project.buildDir, 'mixins')
329+
if (!mixinDir.exists()) {
330+
mixinDir.mkdirs()
331+
}
328332
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)
331336

332337
task generateAssets {
333338
if(usesMixins.toBoolean()) {
@@ -399,9 +404,9 @@ afterEvaluate {
399404
if(usesMixins.toBoolean()) {
400405
tasks.compileJava {
401406
options.compilerArgs += [
402-
"-AreobfSrgFile=${tasks.reobf.srg}",
407+
"-AreobfSrgFile=${srgFile}",
403408
"-AoutSrgFile=${mixinSrg}",
404-
"-AoutRefMapFile=${refMap}",
409+
"-AoutRefMapFile=${mixinRefMap}",
405410
// Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
406411
"-XDenableSunApiLintControl",
407412
"-XDignore.symbol.file"
@@ -488,7 +493,7 @@ processResources {
488493
}
489494

490495
if(usesMixins.toBoolean()) {
491-
from refMap
496+
from mixinRefMap
492497
}
493498

494499
// copy everything else that's not the mcmod.info
@@ -598,6 +603,14 @@ task apiJar(type: Jar) {
598603
getArchiveClassifier().set('api')
599604
}
600605

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+
601614
artifacts {
602615
archives sourcesJar
603616
archives devJar

0 commit comments

Comments
 (0)