feat #399 (#400)

Co-authored-by: daoge_cmd <[email protected]>

.github/workflows/gradle.yml

@@ -6,16 +6,16 @@ on:
     paths:
       - .github/workflows/gradle.yml
       - gradle/libs.versions.toml
-      - Allay-API/**
-      - Allay-Server/**
-      - Allay-Data/**
+      - api/**
+      - server/**
+      - data/**
   pull_request:
     paths:
       - .github/workflows/gradle.yml
       - gradle/libs.versions.toml
-      - Allay-API/**
-      - Allay-Server/**
-      - Allay-Data/**
+      - api/**
+      - server/**
+      - data/**
 
 jobs:
   build:
@@ -27,12 +27,16 @@ jobs:
         if: contains(github.ref_name, 'master')
         with:
           stack: dual
+
       - uses: actions/checkout@v4
+
       - run: chmod +x gradlew
+
       - uses: actions/setup-java@v4
         with:
           java-version: '21'
           distribution: 'zulu'
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
@@ -42,48 +46,56 @@ jobs:
           build-scan-publish: true
           build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
           build-scan-terms-of-use-agree: "yes"
+
       - name: Build
         run: ./gradlew build
+
       - name: Generate coverage reports
+        if: success()
         run: ./gradlew jacocoTestReport
+
       - name: Upload coverage reports to Codecov
         uses: codecov/[email protected]
+        if: success()
         with:
           directory: .jacoco/test/
           token: ${{ secrets.CODECOV_TOKEN }}
-      # Upload Allay-Server
+
       - name: Upload Allay-Server
         uses: actions/upload-artifact@v4
-        if: success() && contains(github.ref_name, 'master')
+        if: success()
         with:
-          name: Allay-Server
-          path: Allay-Server/build/libs/Allay-Server-shaded.jar
-      # Publish to JitPack
+          name: allay-server
+          path: server/build/libs/allay-server-shaded.jar
+
       - name: Publish to JitPack
         uses: fjogeleit/http-request-action@v1
         if: success() && github.event_name == 'push' && github.repository == 'AllayMC/Allay' && contains(github.ref_name, 'master')
         with:
           url: 'https://jitpack.io/#AllayMC/Allay/master-SNAPSHOT'
           method: 'GET'
-      # Generate information
+
       - name: Get Short SHA
         id: vars
+        if: success()
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
       - name: Format ChangeLog
         id: get-changelog
         if: success() && github.event_name == 'push' && github.repository == 'AllayMC/Allay' && contains(github.ref_name, 'master')
         run: |
           CHANGELOG=$(echo "${{ github.event.commits[0].message }}" | sed ':a;N;$!ba;s/\n/\\n/g')
           echo "changelog=$CHANGELOG" >> $GITHUB_OUTPUT
+
       - name: Get Time
         id: time
         uses: nanzm/[email protected]
         if: success() && github.event_name == 'push' && github.repository == 'AllayMC/Allay' && contains(github.ref_name, 'master')
         with:
           timeZone: 8
           format: 'YYYY/MM/DD-HH:mm:ss'
-      # Publish to MineBBS
-      - name: Update MineBBS Infomation
+
+      - name: Publish to MineBBS
         uses: fjogeleit/http-request-action@v1
         if: success() && github.event_name == 'push' && github.repository == 'AllayMC/Allay' && contains(github.ref_name, 'master')
         with:
@@ -95,7 +107,7 @@ jobs:
           escapeData: 'true'
           preventFailureOnNoResponse: 'true'
           ignoreStatusCodes: '400,404,401,403,429,500,502,503,504'
-      # Copy jar to test server
+
       - name: Copy Jar to Test Server
         id: deploy-jar
         uses: appleboy/scp-action@master
@@ -107,10 +119,10 @@ jobs:
           port: ${{ secrets.TEST_SERVER_PORT }}
           key: ${{ secrets.TEST_SERVER_SSH_KEY }}
           passphrase: ${{ secrets.TEST_SERVER_SSH_KEY_PASSPHRASE }}
-          source: "Allay-Server/build/libs/Allay-Server-shaded.jar"
+          source: "server/build/libs/allay-server-shaded.jar"
           strip_components: 3
           target: "/root/allaymc/tmp"
-      # Restart test server
+
       - name: Restart Test Server
         uses: appleboy/ssh-action@master
         if: steps.deploy-jar.outcome == 'success' && github.event_name == 'push' && github.repository == 'AllayMC/Allay' && contains(github.ref_name, 'master')

.gitignore

@@ -17,13 +17,13 @@
 .run/**
 !.run/Allay.run.xml
 # Files due to running `gradle run`
-/Allay-Server/caches
-/Allay-Server/command_data
-/Allay-Server/logs
-/Allay-Server/players
-/Allay-Server/plugins
-/Allay-Server/resource_packs
-/Allay-Server/server-settings.yml
-/Allay-Server/worlds
-/Allay-Server/ban-info.yml
-/Allay-Server/whitelist.yml
+/server/caches
+/server/command_data
+/server/logs
+/server/players
+/server/plugins
+/server/resource_packs
+/server/server-settings.yml
+/server/worlds
+/server/ban-info.yml
+/server/whitelist.yml

.run/Allay.run.xml

@@ -3,7 +3,7 @@
     <option name="ALTERNATIVE_JRE_PATH" value="21" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.allaymc.server.Allay" />
-    <module name="Allay.Allay-Server.main" />
+    <module name="Allay.server.main" />
     <option name="VM_PARAMETERS" value="-Dfile.encoding=UTF-8 -XX:+UseZGC -XX:+ZGenerational -Xmx8G -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=8099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.run" />
     <method v="2">

README.md

@@ -64,12 +64,12 @@ If you need to develop scripting plugins, we recommend using GraalVM for best pe
 
 **Run directly:**
 ```shell
-gradlew Allay-Server:runShadow
+gradlew server:runShadow
 ```
 
 **Build:**
 ```shell
-gradlew Allay-Server:build
+gradlew server:build
 ```
 
 ## Plugins
@@ -114,5 +114,5 @@ If not otherwise specified, project content is open source under the LGPL-3.0 li
 
 The contents of the following folders are open-sourced under the MIT license:
 
-- Allay-Data
-- Allay-CodeGen
+- data
+- codegen

README.ru.md

@@ -78,13 +78,13 @@ Allay основан на Java 21, поэтому перед запуском и
 **Запуск:**
 
 ```shell
-gradlew Allay-Server:runShadow
+gradlew server:runShadow
 ```
 
 **Сборка:**
 
 ```shell
-gradlew Allay-Server:build
+gradlew server:build
 ```
 
 ## Плагины
@@ -131,5 +131,5 @@ Allay поддерживает плагины, написанные на язы
 
 Содержимое следующих папок распространяется по лицензии MIT:
 
-- Allay-Data
-- Allay-CodeGen
+- data
+- codegen

README.zh.md

@@ -63,12 +63,12 @@ Allay基于Java21，故在运行&构建Allay前你需要安装Java21。
 
 **直接运行:**
 ```shell
-gradlew Allay-Server:runShadow
+gradlew server:runShadow
 ```
 
 **构建:**
 ```shell
-gradlew Allay-Server:build
+gradlew server:build
 ```
 
 ## 插件
@@ -113,5 +113,5 @@ Allay支持运行以Java/JVM或JavaScript语言编写的插件，你可以查看
 
 以下文件夹内的内容以MIT协议开源：
 
-- Allay-Data
-- Allay-CodeGen
+- data
+- codegen

Allay-API/src/main/java/org/allaymc/api/ApiInstanceHolder.java → api/src/main/java/org/allaymc/api/ApiInstanceHolder.java

@@ -5,7 +5,7 @@
 
 /**
  * ApiInstanceHolder is used to hold the API instance that
- * needs to be implemented and provided by api implementation (Allay-Server).
+ * needs to be implemented and provided by api implementation (server).
  *
  * @author daoge_cmd
  */