2x

README.md

@@ -2,10 +2,5 @@
 
 ![GitHub all releases](https://img.shields.io/github/downloads/Enaium/JavaOctetEditor/total?style=flat-square)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Enaium/JavaOctetEditor?style=flat-square)
-![GitHub](https://img.shields.io/github/license/Enaium/JavaOctetEditor?style=flat-square)
-
-![](https://user-images.githubusercontent.com/32991121/190947407-bbc6642e-2c9d-46f3-921c-6558c74272cf.png)
-![](https://user-images.githubusercontent.com/32991121/190947409-9df48d03-e1b7-4c0a-ae1d-08e1ca2bc9aa.png)
-![](https://user-images.githubusercontent.com/32991121/190947408-df6c6818-ea79-4a42-8b90-101b6daa3099.png)
-![](https://user-images.githubusercontent.com/32991121/190947401-fc08fc4f-3714-49ca-a064-913e7312b191.png)
-![](https://user-images.githubusercontent.com/32991121/190947410-4b8f224a-c589-4998-950a-e19618ce5734.png)
+![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/Enaium/JavaOctetEditor?include_prereleases&style=flat-square)
+![GitHub](https://img.shields.io/github/license/Enaium/JavaOctetEditor?style=flat-square)

build.gradle

@@ -1,82 +1,30 @@
-import java.text.SimpleDateFormat
-import org.gradle.internal.jvm.Jvm
-
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
     id 'idea'
 }
 
-group 'cn.enaium'
-version '1.3.0'
-
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
-
-jar {
-    manifest.attributes(
-            'Manifest-Version': 1.0,
-            'Main-Class': 'cn.enaium.joe.Main',
-            "Implementation-Title": "${project.name}",
-            "Implementation-Version": "${project.version}",
-            "Implementation-Vendor": "${project.group}",
-            "Implementation-Timestamp": new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()),
-            "Premain-Class": "cn.enaium.joe.Agent",
-            "Agent-Class": "cn.enaium.joe.Agent",
-            "Can-Redefine-Classes": true,
-            "Can-Retransform-Classes": true
-    )
-}
-
-new File(System.getProperty("user.dir"), "run").mkdir()
-
-repositories {
-    mavenCentral()
-    maven { url 'https://jitpack.io' }
-    maven { url 'https://maven.quiltmc.org/repository/release' }
+allprojects {
+    group 'cn.enaium'
+    version '2.0.0'
 }
 
-dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'jacoco'
+    apply plugin: 'checkstyle'
 
-    implementation 'com.formdev:flatlaf:2.4'
-    implementation 'com.formdev:flatlaf-extras:2.4'
-    //noinspection GradlePackageUpdate
-    implementation 'com.miglayout:miglayout-swing:5.3'
-    implementation 'com.github.bobbylight:RSyntaxTextArea:3.2.0'
-    implementation 'org.ow2.asm:asm-tree:9.3'
-    implementation 'org.ow2.asm:asm-util:9.3'
-    implementation 'org.ow2.asm:asm-commons:9.3'
-    implementation 'org.benf:cfr:0.152'
-    implementation 'com.github.mstrobel.procyon:procyon-decompiler:v0.6.0'
-    implementation 'org.quiltmc:quiltflower:1.8.1'
-    implementation 'org.javassist:javassist:3.29.1-GA'
-    implementation 'com.google.code.gson:gson:2.9.0'
-    implementation 'org.tinylog:tinylog:1.3.6'
-    implementation 'com.github.FabricMC:mapping-io:597f0722d6'
 
-    compileOnly files(Jvm.current().getToolsJar())//Must use jdk8
-}
-
-test {
-    useJUnitPlatform()
-}
-
-shadowJar {
-    dependencies {
-        include(dependency('com.formdev:.*'))
-        include(dependency('com.miglayout:.*'))
-        include(dependency('com.github.bobbylight:RSyntaxTextArea'))
-        include(dependency('org.ow2.asm:.*'))
-        include(dependency('org.benf:cfr'))
-        include(dependency('com.github.mstrobel.procyon:procyon-decompiler'))
-        include(dependency('org.javassist:javassist'))
-        include(dependency('com.google.code.gson:gson'))
-        include(dependency('org.tinylog:.*'))
-        include(dependency('org.quiltmc:quiltflower'))
-        include(dependency('com.github.FabricMC:mapping-io'))
+    //If you want to use your JDK, just takes to change the JDK version and vendor, otherwise Gradle will be download default JDK
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+            vendor = JvmVendorSpec.BELLSOFT
+        }
     }
-    archiveClassifier.set('')
-}
 
-build.dependsOn shadowJar
+    repositories {
+        mavenCentral()
+        maven { url 'https://maven.quiltmc.org/repository/release' }
+        maven { url 'https://jitpack.io' }
+    }
+}

core/build.gradle

@@ -0,0 +1,19 @@
+plugins {
+    id 'java-library'
+}
+
+dependencies {
+    api 'org.ow2.asm:asm-tree:9.4'
+    api 'org.ow2.asm:asm-util:9.4'
+    api 'org.ow2.asm:asm-commons:9.4'
+    api 'org.benf:cfr:0.152'
+    api 'com.github.mstrobel.procyon:procyon-decompiler:v0.6.0'
+    api 'org.quiltmc:quiltflower:1.8.1'
+    api 'com.google.code.gson:gson:2.10'
+    api 'org.tinylog:tinylog:1.3.6'
+    api 'com.github.FabricMC:mapping-io:597f0722d6'
+}
+
+test {
+    useJUnitPlatform()
+}

src/main/java/cn/enaium/joe/annotation/Indeterminate.java → core/src/main/java/cn/enaium/joe/core/annotation/Indeterminate.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cn.enaium.joe.annotation;
+package cn.enaium.joe.core.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -23,7 +23,7 @@
 
 /**
  * @author Enaium
- * @since 0.9.0
+ * @since 2.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

src/main/java/cn/enaium/joe/annotation/Repeatable.java → core/src/main/java/cn/enaium/joe/core/annotation/Repeatable.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cn.enaium.joe.annotation;
+package cn.enaium.joe.core.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -23,7 +23,7 @@
 
 /**
  * @author Enaium
- * @since 0.9.0
+ * @since 2.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

core/src/main/java/cn/enaium/joe/core/compiler/Compiler.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2022 Enaium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cn.enaium.joe.core.compiler;
+
+import javax.tools.*;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author Enaium
+ * @since 2.0.0
+ */
+public class Compiler {
+    private final Map<String, VirtualJavaFileObject> javaFileObjectMap = new HashMap<>();
+
+    private DiagnosticListener<VirtualJavaFileObject> listener;
+
+    public void addSource(String name, String content) {
+        javaFileObjectMap.put(name, new VirtualJavaFileObject(name, content));
+    }
+
+    public Map<String, byte[]> getClasses() {
+        return javaFileObjectMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, v -> v.getValue().getBytecode()));
+    }
+
+    @SuppressWarnings("unchecked")
+    public boolean compile() {
+        var compiler = ToolProvider.getSystemJavaCompiler();
+        var fileManager = new VirtualFileManager(compiler.getStandardFileManager(null, null, StandardCharsets.UTF_8));
+        try {
+            var task = compiler.getTask(null, fileManager, ((DiagnosticListener<? super JavaFileObject>) (Object) listener), null, null, javaFileObjectMap.values());
+            Boolean b = task.call();
+            return b != null && b;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public void setListener(DiagnosticListener<VirtualJavaFileObject> listener) {
+        this.listener = listener;
+    }
+
+    private final class VirtualFileManager extends ForwardingJavaFileManager<JavaFileManager> {
+        public VirtualFileManager(JavaFileManager fileManager) {
+            super(fileManager);
+        }
+
+        @Override
+        public JavaFileObject getJavaFileForOutput(Location location, String className, JavaFileObject.Kind kind, FileObject sibling) throws IOException {
+            if (JavaFileObject.Kind.CLASS == kind) {
+                VirtualJavaFileObject virtualJavaFileObject = new VirtualJavaFileObject(className, null);
+                javaFileObjectMap.put(className, virtualJavaFileObject);
+                return virtualJavaFileObject;
+            } else {
+                return super.getJavaFileForOutput(location, className, kind, sibling);
+            }
+        }
+    }
+}

core/src/main/java/cn/enaium/joe/core/compiler/VirtualJavaFileObject.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2022 Enaium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package cn.enaium.joe.core.compiler;
+
+import javax.tools.SimpleJavaFileObject;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * @author Enaium
+ * @since 2.0.0
+ */
+public class VirtualJavaFileObject extends SimpleJavaFileObject {
+
+    private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+    private final String content;
+
+    protected VirtualJavaFileObject(String className, String content) {
+        super(URI.create("string:///" + className.replace(".", "/") + Kind.SOURCE.extension), Kind.SOURCE);
+        this.content = content;
+    }
+
+    public byte[] getBytecode() {
+        return outputStream.toByteArray();
+    }
+
+    @Override
+    public ByteArrayOutputStream openOutputStream() {
+        return outputStream;
+    }
+
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+        return content;
+    }
+}

src/main/java/cn/enaium/joe/config/Config.java → core/src/main/java/cn/enaium/joe/core/config/Config.java

@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package cn.enaium.joe.config;
+package cn.enaium.joe.core.config;
 
 /**
  * @author Enaium
- * @since 0.7.0
+ * @since 2.0.0
  */
 public class Config {
     private final String name;
-
     public Config(String name) {
         this.name = name;
     }