Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Weave commands with Enigma commands #763

Merged
merged 1 commit into from
Jun 28, 2019
Merged

Replace Weave commands with Enigma commands #763

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}
dependencies {
classpath "net.fabricmc:weave:0.4.0.19"
classpath "cuchaz:enigma:0.14.0.122"
Runemoro marked this conversation as resolved.
Show resolved Hide resolved
classpath "net.fabricmc:stitch:0.2.0.52"
classpath "commons-io:commons-io:2.6"
classpath "com.google.guava:guava:28.0-jre"
Expand Down Expand Up @@ -49,7 +49,7 @@ configurations {

dependencies {
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"
Expand All @@ -69,6 +69,8 @@ def serverJar = new File(cacheFilesMinecraft, "${minecraft_version}-server.jar")
def libraries = new File(cacheFilesMinecraft, "${minecraft_version}-libraries")
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.io.Files
import com.google.common.net.UrlEscapers
Expand All @@ -81,8 +83,6 @@ import net.fabricmc.stitch.merge.JarMerger
import net.fabricmc.tinyremapper.OutputConsumerPath
import net.fabricmc.tinyremapper.TinyRemapper
import net.fabricmc.tinyremapper.TinyUtils
import net.fabricmc.weave.CommandFindMappingErrors
import net.fabricmc.weave.CommandTinyify
import org.apache.commons.io.FileUtils

import java.util.zip.GZIPOutputStream
Expand Down Expand Up @@ -239,7 +239,7 @@ task checkMappings {
mappingsDir.getAbsolutePath()
]

new CommandFindMappingErrors().run(args)
new CheckMappingsCommand().run(args)
}
}

Expand Down Expand Up @@ -289,14 +289,13 @@ task buildYarnTiny(dependsOn: "mergeJars",type: FileOutput) {
logger.lifecycle(":generating tiny mappings")

String[] args = [
mergedFile.getAbsolutePath(),
"enigma",
mappingsDir.getAbsolutePath(),
yarnTiny.getAbsolutePath(),
"official",
"named"
"tiny:official:named",
yarnTiny.getAbsolutePath()
]

new CommandTinyify().run(args)
new ConvertMappingsCommand().run(args)
}
}

Expand Down