From 4e7b5bee6d9c6d854473129b472307de2a64c642 Mon Sep 17 00:00:00 2001 From: natanfudge Date: Sun, 10 Nov 2019 20:51:37 +0200 Subject: [PATCH 1/4] toggle off replacing existing names --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3a3d8e8b3b..e71665888d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ buildscript { repositories { + mavenLocal() jcenter() maven { name "Fabric Repository" @@ -375,7 +376,6 @@ task buildYarnTiny(dependsOn: mergeJars, type: WithV2FileOutput) { new ConvertMappingsCommand().run(v1Args) new ConvertMappingsCommand().run(v2Args) - def x = 2 } } @@ -561,7 +561,8 @@ task insertAutoGeneratedEnumMappings(dependsOn : [buildYarnTiny,mapIntermediaryJ String[] argsProposeV2 = [ intermediaryJar.getAbsolutePath(), // must use intermediary jar noEnumV2.getAbsolutePath(), - output.getAbsolutePath() + output.getAbsolutePath(), + "false" // don't replace existing names right now ] new CommandProposeV2FieldNames().run(argsProposeV2) From 768cd8a26f3344dd1eebd4df37b82ae06684b621 Mon Sep 17 00:00:00 2001 From: natanfudge Date: Sun, 10 Nov 2019 20:53:01 +0200 Subject: [PATCH 2/4] wrong version prob --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e71665888d..c72b0ef7bd 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath "cuchaz:enigma:0.14.2.143" - classpath "net.fabricmc:stitch:0.3.0.66" + classpath "net.fabricmc:stitch:0.3.0.67" classpath "commons-io:commons-io:2.6" classpath "com.google.guava:guava:28.0-jre" classpath 'de.undercouch:gradle-download-task:3.4.3' @@ -49,7 +49,7 @@ configurations { } dependencies { - enigmaRuntime "net.fabricmc:stitch:0.3.0.66" + enigmaRuntime "net.fabricmc:stitch:0.3.0.67" enigmaRuntime "cuchaz:enigma:0.14.2.143" } From cf455233a2f6613d8dbd44b6297c4e16beb5f114 Mon Sep 17 00:00:00 2001 From: natanfudge Date: Sun, 10 Nov 2019 20:54:16 +0200 Subject: [PATCH 3/4] remove mavenlocal --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index c72b0ef7bd..932335515d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ buildscript { repositories { - mavenLocal() jcenter() maven { name "Fabric Repository" From 9255cf21048547d27b84cd8d396af17d50a92c9d Mon Sep 17 00:00:00 2001 From: natanfudge Date: Mon, 11 Nov 2019 15:13:47 +0200 Subject: [PATCH 4/4] correct stitch --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 932335515d..a0a3dcbd33 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { classpath "cuchaz:enigma:0.14.2.143" - classpath "net.fabricmc:stitch:0.3.0.67" + classpath "net.fabricmc:stitch:0.4.0.67" classpath "commons-io:commons-io:2.6" classpath "com.google.guava:guava:28.0-jre" classpath 'de.undercouch:gradle-download-task:3.4.3'