Add unobfuscation support (#38)

Fabric decided to add a brand new gradle plugin which remobes the
"remapJar" task and just calls it "jar". We can't have that, so I
switched it out with "build" which should always be the same...

Furthermore, access wideners got changed, so you need to write
"official" instead of "named". And of course, preprocessing doesn't work
for this use case, because the statement *has to be* in the first line
of the access widener...

I was first gonna add an "EmergencyTransformer" to allow for these kinds
of shenanigans... But since I want to redo some logic for Disco 2 that
adds multi modloader preprocessing, I thought I will do the quick and
temporary setup by only preprocessing the .accesswidener files... I
already do some exceptions for that with the comments...

Author: ScribbleTAS

gradle.properties

@@ -1,3 +1,3 @@
-version=1.4
-release=false
-org.gradle.configuration-cache=true
+version=1.5
+release=false
+org.gradle.configuration-cache=true

src/main/java/com/minecrafttas/discombobulator/Discombobulator.java

@@ -80,6 +80,11 @@ public class Discombobulator implements Plugin<Project> {
 	 */
 	private static String discoVersion;
 
+	/**
+	 * Versions where the accessor is changed to official mappings
+	 */
+	public static List<String> accessWidenerOfficialList = new ArrayList<>();
+
 	/**
 	 * Apply the gradle plugin to the project
 	 */
@@ -111,7 +116,7 @@ public void apply(Project project) {
 		List<Task> compileTaskList = new ArrayList<>();
 		Map<String, Path> buildDirs = new HashMap<>();
 		for (Project subProject : project.getSubprojects()) {
-			Task compileTask = subProject.getTasksByName("remapJar", false).iterator().next();
+			Task compileTask = subProject.getTasksByName("build", false).iterator().next();
 			compileTaskList.add(compileTask);
 
 			buildDirs.put(subProject.getName(), getBuildDir(subProject).resolve("libs"));
@@ -153,12 +158,16 @@ public void apply(Project project) {
 				return;
 			}
 			List<String> versionStrings = new ArrayList<>(versionPairs.keySet());
-			LinePreprocessor processor = new LinePreprocessor(versionStrings, config.getPatterns().get(), inverted);
+			LinePreprocessor lineProcessor = new LinePreprocessor(versionStrings, config.getPatterns().get(), inverted);
 
 			List<String> ignored = config.getIgnoredFileFormats().getOrElse(new ArrayList<>());
 			WildcardFileFilter fileFilter = WildcardFileFilter.builder().setWildcards(ignored).get();
 
-			fileProcessor = new FilePreprocessor(processor, fileFilter);
+//			Map<String, Map<String, Pair<String, String>>> emergencyTransformConfig = config.getEmergencyTransform().getOrNull();
+//			EmergencyTransformer emergencyTransformer = new EmergencyTransformer(emergencyTransformConfig, versionStrings);
+			accessWidenerOfficialList = config.getAccessWidenerOfficial().get();
+
+			fileProcessor = new FilePreprocessor(lineProcessor, fileFilter);
 
 			// Yes this is yoinked from the gradle forums to get the disco version. Is there
 			// a better method? Probably. Do I care? Currently, no.
@@ -172,7 +181,7 @@ public void apply(Project project) {
 
 	public static String getSplash() {
 		return "\n" + (DISABLE_ANSI ? getColorLessSplash() : getColoredSplash()) + "\n\n"
-				+ getCenterText(String.format("Enable configuration cache today!")) + "\n"
+				+ getCenterText(String.format("Now with unobfuscated support!")) + "\n"
 				+ getCenterText("Created by Pancake and Scribble") + "\n"
 				+ getCenterText(discoVersion) + "\n\n";
 

src/main/java/com/minecrafttas/discombobulator/config/PreprocessingConfiguration.java

@@ -125,4 +125,16 @@ public abstract class PreprocessingConfiguration {
 	 * @return The line feed string
 	 */
 	public abstract Property<String> getDefaultLineFeed();
+
+//	/**
+//	 * <p>If a file needs transforming but does not support comments
+//	 * @return A map with the version number as key and a map as value which contains the filename and a pair of strings with search and replace respectively
+//	 */
+//	public abstract MapProperty<String, Map<String, Pair<String, String>>> getEmergencyTransform();
+
+	/**
+	 * @return Versions where the accesswidener is changed to official mappings
+	 */
+	public abstract ListProperty<String> getAccessWidenerOfficial();
+
 }

src/main/java/com/minecrafttas/discombobulator/processor/FilePreprocessor.java

@@ -20,6 +20,7 @@
 import com.minecrafttas.discombobulator.Discombobulator;
 import com.minecrafttas.discombobulator.tasks.TaskPreprocessWatch.CurrentFilePreprocessAction;
 import com.minecrafttas.discombobulator.utils.BetterFileWalker;
+import com.minecrafttas.discombobulator.utils.EmergencyTransformer;
 import com.minecrafttas.discombobulator.utils.LineFeedHelper;
 import com.minecrafttas.discombobulator.utils.SafeFileOperations;
 
@@ -45,6 +46,7 @@ public class FilePreprocessor {
 	 * Creates a new {@link FilePreprocessor}
 	 * @param processor The {@link #lineProcessor}
 	 * @param fileFilter The {@link #fileFilter}
+	 * @param emergencyTransformer The {@link EmergencyTransformer}
 	 */
 	public FilePreprocessor(LinePreprocessor processor, WildcardFileFilter fileFilter) {
 		this.lineProcessor = processor;
@@ -179,6 +181,7 @@ public CurrentFilePreprocessAction preprocessVersions(Path inFile, Map<String, P
 	 */
 	public List<String> preprocessLines(List<String> inLines, Path outFile, String version, String extension) throws Exception {
 		List<String> lines = lineProcessor.preprocess(version, inLines, extension);
+
 		writeLines(lines, outFile);
 		return lines;
 	}

src/main/java/com/minecrafttas/discombobulator/processor/LinePreprocessor.java

@@ -8,6 +8,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.minecrafttas.discombobulator.Discombobulator;
 import com.minecrafttas.discombobulator.utils.Pair;
 
 /*
@@ -227,6 +228,9 @@ public List<String> preprocess(String targetVersion, List<String> lines, String
 			out.add(line);
 		}
 
+		//TODO Very dumb, very temporary method to fix accesswideners
+		out = makeAccessWidenerOfficial(fileending, targetVersion, out);
+
 		return out;
 	}
 
@@ -1000,4 +1004,29 @@ private String searchPatternsInverted(int targetIndex, Map<String, String> patte
 		}
 		return replacement;
 	}
+
+	/**
+	 * Very temporary method to support unobfuscated mcversions, by changing the "named" in the first line of the accesswidener to "official"
+	 * if a version is declared in the build.gradle
+	 * 
+	 * @param extension
+	 * @param targetVersion
+	 * @param lines
+	 * @return
+	 */
+	private List<String> makeAccessWidenerOfficial(String extension, String targetVersion, List<String> lines) {
+		if (!"accesswidener".equals(extension)) {
+			return lines;
+		}
+
+		if (Discombobulator.accessWidenerOfficialList.contains(targetVersion)) {
+			String line = lines.get(0).replace("named", "official");
+			lines.set(0, line);
+		} else {
+			String line = lines.get(0).replace("official", "named");
+			lines.set(0, line);
+		}
+
+		return lines;
+	}
 }

src/main/java/com/minecrafttas/discombobulator/tasks/TaskCollectBuilds.java

@@ -9,6 +9,7 @@
 
 import org.gradle.api.DefaultTask;
 import org.gradle.api.provider.MapProperty;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
 
@@ -19,6 +20,7 @@
  * 
  * @author Pancake
  */
+@CacheableTask
 public abstract class TaskCollectBuilds extends DefaultTask {
 
 	/**

src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessBase.java

@@ -8,6 +8,7 @@
 
 import org.apache.commons.io.FilenameUtils;
 import org.gradle.api.DefaultTask;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.TaskAction;
 
 import com.minecrafttas.discombobulator.Discombobulator;
@@ -30,6 +31,7 @@
  * 
  * @author Pancake, Scribble
  */
+@CacheableTask
 public class TaskPreprocessBase extends DefaultTask {
 
 	@TaskAction

src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessVersion.java

@@ -12,7 +12,10 @@
 import org.apache.commons.io.FilenameUtils;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.PathSensitive;
+import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.TaskAction;
 
 import com.minecrafttas.discombobulator.Discombobulator;
@@ -35,8 +38,10 @@
  * 
  * @author Scribble
  */
+@CacheableTask
 public abstract class TaskPreprocessVersion extends DefaultTask {
 
+	@PathSensitive(PathSensitivity.RELATIVE)
 	@InputDirectory
 	abstract DirectoryProperty getVersionDirectory();
 

src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessVersionError.java

@@ -1,6 +1,7 @@
 package com.minecrafttas.discombobulator.tasks;
 
 import org.gradle.api.DefaultTask;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.TaskAction;
 
 /**
@@ -11,6 +12,7 @@
  * <p>But you can register separate tasks to the root project, that will execute before everything else, so to stop it,<br>
  * we just need to throw an exception and it will stop all following tasks. Thanks Gradle! 
  */
+@CacheableTask
 public class TaskPreprocessVersionError extends DefaultTask {
 
 	/**

src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessWatch.java

@@ -25,6 +25,7 @@
 import org.apache.commons.io.FilenameUtils;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
 
@@ -42,6 +43,7 @@
  * 
  * @author Pancake, Scribble
  */
+@CacheableTask
 public abstract class TaskPreprocessWatch extends DefaultTask {
 
 	private List<FileWatcherThread> threads = new ArrayList<>();
@@ -152,7 +154,7 @@ protected void onModifyFile(Path path) {
 				// Get path relative to the root dir
 				String extension = FilenameUtils.getExtension(path.getFileName().toString());
 				try {
-					System.out.println(String.format("[%s%s%s]", PURPLE_BRIGHT, TaskPreprocessWatch.findVersionFromPath(path, versions), WHITE));
+					System.out.println(String.format("\n[%s%s%s]", PURPLE_BRIGHT, TaskPreprocessWatch.findVersionFromPath(path, versions), WHITE));
 					// Preprocess in all sub versions
 					currentFileAction = Discombobulator.fileProcessor.preprocessVersions(path, versions, extension, subSourceDir, true);