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

Replace Weave commands with Enigma commands (#763)

This commit is contained in:
Runemoro 2019-06-28 16:12:16 -04:00 committed by Adrian Siekierka
parent 5fc42005e9
commit bccef14e3c
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath "net.fabricmc:weave:0.4.0.19" classpath "cuchaz:enigma:0.14.0.122"
classpath "net.fabricmc:stitch:0.2.0.52" classpath "net.fabricmc:stitch:0.2.0.52"
classpath "commons-io:commons-io:2.6" classpath "commons-io:commons-io:2.6"
classpath "com.google.guava:guava:28.0-jre" classpath "com.google.guava:guava:28.0-jre"
@ -49,7 +49,7 @@ configurations {
dependencies { dependencies {
enigmaRuntime "net.fabricmc:stitch:0.2.0.52" enigmaRuntime "net.fabricmc:stitch:0.2.0.52"
enigmaRuntime "cuchaz:enigma:0.14.0.120:all" enigmaRuntime "cuchaz:enigma:0.14.0.122:all"
} }
def setupGroup = "jar setup" def setupGroup = "jar setup"
@ -69,6 +69,8 @@ def serverJar = new File(cacheFilesMinecraft, "${minecraft_version}-server.jar")
def libraries = new File(cacheFilesMinecraft, "${minecraft_version}-libraries") def libraries = new File(cacheFilesMinecraft, "${minecraft_version}-libraries")
def libs = new File("build/libs/") def libs = new File("build/libs/")
import cuchaz.enigma.command.CheckMappingsCommand
import cuchaz.enigma.command.ConvertMappingsCommand
import com.google.common.hash.Hashing import com.google.common.hash.Hashing
import com.google.common.io.Files import com.google.common.io.Files
import com.google.common.net.UrlEscapers import com.google.common.net.UrlEscapers
@ -81,8 +83,6 @@ import net.fabricmc.stitch.merge.JarMerger
import net.fabricmc.tinyremapper.OutputConsumerPath import net.fabricmc.tinyremapper.OutputConsumerPath
import net.fabricmc.tinyremapper.TinyRemapper import net.fabricmc.tinyremapper.TinyRemapper
import net.fabricmc.tinyremapper.TinyUtils import net.fabricmc.tinyremapper.TinyUtils
import net.fabricmc.weave.CommandFindMappingErrors
import net.fabricmc.weave.CommandTinyify
import org.apache.commons.io.FileUtils import org.apache.commons.io.FileUtils
import java.util.zip.GZIPOutputStream import java.util.zip.GZIPOutputStream
@ -239,7 +239,7 @@ task checkMappings {
mappingsDir.getAbsolutePath() mappingsDir.getAbsolutePath()
] ]
new CommandFindMappingErrors().run(args) new CheckMappingsCommand().run(args)
} }
} }
@ -289,14 +289,13 @@ task buildYarnTiny(dependsOn: "mergeJars",type: FileOutput) {
logger.lifecycle(":generating tiny mappings") logger.lifecycle(":generating tiny mappings")
String[] args = [ String[] args = [
mergedFile.getAbsolutePath(), "enigma",
mappingsDir.getAbsolutePath(), mappingsDir.getAbsolutePath(),
yarnTiny.getAbsolutePath(), "tiny:official:named",
"official", yarnTiny.getAbsolutePath()
"named"
] ]
new CommandTinyify().run(args) new ConvertMappingsCommand().run(args)
} }
} }