use stitch to merge JAR instead of weave

This commit is contained in:
Adrian Siekierka 2018-10-31 17:53:07 +01:00
parent d3eb0a76be
commit 5fbc2eb72a
1 changed files with 6 additions and 5 deletions

View File

@ -7,7 +7,8 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath "net.fabricmc:weave:+" classpath "net.fabricmc:weave:0.2.0.+"
classpath "net.fabricmc:stitch:0.1.0.+"
classpath "commons-io:commons-io:1.4" classpath "commons-io:commons-io:1.4"
classpath "com.google.guava:guava:19.0" classpath "com.google.guava:guava:19.0"
classpath 'de.undercouch:gradle-download-task:3.4.3' classpath 'de.undercouch:gradle-download-task:3.4.3'
@ -40,12 +41,12 @@ import org.apache.commons.io.FileUtils
import com.google.common.hash.HashCode import com.google.common.hash.HashCode
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 net.fabricmc.weave.merge.JarMerger import net.fabricmc.stitch.merge.JarMerger
import net.fabricmc.weave.CommandTinyify
import net.fabricmc.weave.CommandFindMappingErrors
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.CommandTinyify
import net.fabricmc.weave.CommandFindMappingErrors
import groovy.util.XmlSlurper import groovy.util.XmlSlurper
import groovy.io.FileType import groovy.io.FileType
import java.io.FileInputStream; import java.io.FileInputStream;
@ -336,4 +337,4 @@ task mapJar(dependsOn: [downloadMcLibs, build]) {
throw new RuntimeException("Failed to remap jar", e); throw new RuntimeException("Failed to remap jar", e);
} }
} }
} }