refactor: refactor

.github/workflows/gradle.yml

@@ -42,15 +42,9 @@ jobs:
           build-scan-terms-of-use-agree: "yes"
       - name: Build
         run: ./gradlew shadowJar
-      - name: Upload JavaScriptPluginExtension
+      - name: Upload ScriptPluginExtension
         uses: actions/upload-artifact@v4
         if: success() && contains(github.ref_name, 'main')
         with:
-          name: JavaScriptPluginExtension
-          path: javascript/build/distributions/*.zip
-      - name: Upload PythonPluginExtension
-        uses: actions/upload-artifact@v4
-        if: success() && contains(github.ref_name, 'main')
-        with:
-          name: PythonPluginExtension
-          path: python/build/distributions/*.zip
+          name: ScriptPluginExtension
+          path: build/distributions/*.zip

build.gradle.kts

@@ -1,43 +1,48 @@
 plugins {
     id("java-library")
+    id("java-library-distribution")
 }
 
-tasks.jar {
-    enabled = false
+group = "org.allaymc.scriptpluginext"
+version = "0.3.0"
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
-subprojects {
-    apply(plugin = "java-library")
+repositories {
+    mavenCentral()
+    maven("https://www.jitpack.io/")
+    maven("https://repo.opencollab.dev/maven-releases/")
+    maven("https://repo.opencollab.dev/maven-snapshots/")
+    maven("https://storehouse.okaeri.eu/repository/maven-public/")
+}
 
-    group = "org.allaymc.scriptpluginext"
+dependencies {
+    compileOnly(rootProject.libs.allay)
+    compileOnly(rootProject.libs.lombok)
 
-    java {
-        toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
-        }
-    }
+    implementation(libs.polyglot)
+    implementation(libs.javascript)
+    implementation(libs.python)
+    implementation(libs.chromeinspector)
 
-    repositories {
-        mavenCentral()
-        maven("https://www.jitpack.io/")
-        maven("https://repo.opencollab.dev/maven-releases/")
-        maven("https://repo.opencollab.dev/maven-snapshots/")
-        maven("https://storehouse.okaeri.eu/repository/maven-public/")
-    }
-
-    dependencies {
-        compileOnly(rootProject.libs.allay)
-        compileOnly(rootProject.libs.lombok)
+    annotationProcessor(rootProject.libs.lombok)
+}
 
-        annotationProcessor(rootProject.libs.lombok)
+distributions {
+    main {
+        distributionBaseName.set("ScriptPluginExtension")
     }
+}
 
-    tasks {
-        withType<JavaCompile> {
-            options.encoding = "UTF-8"
-            configureEach {
-                options.isFork = true
-            }
+tasks {
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        configureEach {
+            options.isFork = true
         }
     }
 }

common/build.gradle.kts

@@ -1,4 +0,0 @@
-dependencies {
-    api(libs.polyglot)
-    api(libs.chromeinspector)
-}

settings.gradle.kts

@@ -1,6 +1 @@
-rootProject.name = "ScriptPluginExtension"
-
-include(":common")
-include(":javascript")
-include(":python")
-
+rootProject.name = "ScriptPluginExtension"

common/src/main/java/org/allaymc/scriptpluginext/common/ScriptPluginDescriptor.java → src/main/java/org/allaymc/scriptpluginext/ScriptPluginDescriptor.java

@@ -1,4 +1,4 @@
-package org.allaymc.scriptpluginext.common;
+package org.allaymc.scriptpluginext;
 
 import lombok.Getter;
 import org.allaymc.server.plugin.SimplePluginDescriptor;

src/main/java/org/allaymc/scriptpluginext/ScriptPluginExtension.java

@@ -0,0 +1,17 @@
+package org.allaymc.scriptpluginext;
+
+import org.allaymc.scriptpluginext.javascript.JsPluginLoader;
+import org.allaymc.scriptpluginext.python.PyPluginLoader;
+import org.allaymc.server.extension.Extension;
+import org.allaymc.server.plugin.AllayPluginManager;
+
+/**
+ * @author daoge_cmd
+ */
+public class ScriptPluginExtension extends Extension {
+    @Override
+    public void main(String[] args) {
+        AllayPluginManager.registerLoaderFactory(new PyPluginLoader.PyPluginLoaderFactory());
+        AllayPluginManager.registerLoaderFactory(new JsPluginLoader.JsPluginLoaderFactory());
+    }
+}

common/src/main/java/org/allaymc/scriptpluginext/common/ScriptPluginI18nLoader.java → src/main/java/org/allaymc/scriptpluginext/ScriptPluginI18nLoader.java

@@ -1,4 +1,4 @@
-package org.allaymc.scriptpluginext.common;
+package org.allaymc.scriptpluginext;
 
 import com.google.gson.reflect.TypeToken;
 import lombok.AllArgsConstructor;

javascript/src/main/java/org/allaymc/scriptpluginext/javascript/JsPlugin.java → src/main/java/org/allaymc/scriptpluginext/javascript/JsPlugin.java

@@ -1,7 +1,7 @@
 package org.allaymc.scriptpluginext.javascript;
 
 import lombok.SneakyThrows;
-import org.allaymc.scriptpluginext.common.ScriptPluginDescriptor;
+import org.allaymc.scriptpluginext.ScriptPluginDescriptor;
 import org.allaymc.api.plugin.Plugin;
 import org.allaymc.api.plugin.PluginContainer;
 import org.graalvm.polyglot.*;

javascript/src/main/java/org/allaymc/scriptpluginext/javascript/JsPluginLoader.java → src/main/java/org/allaymc/scriptpluginext/javascript/JsPluginLoader.java

@@ -3,8 +3,8 @@
 import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.allaymc.scriptpluginext.common.ScriptPluginDescriptor;
-import org.allaymc.scriptpluginext.common.ScriptPluginI18nLoader;
+import org.allaymc.scriptpluginext.ScriptPluginDescriptor;
+import org.allaymc.scriptpluginext.ScriptPluginI18nLoader;
 import org.allaymc.api.i18n.I18n;
 import org.allaymc.api.plugin.PluginContainer;
 import org.allaymc.api.plugin.PluginDescriptor;

python/src/main/java/org/allaymc/scriptpluginext/python/PyPlugin.java → src/main/java/org/allaymc/scriptpluginext/python/PyPlugin.java

@@ -1,7 +1,7 @@
 package org.allaymc.scriptpluginext.python;
 
 import lombok.SneakyThrows;
-import org.allaymc.scriptpluginext.common.ScriptPluginDescriptor;
+import org.allaymc.scriptpluginext.ScriptPluginDescriptor;
 import org.allaymc.api.plugin.Plugin;
 import org.graalvm.polyglot.*;
 import org.graalvm.polyglot.io.IOAccess;

python/src/main/java/org/allaymc/scriptpluginext/python/PyPluginLoader.java → src/main/java/org/allaymc/scriptpluginext/python/PyPluginLoader.java

@@ -3,8 +3,8 @@
 import lombok.Getter;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.allaymc.scriptpluginext.common.ScriptPluginDescriptor;
-import org.allaymc.scriptpluginext.common.ScriptPluginI18nLoader;
+import org.allaymc.scriptpluginext.ScriptPluginDescriptor;
+import org.allaymc.scriptpluginext.ScriptPluginI18nLoader;
 import org.allaymc.api.i18n.I18n;
 import org.allaymc.api.plugin.PluginContainer;
 import org.allaymc.api.plugin.PluginDescriptor;

src/main/resources/extension.json

@@ -0,0 +1,3 @@
+{
+  "entrance": "org.allaymc.scriptpluginext.ScriptPluginExtension"
+}