改用template & 提升 CI 使用的 Java 版本到 25

Author: DreamVoid

.github/workflows/maven.yml

@@ -15,19 +15,19 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4.2.2
-    - name: Set up JDK 21
+    - name: Set up JDK 25
       uses: actions/setup-java@v4.7.0
       with:
-        java-version: '21'
+        java-version: '25'
         distribution: 'zulu'
 
     - name: Set variable
       id: variables
       run: |
-        echo "PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_OUTPUT"
+        echo "version=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_OUTPUT"
 
-    - name: Update version
-      run: mvn versions:set -DnewVersion="${{ steps.variables.outputs.PROJECT_VERSION }}+github#${{ github.run_number }}" -DprocessAllModules=true -DgenerateBackupPoms=false
+    - name: Update debug build version
+      run: mvn versions:set -DnewVersion="${{ steps.variables.outputs.version }}+github#${{ github.run_number }}" -DprocessAllModules=true -DgenerateBackupPoms=false
 
     - name: Build with Maven
       run: mvn -B package --file pom.xml

MiraiMC-Base/pom.xml

@@ -60,12 +60,6 @@
                 <version>3.6.2</version>
                 <configuration>
                     <minimizeJar>false</minimizeJar>
-                    <relocations>
-                        <relocation>
-                            <pattern>PROJECT.VERSION</pattern>
-                            <shadedPattern>${project.parent.version}</shadedPattern>
-                        </relocation>
-                    </relocations>
                     <filters>
                         <filter>
                             <artifact>*:*</artifact>
@@ -87,6 +81,19 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>templating-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <id>filter-src</id>
+                        <goals>
+                            <goal>filter-sources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <!--
                 <plugin>
                     <groupId>org.jetbrains.kotlin</groupId>

MiraiMC-Base/src/main/java-templates/me/dreamvoid/miraimc/BuildConstants.java

@@ -0,0 +1,8 @@
+package me.dreamvoid.universalpluginupdater;
+
+// These constants are replaced before compilation
+@SuppressWarnings("ALL")
+public class BuildConstants {
+    public static final String VERSION = "${version}";
+    public static final String VERSION_CODE = "${versionCode}";
+}

MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/Utils.java

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import me.dreamvoid.miraimc.api.MiraiMC;
+import me.dreamvoid.universalpluginupdater.BuildConstants;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,8 +18,6 @@
 import java.util.logging.Logger;
 
 public final class Utils {
-    private static final String version = "PROJECT.VERSION";
-
     static {
         Logger logger = Logger.getLogger("MiraiMC Preload Checker");
         // 此处放置插件自检代码
@@ -127,7 +126,7 @@ public static String get(String url) throws IOException {
 
             connection.setDoInput(true);
             connection.setRequestMethod("GET");
-            connection.setRequestProperty("User-Agent", String.format("MiraiMC/%s (%s; Java %s)", version, System.getProperty("os.name"), Utils.getJavaVersion()));
+            connection.setRequestProperty("User-Agent", String.format("MiraiMC/%s (%s; Java %s)", BuildConstants.VERSION, System.getProperty("os.name"), Utils.getJavaVersion()));
             connection.setConnectTimeout(5000);
             connection.setReadTimeout(10000);
 
@@ -156,7 +155,7 @@ public static String post(JsonObject json, String url) throws IOException {
 
             connection.setDoInput(true);
             connection.setRequestMethod("POST");
-            connection.setRequestProperty("User-Agent", String.format("MiraiMC/%s (%s; Java %s)", version, System.getProperty("os.name"), Utils.getJavaVersion()));
+            connection.setRequestProperty("User-Agent", String.format("MiraiMC/%s (%s; Java %s)", BuildConstants.VERSION, System.getProperty("os.name"), Utils.getJavaVersion()));
             connection.setRequestProperty("Content-Type", "application/json");
             connection.setRequestProperty("Authorization", "Basic YWRtaW46");
             connection.setConnectTimeout(5000);
@@ -241,10 +240,21 @@ public static int getJavaVersion() {
     }
 
     /**
-     * 获取插件版本
+     * 获取插件版本名
      * @return 版本
      */
     public static String getVersion() {
-        return version;
+        return BuildConstants.VERSION;
+    }
+
+    /**
+     * 获取插件版本号
+     *
+     * @return 版本号
+     */
+    public static int getVersionCode() {
+        return Integer.parseInt(BuildConstants.VERSION_CODE);
     }
+
+
 }

MiraiMC-Velocity/pom.xml

@@ -46,12 +46,6 @@
                 <version>3.6.2</version>
                 <configuration>
                     <minimizeJar>false</minimizeJar>
-                    <relocations>
-                        <relocation>
-                            <pattern>PROJECT.VERSION</pattern>
-                            <shadedPattern>${project.parent.version}</shadedPattern>
-                        </relocation>
-                    </relocations>
                     <filters>
                         <filter>
                             <artifact>*:*</artifact>
@@ -91,31 +85,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <version>1.5.3</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <basedir>${project.build.directory}</basedir>
-                    <includes>
-                        <include>classes/velocity-plugin.json</include>
-                    </includes>
-                    <replacements>
-                        <replacement>
-                            <token>PROJECT\.VERSION\"</token>
-                            <value>${project.parent.version}\"</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

MiraiMC-Velocity/src/main/java/me/dreamvoid/miraimc/velocity/VelocityPlugin.java

@@ -24,6 +24,7 @@
 import me.dreamvoid.miraimc.interfaces.PluginConfig;
 import me.dreamvoid.miraimc.loader.LibraryLoader;
 import me.dreamvoid.miraimc.velocity.utils.Metrics;
+import me.dreamvoid.universalpluginupdater.BuildConstants;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.slf4j.Logger;
 
@@ -37,7 +38,7 @@
 @Plugin(
         id = "miraimc",
         name = "MiraiMC",
-        version = "PROJECT.VERSION",
+        version = BuildConstants.VERSION,
         description = "MiraiBot for Minecraft server",
         url = "https://github.com/DreamVoid/MiraiMC",
         authors = {"DreamVoid"}

pom.xml

@@ -48,6 +48,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <versionCode>23</versionCode>
     </properties>
 
     <dependencies>