Move all reobfuscation to FART

Signed-off-by: SizableShrimp <[email protected]>

Author: SizableShrimp

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'maven-publish'
     id 'org.cadixdev.licenser' version '0.6.1'
     id 'net.minecraftforge.gradleutils' version '[2.0.10,)'
-    id 'com.github.ben-manes.versions' version '0.39.0'
+    id 'com.github.ben-manes.versions' version '0.46.0'
 }
 
 version = gradleutils.getTagOffsetBranchVersion('FG_6.0')
@@ -63,7 +63,7 @@ license {
 }
 
 tasks.named('wrapper', Wrapper).configure {
-    gradleVersion = '8.1'
+    gradleVersion = '8.1.1'
     distributionType = Wrapper.DistributionType.ALL
 }
 

src/common/java/net/minecraftforge/gradle/common/util/Utils.java

@@ -89,10 +89,10 @@ public class Utils {
     public static final String MOJANG_MAVEN = "https://libraries.minecraft.net/";
     public static final String BINPATCHER =  "net.minecraftforge:binarypatcher:1.+:fatjar";
     public static final String ACCESSTRANSFORMER = "net.minecraftforge:accesstransformers:8.0.+:fatjar";
-    public static final String SPECIALSOURCE = "net.md-5:SpecialSource:1.11.0:shaded";
+    public static final String SPECIALSOURCE = "net.md-5:SpecialSource:1.11.2:shaded";
     public static final String FART = "net.minecraftforge:ForgeAutoRenamingTool:0.1.+:all";
     public static final String SRG2SOURCE =  "net.minecraftforge:Srg2Source:8.+:fatjar";
-    public static final String SIDESTRIPPER = "net.minecraftforge:mergetool:1.1.6:fatjar";
+    public static final String SIDESTRIPPER = "net.minecraftforge:mergetool:1.1.7:fatjar";
     public static final String INSTALLERTOOLS = "net.minecraftforge:installertools:1.3.2:fatjar";
     public static final String JARCOMPATIBILITYCHECKER = "net.minecraftforge:JarCompatibilityChecker:0.1.+:all";
     public static final long ZIPTIME = 628041600000L;

src/patcher/java/net/minecraftforge/gradle/patcher/tasks/ReobfuscateJar.java

@@ -39,8 +39,8 @@ public abstract class ReobfuscateJar extends JarExec {
     private final Provider<RegularFile> outputTemp = workDir.map(d -> d.file("output_temp.jar"));
 
     public ReobfuscateJar() {
-        getTool().set(Utils.SPECIALSOURCE);
-        getArgs().addAll("--in-jar", "{input}", "--out-jar", "{output}", "--srg-in", "{srg}", "--live");
+        getTool().set(Utils.FART);
+        getArgs().addAll("--input", "{input}", "--output", "{output}", "--names", "{srg}", "--ann-fix", "--ids-fix", "--src-fix", "--record-fix");
         getOutput().convention(workDir.map(d -> d.file("output.jar")));
     }
 

src/userdev/java/net/minecraftforge/gradle/userdev/tasks/RenameJar.java

@@ -21,8 +21,8 @@
 
 public abstract class RenameJar extends JarExec {
     public RenameJar() {
-        getTool().set(Utils.SPECIALSOURCE);
-        getArgs().addAll("--in-jar", "{input}", "--out-jar", "{output}", "--srg-in", "{mappings}");
+        getTool().set(Utils.FART);
+        getArgs().addAll("--input", "{input}", "--output", "{output}", "--names", "{mappings}", "--ann-fix", "--ids-fix", "--src-fix", "--record-fix");
     }
 
     protected List<String> filterArgs(List<String> args) {

src/userdev/java/net/minecraftforge/gradle/userdev/tasks/RenameJarInPlace.java

@@ -30,8 +30,8 @@ public abstract class RenameJarInPlace extends JarExec {
     private final Provider<RegularFile> temp = workDir.map(s -> s.file("output.jar"));
 
     public RenameJarInPlace() {
-        getTool().set(Utils.SPECIALSOURCE);
-        getArgs().addAll("--in-jar", "{input}", "--out-jar", "{output}", "--srg-in", "{mappings}", "--live");
+        getTool().set(Utils.FART);
+        getArgs().addAll("--input", "{input}", "--output", "{output}", "--names", "{mappings}", "--ann-fix", "--ids-fix", "--src-fix", "--record-fix");
         this.getOutputs().upToDateWhen(task -> false);
     }