Split core and model, fix publishing

NebelNidas · Mar 16, 2024 · 8a79b7e · 8a79b7e
1 parent f630e07
commit 8a79b7e
Show file tree

Hide file tree

Showing 100 changed files with 549 additions and 473 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ subprojects {
 		}
 	}
 
-	group = 'net.fabricmc'
+	group = 'net.fabricmc.matcher'
 	version = rootProject.version
 
 	checkstyle {
@@ -62,4 +62,12 @@ subprojects {
 		// disable 'missing' warnings
 		options.addStringOption('Xdoclint:all,-missing', '-quiet')
 	}
+
+	publishing {
+		publications {
+			"$project.name"(MavenPublication) {
+				from components.java
+			}
+		}
+	}
 }
diff --git a/matcher-cli/build.gradle b/matcher-cli/build.gradle
@@ -1,8 +1,9 @@
 plugins {
 	id 'application'
-	id 'org.gradlex.extra-java-module-info'
 }
 
+archivesBaseName = 'matcher-cli'
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_17
 	targetCompatibility = JavaVersion.VERSION_17

diff --git a/matcher-cli/src/main/java/matcher/cli/Main.java b/matcher-cli/src/main/java/matcher/cli/Main.java
@@ -2,7 +2,7 @@
 
 import matcher.cli.provider.builtin.AdditionalPluginsCliParameterProvider;
 import matcher.cli.provider.builtin.AutomatchCliCommandProvider;
-import matcher.config.Config;
+import matcher.model.config.Config;
 
 public class Main {
 	public static void main(String[] args) {

diff --git a/matcher-cli/src/main/java/matcher/cli/provider/builtin/AutomatchCliCommandProvider.java b/matcher-cli/src/main/java/matcher/cli/provider/builtin/AutomatchCliCommandProvider.java
@@ -15,12 +15,12 @@
 import matcher.Matcher;
 import matcher.cli.MatcherCli;
 import matcher.cli.provider.CliCommandProvider;
-import matcher.config.Config;
-import matcher.config.ProjectConfig;
-import matcher.mapping.MappingField;
-import matcher.mapping.Mappings;
+import matcher.model.config.Config;
+import matcher.model.config.ProjectConfig;
+import matcher.model.mapping.MappingField;
+import matcher.model.mapping.Mappings;
+import matcher.model.type.ClassEnvironment;
 import matcher.serdes.MatchesIo;
-import matcher.type.ClassEnvironment;
 
 /**
  * Provides the default {@code automatch} command.

diff --git a/matcher-core/build.gradle b/matcher-core/build.gradle
@@ -1,6 +1,4 @@
-plugins {
-	id 'java-library'
-}
+archivesBaseName = 'matcher-core'
 
 java {
 	sourceCompatibility = JavaVersion.VERSION_11
@@ -18,10 +16,5 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 dependencies {
-	api "net.fabricmc:mapping-io:${mappingio_version}"
-	api "org.ow2.asm:asm:${asm_version}"
-	api "org.ow2.asm:asm-tree:${asm_version}"
-	api "org.slf4j:slf4j-api:${slf4j_version}"
-	implementation "org.ow2.asm:asm-commons:${asm_version}"
-	implementation "org.ow2.asm:asm-util:${asm_version}"
+	api project(':matcher-model')
 }
diff --git a/matcher-core/src/main/java/matcher/Matcher.java b/matcher-core/src/main/java/matcher/Matcher.java
@@ -29,23 +29,24 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import matcher.classifier.ClassClassifier;
-import matcher.classifier.ClassifierLevel;
-import matcher.classifier.FieldClassifier;
-import matcher.classifier.IRanker;
-import matcher.classifier.MethodClassifier;
-import matcher.classifier.MethodVarClassifier;
-import matcher.classifier.RankResult;
-import matcher.config.Config;
-import matcher.config.ProjectConfig;
-import matcher.type.ClassEnv;
-import matcher.type.ClassEnvironment;
-import matcher.type.ClassInstance;
-import matcher.type.FieldInstance;
-import matcher.type.InputFile;
-import matcher.type.MemberInstance;
-import matcher.type.MethodInstance;
-import matcher.type.MethodVarInstance;
+import matcher.model.NameType;
+import matcher.model.classifier.ClassClassifier;
+import matcher.model.classifier.ClassifierLevel;
+import matcher.model.classifier.FieldClassifier;
+import matcher.model.classifier.IRanker;
+import matcher.model.classifier.MethodClassifier;
+import matcher.model.classifier.MethodVarClassifier;
+import matcher.model.classifier.RankResult;
+import matcher.model.config.Config;
+import matcher.model.config.ProjectConfig;
+import matcher.model.type.ClassEnv;
+import matcher.model.type.ClassEnvironment;
+import matcher.model.type.ClassInstance;
+import matcher.model.type.FieldInstance;
+import matcher.model.type.InputFile;
+import matcher.model.type.MemberInstance;
+import matcher.model.type.MethodInstance;
+import matcher.model.type.MethodVarInstance;
 
 public class Matcher {
 	public static void init() {

diff --git a/matcher-core/src/main/java/matcher/serdes/MatchesIo.java b/matcher-core/src/main/java/matcher/serdes/MatchesIo.java
@@ -16,16 +16,16 @@
 import java.util.function.DoubleConsumer;
 
 import matcher.Matcher;
-import matcher.config.Config;
-import matcher.type.ClassEnvironment;
-import matcher.type.ClassInstance;
-import matcher.type.FieldInstance;
-import matcher.type.InputFile;
-import matcher.type.InputFile.HashType;
-import matcher.type.LocalClassEnv;
-import matcher.type.MemberInstance;
-import matcher.type.MethodInstance;
-import matcher.type.MethodVarInstance;
+import matcher.model.config.Config;
+import matcher.model.type.ClassEnvironment;
+import matcher.model.type.ClassInstance;
+import matcher.model.type.FieldInstance;
+import matcher.model.type.InputFile;
+import matcher.model.type.InputFile.HashType;
+import matcher.model.type.LocalClassEnv;
+import matcher.model.type.MemberInstance;
+import matcher.model.type.MethodInstance;
+import matcher.model.type.MethodVarInstance;
 
 public class MatchesIo {
 	public static void read(Path path, List<Path> inputDirs, boolean verifyInputs, Matcher matcher, DoubleConsumer progressReceiver) {

diff --git a/matcher-core/src/main/java/module-info.java b/matcher-core/src/main/java/module-info.java
@@ -1,20 +1,8 @@
 module matcher.core {
-	requires java.prefs;
-	requires org.objectweb.asm.commons;
-	requires org.objectweb.asm.tree.analysis;
-	requires org.objectweb.asm.util;
-	requires transitive net.fabricmc.mappingio;
-	requires transitive org.objectweb.asm;
-	requires transitive org.objectweb.asm.tree;
-	requires transitive org.slf4j;
+	requires transitive matcher.model;
 
 	uses matcher.Plugin;
 
 	exports matcher;
-	exports matcher.bcremap;
-	exports matcher.classifier;
-	exports matcher.config;
-	exports matcher.mapping;
 	exports matcher.serdes;
-	exports matcher.type;
 }
diff --git a/matcher-gui/build.gradle b/matcher-gui/build.gradle
@@ -1,9 +1,10 @@
 plugins {
 	id 'application'
 	id 'org.openjfx.javafxplugin'
-	id 'org.gradlex.extra-java-module-info'
 }
 
+archivesBaseName = 'matcher-gui'
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_17
 	targetCompatibility = JavaVersion.VERSION_17

diff --git a/matcher-gui/src/main/java/matcher/gui/Main.java b/matcher-gui/src/main/java/matcher/gui/Main.java
@@ -8,7 +8,7 @@
 import matcher.PluginLoader;
 import matcher.cli.MatcherCli;
 import matcher.cli.provider.builtin.AdditionalPluginsCliParameterProvider;
-import matcher.config.Config;
+import matcher.model.config.Config;
 import matcher.gui.cli.PreLaunchGuiCliParameterProvider;
 
 public class Main {

diff --git a/matcher-gui/src/main/java/matcher/gui/MatcherGui.java b/matcher-gui/src/main/java/matcher/gui/MatcherGui.java
@@ -44,11 +44,7 @@
 import net.fabricmc.mappingio.MappingReader;
 
 import matcher.Matcher;
-import matcher.NameType;
 import matcher.cli.MatcherCli;
-import matcher.config.Config;
-import matcher.config.ProjectConfig;
-import matcher.config.Theme;
 import matcher.gui.cli.PostLaunchGuiCliParameterProvider;
 import matcher.gui.srcprocess.BuiltinDecompiler;
 import matcher.gui.ui.BottomPane;
@@ -60,10 +56,14 @@
 import matcher.gui.ui.Shortcuts;
 import matcher.gui.ui.menu.MainMenuBar;
 import matcher.gui.ui.menu.NewProjectPane;
-import matcher.mapping.MappingField;
-import matcher.mapping.Mappings;
-import matcher.type.ClassEnvironment;
-import matcher.type.MatchType;
+import matcher.model.NameType;
+import matcher.model.config.Config;
+import matcher.model.config.ProjectConfig;
+import matcher.model.config.Theme;
+import matcher.model.mapping.MappingField;
+import matcher.model.mapping.Mappings;
+import matcher.model.type.ClassEnvironment;
+import matcher.model.type.MatchType;
 
 public class MatcherGui extends Application {
 	@Override

diff --git a/matcher-gui/src/main/java/matcher/gui/cli/PostLaunchGuiCliParameterProvider.java b/matcher-gui/src/main/java/matcher/gui/cli/PostLaunchGuiCliParameterProvider.java
@@ -9,8 +9,8 @@
 
 import matcher.cli.provider.CliParameterProvider;
 import matcher.cli.provider.builtin.BuiltinCliParameters;
-import matcher.config.ProjectConfig;
 import matcher.gui.MatcherGui;
+import matcher.model.config.ProjectConfig;
 
 public class PostLaunchGuiCliParameterProvider implements CliParameterProvider {
 	public PostLaunchGuiCliParameterProvider(MatcherGui gui) {

diff --git a/matcher-gui/src/main/java/matcher/gui/cli/PreLaunchGuiCliParameterProvider.java b/matcher-gui/src/main/java/matcher/gui/cli/PreLaunchGuiCliParameterProvider.java
@@ -4,8 +4,8 @@
 
 import matcher.Matcher;
 import matcher.cli.provider.CliParameterProvider;
-import matcher.config.Config;
-import matcher.config.Theme;
+import matcher.model.config.Config;
+import matcher.model.config.Theme;
 
 public class PreLaunchGuiCliParameterProvider implements CliParameterProvider {
 	@Parameter(names = {BuiltinGuiCliParameters.THEME})

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/Cfr.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/Cfr.java
@@ -14,9 +14,9 @@
 import org.benf.cfr.reader.bytecode.analysis.parse.utils.Pair;
 
 import matcher.Matcher;
-import matcher.NameType;
-import matcher.type.ClassFeatureExtractor;
-import matcher.type.ClassInstance;
+import matcher.model.NameType;
+import matcher.model.type.ClassFeatureExtractor;
+import matcher.model.type.ClassInstance;
 
 public class Cfr implements Decompiler {
 	@Override

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/Decompiler.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/Decompiler.java
@@ -1,9 +1,9 @@
 package matcher.gui.srcprocess;
 
-import matcher.NameType;
-import matcher.type.ClassEnvironment;
-import matcher.type.ClassFeatureExtractor;
-import matcher.type.ClassInstance;
+import matcher.model.NameType;
+import matcher.model.type.ClassEnvironment;
+import matcher.model.type.ClassFeatureExtractor;
+import matcher.model.type.ClassInstance;
 
 public interface Decompiler {
 	static String decompile(ClassEnvironment env, Decompiler decompiler, ClassInstance cls, NameType nameType) {

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/HtmlPrinter.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/HtmlPrinter.java
@@ -133,8 +133,8 @@
 import com.github.javaparser.printer.configuration.Indentation.IndentType;
 import com.github.javaparser.utils.Utils;
 
-import matcher.type.FieldInstance;
-import matcher.type.MethodInstance;
+import matcher.model.type.FieldInstance;
+import matcher.model.type.MethodInstance;
 
 public class HtmlPrinter extends DefaultPrettyPrinterVisitor {
 	public HtmlPrinter(TypeResolver typeResolver) {

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/HtmlUtil.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/HtmlUtil.java
@@ -2,8 +2,8 @@
 
 import java.util.regex.Pattern;
 
-import matcher.type.FieldInstance;
-import matcher.type.MethodInstance;
+import matcher.model.type.FieldInstance;
+import matcher.model.type.MethodInstance;
 
 public class HtmlUtil {
 	public static String getId(MethodInstance method) {

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/Jadx.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/Jadx.java
@@ -13,10 +13,10 @@
 import jadx.plugins.input.java.JavaClassReader;
 import jadx.plugins.input.java.data.JavaClassData;
 
-import matcher.NameType;
-import matcher.Util;
-import matcher.type.ClassFeatureExtractor;
-import matcher.type.ClassInstance;
+import matcher.model.Util;
+import matcher.model.NameType;
+import matcher.model.type.ClassFeatureExtractor;
+import matcher.model.type.ClassInstance;
 
 public class Jadx implements Decompiler {
 	@Override

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/Procyon.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/Procyon.java
@@ -11,9 +11,9 @@
 import com.strobel.decompiler.PlainTextOutput;
 
 import matcher.Matcher;
-import matcher.NameType;
-import matcher.type.ClassFeatureExtractor;
-import matcher.type.ClassInstance;
+import matcher.model.NameType;
+import matcher.model.type.ClassFeatureExtractor;
+import matcher.model.type.ClassInstance;
 
 public class Procyon implements Decompiler {
 	@Override

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/SrcDecorator.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/SrcDecorator.java
@@ -8,14 +8,14 @@
 
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.JavaToken;
+import com.github.javaparser.JavaToken.Kind;
 import com.github.javaparser.ParseResult;
 import com.github.javaparser.ParserConfiguration;
 import com.github.javaparser.ParserConfiguration.LanguageLevel;
 import com.github.javaparser.Position;
 import com.github.javaparser.Problem;
 import com.github.javaparser.Range;
 import com.github.javaparser.TokenRange;
-import com.github.javaparser.JavaToken.Kind;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
@@ -30,11 +30,11 @@
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 
 import matcher.Matcher;
-import matcher.NameType;
-import matcher.type.ClassInstance;
-import matcher.type.FieldInstance;
-import matcher.type.MethodInstance;
-import matcher.type.MethodVarInstance;
+import matcher.model.NameType;
+import matcher.model.type.ClassInstance;
+import matcher.model.type.FieldInstance;
+import matcher.model.type.MethodInstance;
+import matcher.model.type.MethodVarInstance;
 
 public class SrcDecorator {
 	public static String decorate(String src, ClassInstance cls, NameType nameType) {

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/TypeResolver.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/TypeResolver.java
@@ -24,12 +24,12 @@
 import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.type.VoidType;
 
-import matcher.NameType;
-import matcher.type.ClassInstance;
-import matcher.type.FieldInstance;
-import matcher.type.ClassEnv;
-import matcher.type.Matchable;
-import matcher.type.MethodInstance;
+import matcher.model.NameType;
+import matcher.model.type.ClassEnv;
+import matcher.model.type.ClassInstance;
+import matcher.model.type.FieldInstance;
+import matcher.model.type.Matchable;
+import matcher.model.type.MethodInstance;
 
 class TypeResolver {
 	public void setup(ClassInstance rootCls, NameType nameType, CompilationUnit cu) {

diff --git a/matcher-gui/src/main/java/matcher/gui/srcprocess/Vineflower.java b/matcher-gui/src/main/java/matcher/gui/srcprocess/Vineflower.java
@@ -19,9 +19,9 @@
 import org.jetbrains.java.decompiler.main.extern.IResultSaver;
 
 import matcher.Matcher;
-import matcher.NameType;
-import matcher.type.ClassFeatureExtractor;
-import matcher.type.ClassInstance;
+import matcher.model.NameType;
+import matcher.model.type.ClassFeatureExtractor;
+import matcher.model.type.ClassInstance;
 
 public class Vineflower implements Decompiler {
 	@Override