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

Update enigma + tiny remapper 

Modernise yarn tasks
This commit is contained in:
modmuss50 2021-09-16 21:03:56 +01:00
parent 3c62b19290
commit 1804a08f23
2 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
build.gradle
View File

@ -12,7 +12,7 @@ buildscript {
classpath "net.fabricmc:stitch:${project.stitch_version}" classpath "net.fabricmc:stitch:${project.stitch_version}"
classpath "commons-io:commons-io:2.8.0" classpath "commons-io:commons-io:2.8.0"
classpath 'de.undercouch:gradle-download-task:4.1.1' classpath 'de.undercouch:gradle-download-task:4.1.1'
classpath 'net.fabricmc:tiny-remapper:0.4.2' classpath 'net.fabricmc:tiny-remapper:0.6.0'
classpath "net.fabricmc.unpick:unpick:${project.unpick_version}" classpath "net.fabricmc.unpick:unpick:${project.unpick_version}"
classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}" classpath "net.fabricmc.unpick:unpick-format-utils:${project.unpick_version}"
} }
@ -56,12 +56,7 @@ repositories {
} }
configurations { configurations {
enigmaRuntime { enigmaRuntime
resolutionStrategy {
cacheDynamicVersionsFor 0, "seconds"
cacheChangingModulesFor 0, "seconds"
}
}
javadocClasspath javadocClasspath
decompileClasspath decompileClasspath
mappingPoetJar { mappingPoetJar {
@ -77,7 +72,7 @@ configurations {
def unpickMetaFile = file("unpick-definitions/unpick.json") def unpickMetaFile = file("unpick-definitions/unpick.json")
dependencies { dependencies {
enigmaRuntime "cuchaz:enigma-swing:${project.enigma_version}" enigmaRuntime "cuchaz:enigma-swing:${project.enigma_version}:all"
enigmaRuntime "net.fabricmc:stitch:${project.stitch_version}" enigmaRuntime "net.fabricmc:stitch:${project.stitch_version}"
javadocClasspath "net.fabricmc:fabric-loader:${project.fabric_loader_version}" javadocClasspath "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
javadocClasspath "org.jetbrains:annotations:${project.jetbrains_annotations_version}" javadocClasspath "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
@ -385,46 +380,36 @@ task mapIntermediaryJar(dependsOn: [downloadMcLibs, downloadIntermediary, mergeJ
} }
} }
task yarnUnpicked(dependsOn: "unpickIntermediaryJar") { task yarnUnpicked(dependsOn: "unpickIntermediaryJar", type: JavaExec) {
group = yarnGroup group = yarnGroup
doLast {
ant.setLifecycleLogLevel "WARN" classpath = configurations.enigmaRuntime
ant.java( mainClass = 'cuchaz.enigma.gui.Main'
classname: 'cuchaz.enigma.gui.Main',
classpath: configurations.enigmaRuntime.asPath, args '-jar'
fork: true, args unpickedJar.getAbsolutePath()
spawn: true args '-mappings'
) { args mappingsDir.getAbsolutePath()
jvmarg(value: "-Xmx2048m") args '-profile'
arg(value: '-jar') args 'enigma_profile.json'
arg(value: unpickedJar.getAbsolutePath())
arg(value: '-mappings') jvmArgs "-Xmx2048m"
arg(value: mappingsDir.getAbsolutePath())
arg(value: '-profile')
arg(value: 'enigma_profile.json')
}
}
} }
task yarn(dependsOn: mapIntermediaryJar) { task yarn(dependsOn: mapIntermediaryJar, type: JavaExec) {
group = yarnGroup group = yarnGroup
doLast {
ant.setLifecycleLogLevel "WARN" classpath = configurations.enigmaRuntime
ant.java( mainClass = 'cuchaz.enigma.gui.Main'
classname: 'cuchaz.enigma.gui.Main',
classpath: configurations.enigmaRuntime.asPath, args '-jar'
fork: true, args intermediaryJar.getAbsolutePath()
spawn: true args '-mappings'
) { args mappingsDir.getAbsolutePath()
jvmarg(value: "-Xmx2048m") args '-profile'
arg(value: '-jar') args 'enigma_profile.json'
arg(value: intermediaryJar.getAbsolutePath())
arg(value: '-mappings') jvmArgs "-Xmx2048m"
arg(value: mappingsDir.getAbsolutePath())
arg(value: '-profile')
arg(value: 'enigma_profile.json')
}
}
} }
task checkMappings(dependsOn: mapIntermediaryJar) { task checkMappings(dependsOn: mapIntermediaryJar) {
@ -980,6 +965,7 @@ void mapJar(File output, File input, File mappings, File libraries, String from,
.withMappings(TinyUtils.createTinyMappingProvider(mappings.toPath(), from, to)) .withMappings(TinyUtils.createTinyMappingProvider(mappings.toPath(), from, to))
.renameInvalidLocals(true) .renameInvalidLocals(true)
.rebuildSourceFilenames(true) .rebuildSourceFilenames(true)
.invalidLvNamePattern(~/\$\$\d+/)
action.execute(remapperBuilder) action.execute(remapperBuilder)
def remapper = remapperBuilder def remapper = remapperBuilder
.build() .build()

2
gradle.properties
View File

@ -1,7 +1,7 @@
# Done to increase the memory available to gradle. # Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx1G
enigma_version=1.3.4 enigma_version=1.4.2
stitch_version=0.6.1 stitch_version=0.6.1
unpick_version=2.2.0 unpick_version=2.2.0
cfr_version=0.0.6 cfr_version=0.0.6