Added generics guessing. Added Override annotations

Author: Lassebq

gradle.properties

@@ -1,6 +1,6 @@
 asm_version=9.3
-fernflower_version=37b85df64bf1978cb781f44b826d0cbf3c074c85
-rdi_version=8a502c57b5e0a01bdb6f674c77c34a02ce147e38
+fernflower_version=5284b9c31e4a12a27e24b5161c4265406707e007
+rdi_version=841042981cb63f7be38a964487550d92dc01ac20
 stitch_version=fdbe41ae758bf2501fc7addb0b78938c7f7da226
 jansi_version=2.4.0
 tr_version=0.8.4

src/main/java/org/mcphackers/mcp/Options.java

@@ -88,6 +88,7 @@ public void setDefault(TaskParameter param) {
 		case FULL_BUILD:
 		case RUN_BUILD:
 		case OBFUSCATION:
+		case DECOMPILE_OVERRIDE:
 			value = false;
 			break;
 		case PATCHES:
@@ -96,7 +97,7 @@ public void setDefault(TaskParameter param) {
 		case IGNORED_PACKAGES:
 			value = new String[] {"paulscode", "com/jcraft", "de/jarnbjo", "isom"};
 			break;
-		case INDENTION_STRING:
+		case INDENTATION_STRING:
 			value = "\t";
 			break;
 		case RUN_ARGS:

src/main/java/org/mcphackers/mcp/gui/MCPFrame.java

@@ -125,7 +125,7 @@ else if(task == TaskMode.UPDATE_MD5) {
 
 		topRightContainer = new JPanel(new FlowLayout(FlowLayout.RIGHT));
 		reloadVersionList();
-		updateButtonState();
+		//updateButtonState();
 
 		JPanel topContainer = new JPanel(new BorderLayout());
 
@@ -159,10 +159,15 @@ else if(task == TaskMode.UPDATE_MD5) {
 	}
 
 	public void reloadVersionList() {
+
+		this.verLabel = new JLabel("Current version:");
+		this.verList = new JComboBox<>(new String[] {"Loading..."});
+		topRightContainer.removeAll();
+		topRightContainer.add(this.verLabel);
+		topRightContainer.add(this.verList);
+		operateOnThread(() ->  {
 		try {
-			topRightContainer.removeAll();
-			JFrame frame = this;
-			
+			setAllButtonsInactive();
 			this.verList = new JComboBox<>(VersionsParser.getVersionList().toArray(new String[0]));
 			this.verList.addPopupMenuListener(new PopupMenuListener() {
 
@@ -174,7 +179,7 @@ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
 				public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
 					operateOnThread(() ->  {
 			        if (verList.getSelectedItem() != null && !verList.getSelectedItem().equals(mcp.getCurrentVersion())) {
-			        	int response = JOptionPane.showConfirmDialog(frame, "Are you sure you want to run setup for selected version?", "Confirm Action", JOptionPane.YES_NO_OPTION);
+			        	int response = JOptionPane.showConfirmDialog(MCPFrame.this, "Are you sure you want to run setup for selected version?", "Confirm Action", JOptionPane.YES_NO_OPTION);
 			        	switch (response) {
 			        		case 0:
 		    					mcp.setParameter(TaskParameter.SETUP_VERSION, verList.getSelectedItem());
@@ -201,14 +206,18 @@ public void popupMenuCanceled(PopupMenuEvent e) {
 			}
 			this.verList.setMaximumRowCount(20);
 			this.verLabel = new JLabel("Current version:");
+			topRightContainer.removeAll();
 			topRightContainer.add(this.verLabel);
 			topRightContainer.add(this.verList);
 		} catch (Exception e) {
 			verLabel = new JLabel("Unable to get version list!");
 			verLabel.setForeground(Color.RED);
+			topRightContainer.removeAll();
 			topRightContainer.add(verLabel);
 		}
+		updateButtonState();
 		topRightContainer.updateUI();
+		});
 	}
 
 	public void updateButtonState() {

src/main/java/org/mcphackers/mcp/gui/MenuBar.java

@@ -164,7 +164,7 @@ private void initOptions() {
 				"Running"
 				};
 		TaskParameter[][] params = {
-				{TaskParameter.PATCHES, TaskParameter.INDENTION_STRING, TaskParameter.IGNORED_PACKAGES},
+				{TaskParameter.PATCHES, TaskParameter.DECOMPILE_OVERRIDE, TaskParameter.INDENTATION_STRING, TaskParameter.IGNORED_PACKAGES},
 				{TaskParameter.SOURCE_VERSION, TaskParameter.TARGET_VERSION, TaskParameter.JAVA_HOME},
 				{TaskParameter.OBFUSCATION},
 				{TaskParameter.FULL_BUILD},

src/main/java/org/mcphackers/mcp/tasks/TaskDecompile.java

@@ -141,7 +141,10 @@ protected Stage[] setStages() {
 				//TODO Apply both javadocs if side == Side.MERGED
 				//FIXME Javadocs
 				final Path deobfMappings = MCPPaths.get(mcp, MCPPaths.MAPPINGS_DO, side == Side.MERGED ? Side.CLIENT : side);
-				new Decompiler(this, excOut, srcZip, deobfMappings, mcp.getOptions().getStringParameter(TaskParameter.INDENTION_STRING)).decompile();
+				new Decompiler(this, excOut, srcZip, deobfMappings,
+						mcp.getOptions().getStringParameter(TaskParameter.INDENTATION_STRING),
+						mcp.getOptions().getBooleanParameter(TaskParameter.DECOMPILE_OVERRIDE))
+				.decompile();
 			}),
 			stage("Extracting sources", 84,
 			() -> {

src/main/java/org/mcphackers/mcp/tasks/mode/TaskMode.java

@@ -42,7 +42,7 @@ public class TaskMode {
 				TaskParameter.TARGET_VERSION,
 				TaskParameter.JAVA_HOME,
 				TaskParameter.IGNORED_PACKAGES,
-				TaskParameter.INDENTION_STRING,
+				TaskParameter.INDENTATION_STRING,
 				TaskParameter.PATCHES,
 				TaskParameter.SIDE
 				})

src/main/java/org/mcphackers/mcp/tasks/mode/TaskParameter.java

@@ -7,15 +7,16 @@ public enum TaskParameter {
 	SRC_CLEANUP("src", "Source cleanup", Boolean.class),
 	PATCHES("patch", "Apply patches", Boolean.class),
 	IGNORED_PACKAGES("ignore", "Set ignored packages", String[].class),
-	INDENTION_STRING("ind", "Set indention string", String.class),
+	INDENTATION_STRING("ind", "Set indentation string", String.class),
 	OBFUSCATION("obf", "Obfuscation", Boolean.class),
 	FULL_BUILD("fullbuild", "Full build", Boolean.class),
 	RUN_BUILD("runbuild", "Run build", Boolean.class),
 	RUN_ARGS("runargs", "Run arguments", String[].class),
 	SETUP_VERSION("setup", "Setup version", String.class),
 	SOURCE_VERSION("source", "Set a specific source version", Integer.class),
 	TARGET_VERSION("target", "Set a specific target version", Integer.class),
-	JAVA_HOME("javahome", "Set JAVA_HOME used for compiling", String.class);
+	JAVA_HOME("javahome", "Set JAVA_HOME used for compiling", String.class),
+	DECOMPILE_OVERRIDE("override", "Decompile @Override", Boolean.class);
 
 	public final String desc;
 	public final String name;

src/main/java/org/mcphackers/mcp/tools/Util.java

@@ -1,26 +1,32 @@
 package org.mcphackers.mcp.tools;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.awt.Desktop;
 import java.awt.Toolkit;
 import java.awt.datatransfer.StringSelection;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.nio.file.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Scanner;
 import java.util.concurrent.TimeUnit;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public abstract class Util {
 
 	public static int runCommand(String[] cmd, Path dir, boolean killOnShutdown) throws IOException {
@@ -33,11 +39,11 @@ public static int runCommand(String[] cmd, Path dir, boolean killOnShutdown) thr
 		if(killOnShutdown) {
 			Runtime.getRuntime().addShutdownHook(hook);
 		}
-		Scanner err = new Scanner(proc.getErrorStream());
-		Scanner in = new Scanner(proc.getInputStream());
+		BufferedReader err = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
+		BufferedReader in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
 		while(proc.isAlive()) {
-			if(in.hasNextLine())  System.out.println(in.nextLine());
-			if(err.hasNextLine()) System.err.println(err.nextLine());
+			while(in.ready()) System.out.println(in.readLine());
+			while(err.ready()) System.err.println(err.readLine());
 		}
 		in.close();
 		err.close();

src/main/java/org/mcphackers/mcp/tools/fernflower/Decompiler.java

@@ -34,10 +34,11 @@ public class Decompiler implements IBytecodeProvider, IResultSaver {
 	private Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<String, ZipOutputStream>();
 	private Map<String, Set<String>> mapArchiveEntries = new HashMap<String, Set<String>>();
 
-	public Decompiler(ProgressListener listener, Path source, Path out, Path javadocs, String ind) {
+	public Decompiler(ProgressListener listener, Path source, Path out, Path javadocs, String ind, boolean override) {
 		this.source = source;
 		this.destination = out;
 		this.log = new DecompileLogger(listener);
+		mapOptions.put(IFernflowerPreferences.OVERRIDE_ANNOTATION, override ? "1" : "0");
 		mapOptions.put(IFernflowerPreferences.NO_COMMENT_OUTPUT, "1");
 		mapOptions.put(IFernflowerPreferences.REMOVE_BRIDGE, "0");
 		mapOptions.put(IFernflowerPreferences.ASCII_STRING_CHARACTERS, "1");