Merge branch 'master-split'

Author: PhoenixVX

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 MCPHackers
+Copyright (c) 2025 MCPHackers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -6,7 +6,7 @@ RetroMCP-Java is a complete re-design of RetroMCP in Java.
 # Using
 
 Using RetroMCP-Java is simple!
-1. Download and install JDK 8. MCPHackers recommend [Azul Zulu](https://www.azul.com/downloads/?version=java-8-lts&package=jdk)
+1. Download and install JDK 8. MCPHackers recommend [Azul Zulu](https://www.azul.com/downloads/?version=java-8-lts&package=jdk).
 2. Run the latest [release](https://github.com/MCPHackers/RetroMCP-Java/releases) from the command line or via double click. If you run it via double click and RMCP errors, make sure your PATH
 and your JAR file associations are properly configured.
 	> Be careful! Using "Open with" context menu on Windows will not use a proper directory, be sure to change the default .jar file associations

build.gradle

@@ -1,99 +1,56 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
-    id 'application'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
-}
-
-repositories {
-    mavenCentral()
-    maven { url 'https://jitpack.io/' }
-    maven { url 'https://maven.fabricmc.net/' }
-    maven { url 'https://mcphackers.org/libraries/' }
-	maven { url 'https://maven.glass-launcher.net/releases/'}
+    id "java"
 }
 
-configurations {
-    shadow
-    implementation.extendsFrom shadow
-}
+allprojects {
+	apply plugin: "java"
 
-dependencies {
-	runtimeOnly sourceSets.test.output
+	repositories {
+		mavenCentral()
+		maven { url "https://jitpack.io/" }
+		maven { url "https://maven.fabricmc.net/" }
+		maven { url "https://mcphackers.org/libraries/" }
+		maven { url "https://maven.glass-launcher.net/releases" }
+	}
 
-    // Required libraries
-    shadow "org.ow2.asm:asm:${project.asm_version}"
-    shadow "org.ow2.asm:asm-analysis:${project.asm_version}"
-    shadow "org.ow2.asm:asm-commons:${project.asm_version}"
-    shadow "org.ow2.asm:asm-tree:${project.asm_version}"
-    shadow "org.ow2.asm:asm-util:${project.asm_version}"
+	dependencies {
+		runtimeOnly sourceSets.test.output
 
-	shadow "com.github.MCPHackers.RetroDebugInjector:RetroDebugInjector-NIO:${project.rdi_version}"
-	shadow "com.github.MCPHackers.RetroDebugInjector:RetroDebugInjector:${project.rdi_version}"
-    shadow "io.github.lassebq:fernflower:${project.fernflower_version}"
-    shadow "org.fusesource.jansi:jansi:${project.jansi_version}"
-    shadow "org.json:json:${project.json_version}"
-    shadow "com.github.MCPHackers:DiffPatch:${project.diffpatch_version}"
-    shadow "net.fabricmc:mapping-io:${project.mapping_io_version}"
+		// Required libraries
+		implementation "org.ow2.asm:asm:${project.asm_version}"
+		implementation "org.ow2.asm:asm-analysis:${project.asm_version}"
+		implementation "org.ow2.asm:asm-commons:${project.asm_version}"
+		implementation "org.ow2.asm:asm-tree:${project.asm_version}"
+		implementation "org.ow2.asm:asm-util:${project.asm_version}"
 
-    shadow "com.formdev:flatlaf:${project.flatlaf_version}"
-}
+		implementation "com.github.MCPHackers.RetroDebugInjector:rdi-nio:${project.rdi_version}"
+		implementation "com.github.MCPHackers.RetroDebugInjector:rdi:${project.rdi_version}"
 
-tasks.withType(JavaCompile).configureEach {
-	it.options.encoding = "UTF-8"
+		implementation "io.github.lassebq:fernflower:${project.fernflower_version}"
 
-	// Use release flag on Java 9+ instead of source & target flags
-	// This makes the JDK read the boot classpath and use the proper
-	// libraries to be compliant with Java 8 without issues
-	if (JavaVersion.current().isJava9Compatible()) {
-		it.options.release.set(8)
+		implementation "org.json:json:${project.json_version}"
+		implementation "com.github.MCPHackers:DiffPatch:${project.diffpatch_version}"
+		implementation "org.apache.commons:commons-lang3:${project.apache_version}"
+		implementation "net.fabricmc:mapping-io:${project.mapping_io_version}"
 	}
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-application {
-    // Redirect all execution into the testing folder
-    mainClass = 'org.mcphackers.mcp.main.MainGUI'
-    executableDir = 'test'
-    mkdir(executableDir)
-}
-
-run {
-    workingDir 'test'
-}
 
-runShadow {
-    workingDir 'test'
-}
+	tasks.withType(JavaCompile).configureEach {
+		it.options.encoding = "UTF-8"
 
-shadowJar {
-	manifest {
-		attributes 'Main-Class': 'org.mcphackers.mcp.main.MainGUI'
+		// Use release flag on Java 9+ instead of source & target flags
+		// This makes the JDK read the boot classpath and use the proper
+		// libraries to be compliant with Java 8 without issues
+		if (JavaVersion.current().isJava9Compatible()) {
+			it.options.release.set(8)
+		}
 	}
-	archiveClassifier = 'GUI'
 
-	configurations = [project.configurations.shadow]
-    minimize {
-		exclude(dependency('com.formdev:.*:.*'))
+	java {
+		sourceCompatibility = JavaVersion.VERSION_1_8
+		targetCompatibility = JavaVersion.VERSION_1_8
 	}
 }
 
-tasks.register('jarCLI', ShadowJar) {
-	manifest {
-		attributes 'Main-Class': 'org.mcphackers.mcp.main.MainCLI'
-	}
-	archiveClassifier = 'CLI'
-	from sourceSets.main.output
-	configurations = [project.configurations.shadow]
-	minimize()
-	exclude('com/formdev/**/**')
-	exclude('META-INF/versions/**/**')
-	exclude('META-INF/**.RSA')
-	exclude('META-INF/**.SF')
+subprojects {
+	apply plugin: "application"
 }
-
-jar.dependsOn(jarCLI)

cli/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+	id "com.gradleup.shadow" version "8.3.1"
+}
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+dependencies {
+	implementation rootProject
+	implementation "org.fusesource.jansi:jansi:${project.jansi_version}"
+}
+
+application {
+	mainClass = "org.mcphackers.mcp.main.MainCLI"
+	executableDir = "test"
+	mkdir(executableDir)
+}
+
+run {
+	workingDir 'test'
+}
+
+runShadow {
+	workingDir 'test'
+}
+
+tasks.named("shadowJar", ShadowJar) {
+	configurations = [project.configurations.compileClasspath]
+	archiveBaseName.set("RetroMCP-CLI")
+	archiveClassifier.set("all")
+	setDestinationDirectory(rootProject.getLayout().getBuildDirectory().dir("libs"))
+	minimize()
+}

src/main/java/org/mcphackers/mcp/main/MainCLI.java renamed to cli/src/main/java/org/mcphackers/mcp/main/MainCLI.java

@@ -79,6 +79,9 @@ public MainCLI(String[] args) {
 				log(new Ansi().fgBrightRed().a("Error: Java Development Kit is required to recompile!").toString());
 				log("Using Java from " + Paths.get(Util.getJava()).toAbsolutePath());
 			}
+			if (Util.getJavaVersion() > 8) {
+				warning("WARNING: JDK " + Util.getJavaVersion() + " is being used! Java 8 is recommended.");
+			}
 			if (version != null) log(version);
 			log(new Ansi().fgDefault().a("Enter a command to execute:").toString());
 		}
@@ -147,16 +150,9 @@ public MainCLI(String[] args) {
 			helpCommand = null;
 			executeTimes++;
 		}
-		if (Util.getJavaVersion() > 8) {
-			log("WARNING: JDK " + Util.getJavaVersion() + " is being used! Java 8 is recommended.");
-		}
 	}
 
 	public static void main(String[] args) {
-		if (args.length != 0) {
-			new MainCLI(args);
-			return;
-		}
 		AnsiConsole.systemInstall();
 		new MainCLI(args);
 	}
@@ -245,6 +241,9 @@ private void setParams(Map<String, Object> parsedArgs, TaskMode mode) {
 					case "server":
 						side = Side.SERVER;
 						break;
+					case "merged":
+						side = Side.MERGED;
+						break;
 				}
 				if (mode == TaskMode.HELP) {
 					for (TaskMode taskMode : TaskMode.registeredTasks) {
@@ -283,6 +282,16 @@ public void log(String msg) {
 		System.out.println(msg);
 	}
 
+	@Override
+	public void warning(String msg) {
+		System.out.println(Ansi.ansi().fgYellow().a(msg).fgDefault());
+	}
+
+	@Override
+	public void error(String msg) {
+		System.out.println(Ansi.ansi().fgRed().a(msg).fgDefault());
+	}
+
 	@Override
 	public boolean yesNoInput(String title, String msg) {
 		log(msg);
@@ -385,11 +394,6 @@ public void clearProgressBars() {
 		progressBarNames = new String[0];
 	}
 
-	@Override
-	public Path getWorkingDir() {
-		return Paths.get("");
-	}
-
 	@Override
 	public boolean updateDialogue(String changelog, String version) {
 		return yesNoInput("New version found: " + version, changelog + "\n\nAre you sure you want to update?");

gradle.properties

@@ -1,8 +1,9 @@
-asm_version=9.7
+asm_version=9.7.1
 fernflower_version=1.0.0
-rdi_version=30164e1
+rdi_version=c9cbed5
 jansi_version=2.4.1
 json_version=20240303
 diffpatch_version=cde1224
+apache_version=3.12.0
 mapping_io_version=0.6.1
-flatlaf_version=3.5
+flatlaf_version=3.5.4

gui/build.gradle

@@ -0,0 +1,33 @@
+plugins {
+	id "com.gradleup.shadow" version "8.3.1"
+}
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+dependencies {
+	implementation rootProject
+
+	implementation "com.formdev:flatlaf:${project.flatlaf_version}"
+}
+
+application {
+	mainClass = "org.mcphackers.mcp.main.MainGUI"
+	executableDir = "test"
+	mkdir(executableDir)
+}
+
+run {
+	workingDir "test"
+}
+
+runShadow {
+	workingDir "test"
+}
+
+tasks.named("shadowJar", ShadowJar) {
+	configurations = [project.configurations.compileClasspath]
+	archiveBaseName.set("RetroMCP-GUI")
+	archiveClassifier.set("all")
+	setDestinationDirectory(rootProject.getLayout().getBuildDirectory().dir("libs"))
+	minimize()
+}

src/main/java/org/mcphackers/mcp/Theme.java renamed to gui/src/main/java/org/mcphackers/mcp/Theme.java

@@ -2,6 +2,7 @@
 
 import org.mcphackers.mcp.MCP;
 import org.mcphackers.mcp.MCPPaths;
+import org.mcphackers.mcp.Theme;
 import org.mcphackers.mcp.main.MainGUI;
 import org.mcphackers.mcp.tasks.Task;
 import org.mcphackers.mcp.tasks.Task.Side;
@@ -184,7 +185,7 @@ public void popupMenuCanceled(PopupMenuEvent e) {
 		});
 		SwingUtilities.invokeLater(() -> {
 			if (mcp.options.theme != null) {
-				mcp.changeTheme(mcp.options.theme);
+				mcp.changeTheme(Theme.THEMES_MAP.get(mcp.options.theme));
 
 				topRightContainer.updateUI();
 				revalidate();

src/main/java/org/mcphackers/mcp/gui/GridBagConstraintsBuilder.java renamed to gui/src/main/java/org/mcphackers/mcp/gui/GridBagConstraintsBuilder.java

@@ -149,7 +149,7 @@ protected MenuBar(MCPFrame frame) {
 				themeItem.setSelected(true);
 				mcp.options.save();
 			});
-			if (theme.equals(MainGUI.THEME)) {
+			if (theme.equals(this.mcp.theme)) {
 				themeItem.setSelected(true);
 			}
 			themeItems[i] = themeItem;