Merge branch 'pr/381'

Author: Col-E

pom.xml

@@ -28,7 +28,7 @@
 		<!-- 3rd party repo, Forge -->
 		<repository>
 			<id>forge</id>
-			<url>http://files.minecraftforge.net/maven</url>
+			<url>https://files.minecraftforge.net/maven</url>
 		</repository>
 		<!-- 3rd party repo, analyzer -->
 		<repository>

src/main/java/me/coley/recaf/command/impl/Remap.java

@@ -2,16 +2,23 @@
 
 import me.coley.recaf.command.ControllerCommand;
 import me.coley.recaf.command.completion.FileCompletions;
-import me.coley.recaf.mapping.*;
+import me.coley.recaf.mapping.MappingImpl;
+import me.coley.recaf.mapping.Mappings;
+import me.coley.recaf.workspace.JavaResource;
 import org.objectweb.asm.ClassReader;
 import picocli.CommandLine;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.concurrent.Callable;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
-import static me.coley.recaf.util.Log.*;
+import static me.coley.recaf.util.Log.info;
+import static me.coley.recaf.util.Log.debug;
 
 /**
  * Command for applying mappings.
@@ -48,8 +55,30 @@ public Void call() throws Exception {
 		mappings.setClearDebugInfo(noDebug);
 		mappings.setCheckFieldHierarchy(lookup);
 		mappings.setCheckMethodHierarchy(lookup);
-		Map<String, byte[]> mapped = mappings.accept(getWorkspace().getPrimary());
-		// TODO: If the primary has a "META-INF/MANIFEST.MF" update the main class if renamed
+
+		JavaResource primary = getWorkspace().getPrimary();
+		Map<String, byte[]> mapped = mappings.accept(primary);
+
+		byte[] manifestBytes = primary.getFiles().get("META-INF/MANIFEST.MF");
+		if (manifestBytes != null) {
+			debug("Found manifest file");
+			Manifest manifest = new Manifest(new ByteArrayInputStream(manifestBytes));
+			Attributes attr = manifest.getMainAttributes();
+			if (!attr.isEmpty()) {
+				String mainClass = attr.getValue("Main-Class").replaceAll("\\.", "/");
+				if (mapped.containsKey(mainClass)) {
+					debug("Found Main-Class attribute");
+					attr.putValue("Main-Class", new ClassReader(mapped.get(mainClass))
+							.getClassName().replaceAll("/", "\\."));
+					ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+					manifest.write(outputStream);
+					primary.getFiles().put("META-INF/MANIFEST.MF", outputStream.toByteArray());
+					outputStream.close();
+					debug("Remapped manifest");
+				}
+			}
+		}
+
 		// Log
 		StringBuilder sb = new StringBuilder("Classes updated: " + mapped.size());
 		mapped.forEach((old, value) -> {

src/main/java/me/coley/recaf/config/ConfDisplay.java

@@ -83,6 +83,12 @@ public class ConfDisplay extends Config {
 	@Conf("display.maxtreedepth")
 	public int maxTreeDepth = 30;
 
+	/**
+	 * Displays access flags tooltip for class/field/method icons
+	 */
+	@Conf("display.accessflags")
+	public boolean accessFlagsTooltip = true;
+
 	ConfDisplay() {
 		super("display");
 	}

src/main/java/me/coley/recaf/util/UiUtil.java

@@ -7,13 +7,15 @@
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.scene.Group;
 import javafx.scene.Node;
+import javafx.scene.control.Tooltip;
 import javafx.scene.effect.BlurType;
 import javafx.scene.effect.InnerShadow;
 import javafx.scene.image.PixelFormat;
 import javafx.scene.image.PixelWriter;
 import javafx.scene.image.WritableImage;
 import javafx.scene.paint.Color;
 import javafx.util.Duration;
+import me.coley.recaf.Recaf;
 import me.coley.recaf.ui.controls.IconView;
 import me.coley.recaf.workspace.*;
 
@@ -23,6 +25,8 @@
 import java.io.ByteArrayInputStream;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import static me.coley.recaf.util.ClasspathUtil.resource;
 
@@ -116,6 +120,7 @@ else if(AccessFlag.isInterface(access))
 			g.getChildren().add(new IconView("icons/modifier/abstract.png"));
 		if(AccessFlag.isBridge(access) || AccessFlag.isSynthetic(access))
 			g.getChildren().add(new IconView("icons/modifier/synthetic.png"));
+		createAccessToolTips(g, AccessFlag.Type.CLASS, access);
 		return g;
 	}
 
@@ -145,6 +150,7 @@ else if(AccessFlag.isPrivate(access))
 			g.getChildren().add(new IconView("icons/modifier/final.png"));
 		if(AccessFlag.isBridge(access) || AccessFlag.isSynthetic(access))
 			g.getChildren().add(new IconView("icons/modifier/synthetic.png"));
+		createAccessToolTips(g, AccessFlag.Type.FIELD, access);
 		return g;
 	}
 
@@ -178,9 +184,24 @@ else if(AccessFlag.isAbstract(access))
 			g.getChildren().add(new IconView("icons/modifier/final.png"));
 		if(AccessFlag.isBridge(access) || AccessFlag.isSynthetic(access))
 			g.getChildren().add(new IconView("icons/modifier/synthetic.png"));
+		createAccessToolTips(g, AccessFlag.Type.METHOD, access);
 		return g;
 	}
 
+	private static void createAccessToolTips(Node node, AccessFlag.Type type, int access) {
+		Set<String> accessFlags = AccessFlag.getApplicableFlags(type, access).stream()
+				.map(AccessFlag::getName).collect(Collectors.toSet());
+		Tooltip tooltip = new Tooltip(String.join(", ", accessFlags));
+		node.setOnMouseEntered(event -> {
+			if (!tooltip.getText().isEmpty() && Recaf.getController().config().display().accessFlagsTooltip) {
+				tooltip.show(node, event.getScreenX(), event.getScreenY() + 15);
+			}
+		});
+		node.setOnMouseExited(event -> tooltip.hide());
+		// This has a weird delay
+		// Tooltip.install(node, tooltip);
+	}
+
 	/**
 	 * Convert raw bytes to an image.
 	 *

src/main/resources/style/ui-dark.css

@@ -76,9 +76,8 @@
 	-fx-background-color: rgb(61, 61, 62);
 }
 .context-menu-header {
-	/* TODO: Find a way to disable hover coloring on the menu header */
-	-fx-opacity: 1.0;
-	-fx-background-color: rgb(24, 50, 95);
+	-fx-opacity: 1.0 !important;
+	-fx-background-color: rgb(24, 50, 95) !important;
 }
 .context-menu-header .label {
     -fx-opacity: 1.0;

src/main/resources/translations/en.json

@@ -481,6 +481,8 @@
 	"display.maxlength.tree.desc": "The max length of names in the file tree. Useful for obfuscated assemblies with crazy names.",
 	"display.maxtreedepth.name": "Max tree directory depth",
 	"display.maxtreedepth.desc": "The max number of directories to show in the file tree before truncation.",
+	"display.accessflags.name" : "Access Flags tooltip",
+	"display.accessflags.desc" : "Displays a tooltip when hovering over access icons",
 	"display.treesourcename.name": "Show SourceFile names",
 	"display.treesourcename.desc": "Display classes SourceFile next to their declared names in the file-tree.",
 	"display.exitwarning.name": "Give save prompt on exit",

src/test/java/me/coley/recaf/HeadlessTest.java

@@ -1,10 +1,20 @@
 package me.coley.recaf;
 
+import com.strobel.core.Mapping;
 import me.coley.recaf.control.headless.HeadlessController;
+import me.coley.recaf.mapping.MappingImpl;
+import me.coley.recaf.mapping.Mappings;
+import me.coley.recaf.workspace.JavaResource;
 import org.junit.jupiter.api.Test;
+import org.objectweb.asm.ClassReader;
 
+import java.io.ByteArrayInputStream;
 import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
+import static me.coley.recaf.util.Log.info;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -22,6 +32,31 @@ public void test() throws Exception {
 		assertEquals("calc.jar", controller.getWorkspace().getPrimary().getShortName().toString());
 	}
 
+	@Test
+	public void remapManifestTest() throws Exception {
+		HeadlessController controller = new HeadlessController(null, null);
+		controller.setup();
+		invokeRun(controller, "loadworkspace " + getClasspathFile("Manifest.jar").normalize().toAbsolutePath());
+		assertEquals("Manifest.jar", controller.getWorkspace().getPrimary().getShortName().toString());
+
+		// Check Manifest
+		JavaResource primary = controller.getWorkspace().getPrimary();
+		byte[] manifestBytes = primary.getFiles().get("META-INF/MANIFEST.MF");
+		assertNotEquals(manifestBytes, null);
+		Manifest manifest = new Manifest(new ByteArrayInputStream(manifestBytes));
+		Attributes attr = manifest.getMainAttributes();
+		assertEquals(attr.size(), 2);
+		String mainClass = attr.getValue("Main-Class").replaceAll("\\.", "/");
+		assertEquals(mainClass, "Code/Code/Code");
+
+		invokeRun(controller, "remap PROGUARD " + getClasspathFile("manifest-map.txt").normalize().toAbsolutePath());
+		manifestBytes = primary.getFiles().get("META-INF/MANIFEST.MF");
+		manifest = new Manifest(new ByteArrayInputStream(manifestBytes));
+		attr = manifest.getMainAttributes();
+		mainClass = attr.getValue("Main-Class").replaceAll("\\.", "/");
+		assertEquals(mainClass, "some/pkg/Main");
+	}
+
 	private static void invokeRun(HeadlessController controller, String cmd) throws Exception {
 		Method m = controller.getClass().getDeclaredMethod("handle", String.class);
 		m.setAccessible(true);

src/test/resources/Manifest.jar

@@ -0,0 +1,3 @@
+some.pkg.Main -> Code.Code.Code:
+    void <init>() -> <init>
+    void main(java.lang.String[]) -> Code