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

Don't replace existing field names with generated ones for V2 (#952) 

* toggle off replacing existing names

* wrong version prob

* remove mavenlocal

* correct stitch
This commit is contained in:
Fudge 2019-11-11 15:22:24 +02:00 committed by modmuss50
parent 14997e8ae6
commit 50e7c08b73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
} }
dependencies { dependencies {
classpath "cuchaz:enigma:0.14.2.143" classpath "cuchaz:enigma:0.14.2.143"
classpath "net.fabricmc:stitch:0.3.0.66" classpath "net.fabricmc:stitch:0.4.0.67"
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"
classpath 'de.undercouch:gradle-download-task:3.4.3' classpath 'de.undercouch:gradle-download-task:3.4.3'
@ -48,7 +48,7 @@ configurations {
} }
dependencies { dependencies {
enigmaRuntime "net.fabricmc:stitch:0.3.0.66" enigmaRuntime "net.fabricmc:stitch:0.3.0.67"
enigmaRuntime "cuchaz:enigma:0.14.2.143" enigmaRuntime "cuchaz:enigma:0.14.2.143"
} }
@ -375,7 +375,6 @@ task buildYarnTiny(dependsOn: mergeJars, type: WithV2FileOutput) {
new ConvertMappingsCommand().run(v1Args) new ConvertMappingsCommand().run(v1Args)
new ConvertMappingsCommand().run(v2Args) new ConvertMappingsCommand().run(v2Args)
def x = 2
} }
} }
@ -561,7 +560,8 @@ task insertAutoGeneratedEnumMappings(dependsOn : [buildYarnTiny,mapIntermediaryJ
String[] argsProposeV2 = [ String[] argsProposeV2 = [
intermediaryJar.getAbsolutePath(), // must use intermediary jar intermediaryJar.getAbsolutePath(), // must use intermediary jar
noEnumV2.getAbsolutePath(), noEnumV2.getAbsolutePath(),
output.getAbsolutePath() output.getAbsolutePath(),
"false" // don't replace existing names right now
] ]
new CommandProposeV2FieldNames().run(argsProposeV2) new CommandProposeV2FieldNames().run(argsProposeV2)