Preparing everything for pre2 release

Author: Lassebq

libs/mcinjector.jar

@@ -217,15 +217,15 @@ public void updateButtonState() {
 		if(verList != null) verList.setEnabled(true);
 		verLabel.setEnabled(true);
 		menuBar.menuOptions.setEnabled(true);
-		menuBar.mcpMenu.setEnabled(true);
+		menuBar.setComponentsEnabled(true);
 	}
 
 	public void setAllButtonsInactive() {
 		buttons.forEach(button -> button.setEnabled(false));
 		if(verList != null) verList.setEnabled(false);
 		verLabel.setEnabled(false);
 		menuBar.menuOptions.setEnabled(false);
-		menuBar.mcpMenu.setEnabled(false);
+		menuBar.setComponentsEnabled(false);
 	}
 
 	public void setCurrentVersion(String version) {

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

@@ -32,6 +32,7 @@
 public class MenuBar extends JMenuBar {
 	public final JMenu menuOptions = new JMenu("Options");
 	public final JMenu mcpMenu = new JMenu("MCP");
+	public final List<JMenuItem> togglableComponents = new ArrayList<>();
 	public final Map<Side, JMenuItem> start = new HashMap<>();
 	public final Map<TaskParameter, JMenuItem> optionItems = new HashMap<>();
 	private final JMenu helpMenu = new JMenu(TaskMode.HELP.getFullName());
@@ -52,6 +53,7 @@ public MenuBar(MCPFrame frame) {
 		Side[] sides = {Side.CLIENT, Side.SERVER};
 		for(Side side : sides) {
 			JMenuItem start = new JMenuItem(TaskMode.START.getFullName() + " " + side.name);
+			togglableComponents.add(start);
 			start.addActionListener(a -> {
 				operateOnThread(() -> {
 					mcp.performTask(TaskMode.START, side, false);
@@ -94,20 +96,23 @@ public MenuBar(MCPFrame frame) {
 			List<TaskMode> usedTasks = new ArrayList<>();
 			usedTasks.addAll(Arrays.asList(MainGUI.TASKS));
 			usedTasks.addAll(Arrays.asList(TaskMode.UPDATE_MCP, TaskMode.START, TaskMode.EXIT, TaskMode.HELP, TaskMode.SETUP));
-			JMenu runTask = new JMenu("More tasks...");
+			JMenu moreTasks = new JMenu("More tasks...");
+			togglableComponents.add(moreTasks);
 			for(TaskMode task : TaskMode.registeredTasks) {
 				if(usedTasks.contains(task)) {
 					continue;
 				}
 				JMenuItem taskItem = new JMenuItem(task.getFullName());
 				taskItem.addActionListener(TaskButton.performTask(mcp, task));
-				runTask.add(taskItem);
+				moreTasks.add(taskItem);
 			}
-			mcpMenu.add(runTask);
+			mcpMenu.add(moreTasks);
 		}
 		JMenuItem exit = new JMenuItem(TaskMode.EXIT.getFullName());
 		exit.addActionListener(a -> System.exit(0));
 		mcpMenu.add(exit);
+		togglableComponents.add(update);
+		togglableComponents.add(changeDir);
 		add(mcpMenu);
 		add(menuOptions);
 		this.githubItem.addActionListener(e -> Util.openUrl(MCP.githubURL));
@@ -201,4 +206,10 @@ private void reloadOptions() {
 			entry.getValue().setSelected(mcp.options.getBooleanParameter(entry.getKey()));
 		}
 	}
+
+	public void setComponentsEnabled(boolean b) {
+		for(JMenuItem item : togglableComponents) {
+			item.setEnabled(b);
+		}
+	}
 }

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

@@ -83,7 +83,7 @@ public MainCLI(String[] args) {
 			JavaCompiler c = ToolProvider.getSystemJavaCompiler();
 			if (c == null) {
 				// Likely a JRE
-				log(new Ansi().fgBrightRed().a("Error: Java Development Kit not detected! Compilation will fail!").toString());
+				log(new Ansi().fgBrightRed().a("Error: Java Development Kit is required to recompile!").toString());
 				log("Using Java from " + Paths.get(Util.getJava()).toAbsolutePath());
 			}
 			if(version != null) log(version);

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

@@ -39,8 +39,7 @@ public MainGUI() {
 		options = new Options(MCPPaths.get(this, "options.cfg"));
 		JavaCompiler c = ToolProvider.getSystemJavaCompiler();
 		if (c == null) {
-			JOptionPane.showMessageDialog(null, "Java Development Kit not found!", "Error", JOptionPane.ERROR_MESSAGE);
-			System.exit(1);
+			JOptionPane.showMessageDialog(null, "Java Development Kit is required to recompile!", "Error", JOptionPane.ERROR_MESSAGE);
 		}
 		frame = new MCPFrame(this);
 	}

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

@@ -53,8 +53,8 @@ protected Stage[] setStages() {
 		final Path remapped 	= MCPPaths.get(mcp, MCPPaths.DEOBF_OUT, side);
 		final Path excOut 		= MCPPaths.get(mcp, MCPPaths.EXC_OUT, side);
 		final Path tempExcOut 	= MCPPaths.get(mcp, MCPPaths.TEMP_EXC_OUT, side);
-		final Path srcZip 		= MCPPaths.get(mcp, MCPPaths.SIDE_SRC, side);
 		final Path ffOut 		= MCPPaths.get(mcp, MCPPaths.TEMP_SOURCES, side);
+		final Path srcZip 		= MCPPaths.get(mcp, MCPPaths.SIDE_SRC, side);
 		final Path srcPath 		= MCPPaths.get(mcp, MCPPaths.SOURCES, side);
 		final Path patchesPath 	= MCPPaths.get(mcp, MCPPaths.PATCHES, side);
 
@@ -109,7 +109,7 @@ protected Stage[] setStages() {
 					}
 				}
 			}),
-			stage("Applying MCInjector", 2,
+			stage("Applying RDInjector", 2,
 			() -> {
 				Side[] sides = (side == Side.MERGED) ? new Side[] {Side.CLIENT, Side.SERVER} : new Side[] {side};
 				Files.deleteIfExists(tempExcOut);
@@ -139,6 +139,7 @@ protected Stage[] setStages() {
 			stage("Decompiling",
 			() -> {
 				//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();
 			}),

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

@@ -254,11 +254,8 @@ public boolean isAvailable(MCP mcp, Side side) {
 			return requirement.get(mcp, Side.CLIENT) || requirement.get(mcp, Side.SERVER);
 		}
 		else {
-			if(!requirement.get(mcp, side)) {
-				return false;
-			}
+			return requirement.get(mcp, side);
 		}
-		return true;
 	}
 
 	@FunctionalInterface

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

@@ -30,6 +30,7 @@ public class Decompiler implements IBytecodeProvider, IResultSaver {
 	private final Path source;
 	private final Path destination;
 	private final Map<String, Object> mapOptions = new HashMap<>();
+
 	private Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<String, ZipOutputStream>();
 	private Map<String, Set<String>> mapArchiveEntries = new HashMap<String, Set<String>>();