From 3cbcbb5f2793a8d0ccdb6f1cbf68c52591277e95 Mon Sep 17 00:00:00 2001
From: NebelNidas <nebelnidas@gmail.com>
Date: Sun, 10 Mar 2024 21:27:42 +0100
Subject: [PATCH] Fix JPMS issues

---
 build.gradle                   | 7 +++++--
 src/main/java/module-info.java | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 344063ab..2e1e89f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,9 @@ dependencies {
 	implementation ("io.github.skylot:jadx-core:${jadx_version}") {
 		exclude group: 'com.android.tools.build', module: 'aapt2-proto'
 	}
-	implementation "io.github.skylot:jadx-java-input:${jadx_version}"
+	implementation ("io.github.skylot:jadx-java-input:${jadx_version}") {
+		exclude group: 'io.github.skylot', module: 'raung-disasm'
+	}
 	runtimeOnly "org.tinylog:tinylog-impl:${tinylog_version}"
 	runtimeOnly "org.tinylog:slf4j-tinylog:${tinylog_version}"
 
@@ -104,7 +106,8 @@ extraJavaModuleInfo {
 
 	// JADX
 	automaticModule("io.github.skylot:jadx-core", "jadx.core")
-	automaticModule("io.github.skylot:jadx-java-input", "jadx.java_input")
+	automaticModule("io.github.skylot:jadx-plugins-api", "jadx.plugins.api")
+	automaticModule("io.github.skylot:jadx-java-input", "jadx.plugins.java_input")
 }
 
 application {
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index a1064f3b..3ac85dbe 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -27,7 +27,8 @@
 	requires org.objectweb.asm.util;
 	requires procyon.compilertools;
 	requires jadx.core;
-	requires jadx.java_input;
+	requires jadx.plugins.api;
+	requires jadx.plugins.java_input;
 	requires transitive net.fabricmc.mappingio;
 
 	uses matcher.Plugin;