4x: Added new JASM 2.0

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.github.ben-manes.versions' version '0.42.0' apply false
     id 'gov.tak.gradle.plugins.coverage-report-aggregator' version '1.3.0'
-    id 'gov.tak.gradle.plugins.checker-processor' version '2.0.1' apply false
+    id 'gov.tak.gradle.plugins.checker-processor' version '2.0.2' apply false
 }
 
 allprojects {

dependencies.gradle

@@ -1,6 +1,7 @@
 def asmVersion = '9.6'
-def cafeDudeVersion = '1.10.2'
+def cafeDudeVersion = '2.0.1'
 def junitVersion = '5.10.0'
+def jasmVersion = '2.3.0'
 
 project.ext {
     asm = "org.ow2.asm:asm:$asmVersion"
@@ -14,7 +15,7 @@ project.ext {
 
     atlantafx = 'io.github.mkpaz:atlantafx-base:2.0.1'
 
-    cafedude = "com.github.Col-E:CAFED00D:$cafeDudeVersion"
+    cafedude = "software.coley:cafedude-core:$cafeDudeVersion"
 
     cfr = 'org.benf:cfr:0.152'
 
@@ -38,6 +39,9 @@ project.ext {
 
     instrument_server = 'software.coley:instrumentation-server:1.4.0'
 
+    jasm_core = "com.github.Nowilltolife.Jasm:jasm-core:$jasmVersion"
+    jasm_composistion_jvm = "com.github.Nowilltolife.Jasm:jasm-composition-jvm:$jasmVersion"
+
     jackson = 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
 
     jlinker = 'com.github.xxDark:jlinker:1.0.7'
@@ -62,7 +66,7 @@ project.ext {
 
     regex = 'com.github.tommyettinger:regexodus:0.1.15'
 
-    richtextfx = 'org.fxmisc.richtext:richtextfx:0.11.1'
+    richtextfx = 'org.fxmisc.richtext:richtextfx:0.11.2'
 
     treemapfx = 'software.coley:treemap-fx:1.1.0'
 }

recaf-core/build.gradle

@@ -40,6 +40,8 @@ dependencies {
     api jlinker
     api openrewrite
     api regex
+    api jasm_core
+    api jasm_composistion_jvm
 }
 
 // Force generation of gversion data class when the version information is not up-to-date

recaf-core/src/main/java/software/coley/recaf/Bootstrap.java

@@ -1,5 +1,7 @@
 package software.coley.recaf;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import jakarta.enterprise.inject.se.SeContainer;
 import org.jboss.weld.environment.se.Weld;
 import org.slf4j.Logger;
@@ -23,6 +25,7 @@ public class Bootstrap {
 	/**
 	 * @return Recaf instance.
 	 */
+	@Nonnull
 	public static Recaf get() {
 		if (instance == null) {
 			logger.info("Initializing Recaf {}", RecafBuildConfig.VERSION);
@@ -42,10 +45,11 @@ public static Recaf get() {
 	 * @param consumer
 	 * 		Consumer to operate on the CDI container producing {@link Weld} instance.
 	 */
-	public static void setWeldConsumer(Consumer<Weld> consumer) {
+	public static void setWeldConsumer(@Nullable Consumer<Weld> consumer) {
 		weldConsumer = consumer;
 	}
 
+	@Nonnull
 	private static SeContainer createContainer() {
 		logger.info("Creating Recaf CDI container...");
 		Weld weld = new Weld("recaf");

recaf-core/src/main/java/software/coley/recaf/Recaf.java

@@ -1,18 +1,13 @@
 package software.coley.recaf;
 
 import jakarta.annotation.Nonnull;
-import jakarta.enterprise.context.spi.Context;
-import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.Instance;
 import jakarta.enterprise.inject.se.SeContainer;
-import jakarta.enterprise.inject.spi.Bean;
-import jakarta.enterprise.inject.spi.BeanContainer;
 import software.coley.recaf.cdi.WorkspaceBeanContext;
 import software.coley.recaf.workspace.WorkspaceManager;
 
 import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Set;
+import java.util.Locale;
 
 /**
  * Recaf application instance.
@@ -105,4 +100,10 @@ public <T> T get(@Nonnull Class<T> type) {
 	public <T> T get(@Nonnull Class<T> type, Annotation... qualifiers) {
 		return instance(type, qualifiers).get();
 	}
+
+	static {
+		// Enforce US locale just in case we have some string formatting susceptible to this "feature":
+		//  https://mattryall.net/blog/the-infamous-turkish-locale-bug
+		Locale.setDefault(Locale.US);
+	}
 }

recaf-core/src/main/java/software/coley/recaf/cdi/EagerInitializationExtension.java

@@ -1,8 +1,13 @@
 package software.coley.recaf.cdi;
 
+import jakarta.annotation.Nonnull;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
-import jakarta.enterprise.inject.spi.*;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessBean;
 import jakarta.inject.Inject;
 import software.coley.recaf.workspace.model.Workspace;
 
@@ -18,7 +23,7 @@
  */
 public class EagerInitializationExtension implements Extension {
 	private static final EagerInitializationExtension INSTANCE = new EagerInitializationExtension();
-	private static final List<Bean<?>> applicationScopedEagerBeansForDeploy = new ArrayList<>();
+	private static final List<Bean<?>> applicationScopedEagerBeans = new ArrayList<>();
 	private static final List<Bean<?>> applicationScopedEagerBeansForUi = new ArrayList<>();
 	private static final List<Bean<?>> workspaceScopedEagerBeans = new ArrayList<>();
 	private static BeanManager beanManager;
@@ -29,20 +34,31 @@ private EagerInitializationExtension() {
 	/**
 	 * @return Extension singleton.
 	 */
+	@Nonnull
 	public static EagerInitializationExtension getInstance() {
 		return INSTANCE;
 	}
 
 	/**
 	 * @return Application scoped {@link EagerInitialization} beans.
 	 */
-	public static List<Bean<?>> getApplicationScopedEagerBeansForDeploy() {
-		return applicationScopedEagerBeansForDeploy;
+	@Nonnull
+	public static List<Bean<?>> getApplicationScopedEagerBeans() {
+		return applicationScopedEagerBeans;
+	}
+
+	/**
+	 * @return Application scoped {@link EagerInitialization} beans which will wait for the UI to be initialized before being initialized.
+	 */
+	@Nonnull
+	public static List<Bean<?>> getApplicationScopedEagerBeansForUi() {
+		return applicationScopedEagerBeansForUi;
 	}
 
 	/**
 	 * @return Workspace scoped {@link EagerInitialization} beans.
 	 */
+	@Nonnull
 	public static List<Bean<?>> getWorkspaceScopedEagerBeans() {
 		return workspaceScopedEagerBeans;
 	}
@@ -60,7 +76,7 @@ public void onProcessBean(@Observes ProcessBean<?> event) {
 		if (eager != null) {
 			if (annotated.isAnnotationPresent(ApplicationScoped.class)) {
 				if (eager.value() == InitializationStage.IMMEDIATE)
-					applicationScopedEagerBeansForDeploy.add(event.getBean());
+					applicationScopedEagerBeans.add(event.getBean());
 				else if (eager.value() == InitializationStage.AFTER_UI_INIT)
 					applicationScopedEagerBeansForUi.add(event.getBean());
 			} else if (annotated.isAnnotationPresent(WorkspaceScoped.class))
@@ -69,16 +85,16 @@ else if (eager.value() == InitializationStage.AFTER_UI_INIT)
 	}
 
 	/**
-	 * Called when the CDI container deploys.
+	 * Called when Recaf initializes the CDI container, and after plugins are loaded.
 	 *
 	 * @param event
-	 * 		CDI deploy event.
+	 * 		Recaf initialization event.
 	 * @param beanManager
 	 * 		CDI bean manager.
 	 */
-	public void onDeploy(@Observes AfterDeploymentValidation event, BeanManager beanManager) {
+	public void onInitialize(@Observes InitializationEvent event, @Nonnull BeanManager beanManager) {
 		EagerInitializationExtension.beanManager = beanManager;
-		for (Bean<?> bean : applicationScopedEagerBeansForDeploy)
+		for (Bean<?> bean : applicationScopedEagerBeans)
 			create(bean);
 	}
 
@@ -91,7 +107,7 @@ public void onDeploy(@Observes AfterDeploymentValidation event, BeanManager bean
 	 * @param beanManager
 	 * 		CDI bean manager.
 	 */
-	public void onUiInitialize(@Observes UiInitializationEvent event, BeanManager beanManager) {
+	public void onUiInitialize(@Observes UiInitializationEvent event, @Nonnull BeanManager beanManager) {
 		EagerInitializationExtension.beanManager = beanManager;
 		for (Bean<?> bean : applicationScopedEagerBeansForUi)
 			create(bean);

recaf-core/src/main/java/software/coley/recaf/cdi/InitializationEvent.java

@@ -0,0 +1,10 @@
+package software.coley.recaf.cdi;
+
+/**
+ * Empty type, used to notify CDI consumers observing this type that the application has been launched.
+ *
+ * @author Matt Coley
+ * @see UiInitializationEvent Alternative which waits for the UI to initialize.
+ */
+public class InitializationEvent {
+}

recaf-core/src/main/java/software/coley/recaf/cdi/UiInitializationEvent.java

@@ -4,6 +4,7 @@
  * Empty type, used to notify CDI consumers observing this type that the UI has been populated.
  *
  * @author Matt Coley
+ * @see InitializationEvent Alternative which runs before the UI is initialized.
  */
 public class UiInitializationEvent {
 }

recaf-core/src/main/java/software/coley/recaf/config/ConfigGroups.java

@@ -20,6 +20,10 @@ public final class ConfigGroups {
 	 * Group for analyzing components.
 	 */
 	public static final String SERVICE_ANALYSIS = SERVICE + PACKAGE_SPLIT + "analysis";
+	/**
+	 * Group for assembler components.
+	 */
+	public static final String SERVICE_ASSEMBLER = SERVICE + PACKAGE_SPLIT + "assembler";
 	/**
 	 * Group for compiler components.
 	 */

recaf-core/src/main/java/software/coley/recaf/info/JvmClassInfo.java

@@ -1,9 +1,9 @@
 package software.coley.recaf.info;
 
 import jakarta.annotation.Nonnull;
-import me.coley.cafedude.classfile.ConstantPoolConstants;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Type;
+import software.coley.cafedude.classfile.ConstantPoolConstants;
 import software.coley.recaf.info.builder.JvmClassInfoBuilder;
 import software.coley.recaf.util.Types;
 

recaf-core/src/main/java/software/coley/recaf/launch/LaunchHandler.java

@@ -0,0 +1,28 @@
+package software.coley.recaf.launch;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import software.coley.recaf.cdi.EagerInitialization;
+import software.coley.recaf.cdi.InitializationStage;
+
+/**
+ * A special {@link EagerInitialization eagerly initialized bean} wrapper of {@link Runnable} which is specially by
+ * the entry-point of the program. The lack of the {@link EagerInitialization} annotation on this type is intentional
+ * as the entry-point determines if it should be run with {@link InitializationStage#IMMEDIATE} or
+ * {@link InitializationStage#AFTER_UI_INIT} dynamically.
+ *
+ * @author Matt Coley
+ */
+@ApplicationScoped
+public class LaunchHandler {
+	/**
+	 * Task to execute.
+	 */
+	public static Runnable task;
+
+	@PostConstruct
+	private void run() {
+		if (task != null)
+			task.run();
+	}
+}

recaf-core/src/main/java/software/coley/recaf/path/AbstractPathNode.java

@@ -91,16 +91,6 @@ public PathNode<P> getParent() {
 		return parent;
 	}
 
-	@Nullable
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T, I extends PathNode<T>> I getParentOfType(@Nonnull Class<T> type) {
-		if (getValueType().isAssignableFrom(type))
-			return (I) this;
-		if (parent == null) return null;
-		return parent.getParentOfType(type);
-	}
-
 	@Nonnull
 	@Override
 	public String typeId() {
@@ -113,15 +103,6 @@ public Class<V> getValueType() {
 		return valueType;
 	}
 
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T getValueOfType(@Nonnull Class<T> type) {
-		if (getValueType().isAssignableFrom(type))
-			return (T) getValue();
-		if (parent == null) return null;
-		return parent.getValueOfType(type);
-	}
-
 	@Nonnull
 	@Override
 	@SuppressWarnings("all")

recaf-core/src/main/java/software/coley/recaf/path/AnnotationPathNode.java

@@ -2,14 +2,13 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
-import software.coley.recaf.info.InnerClassInfo;
 import software.coley.recaf.info.annotation.Annotated;
 import software.coley.recaf.info.annotation.AnnotationInfo;
 
 import java.util.Set;
 
 /**
- * Path node for annotations on {@link Annotated} types such as classes, fields, and methods..
+ * Path node for annotations on {@link Annotated} types such as classes, fields, and methods.
  *
  * @author Matt Coley
  */
@@ -40,6 +39,7 @@ public AnnotationPathNode(@Nonnull AnnotationInfo annotation) {
 	 * @see ClassMemberPathNode#childAnnotation(AnnotationInfo)
 	 * @see ClassPathNode#child(AnnotationInfo)
 	 * @see AnnotationPathNode#child(AnnotationInfo)
+	 * @see InnerClassPathNode#child(AnnotationInfo)
 	 */
 	@SuppressWarnings("unchecked")
 	public AnnotationPathNode(@Nullable PathNode<?> parent, @Nonnull AnnotationInfo annotation) {
@@ -50,7 +50,7 @@ public AnnotationPathNode(@Nullable PathNode<?> parent, @Nonnull AnnotationInfo
 	 * @param annotation
 	 * 		Annotation to wrap into node.
 	 *
-	 * @return Path node of annotation, with current annotation as parent.
+	 * @return Path node of annotation, with the current annotation as parent.
 	 */
 	@Nonnull
 	public AnnotationPathNode child(@Nonnull AnnotationInfo annotation) {
@@ -60,7 +60,7 @@ public AnnotationPathNode child(@Nonnull AnnotationInfo annotation) {
 	@Nonnull
 	@Override
 	public Set<String> directParentTypeIds() {
-		return Set.of(ClassPathNode.TYPE_ID, ClassMemberPathNode.TYPE_ID, AnnotationPathNode.TYPE_ID);
+		return Set.of(ClassPathNode.TYPE_ID, ClassMemberPathNode.TYPE_ID, InnerClassPathNode.TYPE_ID, AnnotationPathNode.TYPE_ID);
 	}
 
 	@Override

recaf-core/src/main/java/software/coley/recaf/path/BundlePathNode.java

@@ -50,7 +50,7 @@ public BundlePathNode(@Nullable ResourcePathNode parent, @Nonnull Bundle<?> bund
 	 * @param directory
 	 * 		Directory to wrap in path node.
 	 *
-	 * @return Path node of directory, with current bundle as parent.
+	 * @return Path node of directory, with the current bundle as parent.
 	 */
 	@Nonnull
 	public DirectoryPathNode child(@Nullable String directory) {