release: 1.0.0-alpha.1 (Merge pull request #5 from erha134/main)

chore(Workflows): 更新 Workflows

.github/workflows/check.yml

@@ -0,0 +1,31 @@
+name: PR Check
+
+on:
+  pull_request:
+
+jobs:
+  test:
+    permissions:
+      contents: write
+      discussions: write
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Setup jdk 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - uses: gradle/wrapper-validation-action@v2
+
+      - name: Fix Gradle permission
+        run: chmod +x gradlew
+
+      - name: Test with Gradle
+        run: ./gradlew buildArtifacts test --stacktrace --no-daemon

.github/workflows/push.yml

@@ -0,0 +1,64 @@
+name: Push Build
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    if: ${{ !startsWith(github.ref.name, 'refs/tags/') && contains(github.event.head_commit.message, '[build skip]') == false }}
+    permissions:
+      contents: write
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Setup jdk 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - uses: gradle/wrapper-validation-action@v2
+
+      - name: Fix Gradle permission
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew buildArtifacts --stacktrace --no-daemon
+
+      - name: Get short SHA
+        run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+
+      - name: Read Properties info
+        id: prop_info
+        uses: christian-draeger/[email protected]
+        with:
+          path: gradle.properties
+          properties: "release_version"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: TubeNekoPlugin-${{ env.SHORT_SHA }}
+          path: |
+            build/libs/*.jar
+
+      - name: Create GitHub Release
+        if: ${{ contains(github.event.head_commit.message, '[publish skip]') == false && contains(github.event.head_commit.message, 'release:') }}
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            build/libs/*.jar
+            !build/libs/*-dev.jar
+            !build/libs/*-dev-source.jar
+          name: ${{ steps.prop_info.outputs.release_version }}
+          tag_name: ${{ steps.prop_info.outputs.release_version }}-${{ env.SHORT_SHA }}
+          make_latest: "true"
+          target_commitish: ${{ github.event.ref }}
+          generate_release_notes: true
+          token: ${{ secrets.RELEASE_TOKEN }}

build.gradle

@@ -7,9 +7,9 @@ plugins {
 allprojects {
     apply plugin: "java"
 
-    group = 'xyz.tcbuildmc.minecraft'
-    version = '1.0.0-SNAPSHOT'
-    base.archivesName = "HorizontalNekoPlugin-" + project.name
+    group = rootProject.maven_group
+    version = rootProject.release_version
+    base.archivesName = "${rootProject.archives_base_name}-${project.name}"
 
     repositories {
         mavenLocal()
@@ -63,10 +63,14 @@ allprojects {
     compileJava.dependsOn(clean)
 
     jar {
+        archiveClassifier.set "dev"
+
         zip64 true
     }
 
     sourcesJar {
+        archiveClassifier.set "dev-source"
+
         duplicatesStrategy DuplicatesStrategy.EXCLUDE
     }
 }
@@ -81,20 +85,24 @@ subprojects {
         annotationProcessor 'org.projectlombok:lombok:1.18.32'
         compileOnly 'org.projectlombok:lombok:1.18.32'
 
-        implementation "com.electronwill.night-config:toml:3.6.7"
+        annotationProcessor(testImplementation("org.projectlombok:lombok:1.18.30"))
+        testImplementation platform('org.junit:junit-bom:5.10.2')
+        testImplementation 'org.junit.jupiter:junit-jupiter'
     }
 
-    shadowJar {
-        dependencies {
-            include dependency("com.electronwill.night-config:core:3.6.7")
-            include dependency("com.electronwill.night-config:toml:3.6.7")
-        }
+    test {
+        useJUnitPlatform()
 
-        def reloc = { String from, String dest ->
-            relocate from, dest
+        ignoreFailures true
+
+        testLogging {
+            exceptionFormat = 'full'
+            events "passed", "skipped", "failed"
         }
+    }
 
-        reloc "com.electronwill.nightconfig", "xyz.tcbuildmc.minecraft.hnp.nightconfig"
+    shadowJar {
+        archiveClassifier.set null
 
         zip64 true
     }
@@ -114,20 +122,19 @@ subprojects {
 }
 
 tasks.register("buildArtifacts") {
-    logger.lifecycle(":step1 build subprojects")
-
     subprojects {
         dependsOn project.tasks.named("build").get()
         dependsOn project.tasks.named("shadowJar").get()
     }
 
     doFirst {
-        logger.lifecycle(":step2 clean buildLibs of rootProject")
+        logger.lifecycle(":executing 2 steps to build artifacts")
+        logger.lifecycle(":step1 clean buildLibs of rootProject")
         delete fileTree(rootProject.buildDir.toPath().resolve("libs")) {
             include '*'
         }
 
-        logger.lifecycle(":step3 copy buildLibs from subprojects")
+        logger.lifecycle(":step2 copy buildLibs from subprojects")
         subprojects {
             copy {
                 from(project.buildDir.toPath().resolve("libs")) {

bukkit/build.gradle

@@ -1,4 +1,6 @@
 dependencies {
+    implementation project(path: ":common", configuration: "shadow")
+
     compileOnly "org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT"
     compileOnly "me.clip:placeholderapi:2.11.5"
     implementation "dev.jorel:commandapi-bukkit-shade:9.3.0"
@@ -15,14 +17,15 @@ processResources {
 
 shadowJar {
     dependencies {
+        include project(":common")
         include dependency("dev.jorel:commandapi-bukkit-shade:9.3.0")
     }
 
     def reloc = { String from, String dest ->
         relocate from, dest
     }
 
-    reloc "dev.jorel.commandapi", "xyz.tcbuildmc.minecraft.hnp.commandapi"
+    reloc "dev.jorel.commandapi", "xyz.tcbuildmc.minecraft.hnp.bukkit.commandapi"
 
     zip64 true
 }

bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/bukkit/HorizontalNekoPlugin.java

@@ -0,0 +1,41 @@
+package xyz.tcbuildmc.minecraft.hnp.bukkit;
+
+import dev.jorel.commandapi.CommandAPI;
+import dev.jorel.commandapi.CommandAPIBukkitConfig;
+import lombok.Getter;
+import org.bukkit.plugin.java.JavaPlugin;
+import xyz.tcbuildmc.minecraft.hnp.bukkit.command.HorizontalNekoCommands;
+import xyz.tcbuildmc.minecraft.hnp.common.HorizontalNekoPluginConfigHelper;
+
+@Getter
+public final class HorizontalNekoPlugin extends JavaPlugin {
+    private static HorizontalNekoPlugin instance;
+    private static HorizontalNekoPluginConfigHelper config;
+
+    public HorizontalNekoPlugin() {
+        HorizontalNekoPlugin.instance = this;
+        HorizontalNekoPlugin.config = new HorizontalNekoPluginConfigHelper(HorizontalNekoPlugin.class);
+    }
+
+    @Override
+    public void onLoad() {
+        // CommandAPI Initialize
+        CommandAPI.onLoad(new CommandAPIBukkitConfig(this).verboseOutput(true));
+
+        HorizontalNekoCommands.register();
+    }
+
+    @Override
+    public void onEnable() {
+        CommandAPI.onEnable();
+
+        config.load();
+    }
+
+    @Override
+    public void onDisable() {
+        config.close();
+
+        CommandAPI.onDisable();
+    }
+}

bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/command/HorizontalNekoCommands.java → bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/bukkit/command/HorizontalNekoCommands.java

@@ -1,8 +1,8 @@
-package xyz.tcbuildmc.minecraft.hnp.command;
+package xyz.tcbuildmc.minecraft.hnp.bukkit.command;
 
 import org.bukkit.ChatColor;
-import xyz.tcbuildmc.minecraft.hnp.util.CommandUtils;
-import xyz.tcbuildmc.minecraft.hnp.util.TextUtils;
+import xyz.tcbuildmc.minecraft.hnp.bukkit.util.BukkitHolderString;
+import xyz.tcbuildmc.minecraft.hnp.bukkit.util.CommandUtils;
 
 import java.util.Random;
 
@@ -12,7 +12,7 @@ public static void register() {
                 .executes((sender, args) -> {
                     Random random = new Random();
 
-                    sender.sendMessage(TextUtils.formatted("Your lucky number is: %number%")
+                    sender.sendMessage(new BukkitHolderString("Your lucky number is: %number%")
                             .appendColor(ChatColor.AQUA)
                             .replaceHolder("%number%", random.nextInt(100))
                             .toString());

bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/bukkit/command/LuckyCommand.java

@@ -0,0 +1,4 @@
+package xyz.tcbuildmc.minecraft.hnp.bukkit.command;
+
+public final class LuckyCommand {
+}

bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/bukkit/hook/papi/PlaceholderAPIHook.java

@@ -0,0 +1,4 @@
+package xyz.tcbuildmc.minecraft.hnp.bukkit.hook.papi;
+
+public class PlaceholderAPIHook {
+}

bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/bukkit/util/BukkitHolderString.java

@@ -0,0 +1,18 @@
+package xyz.tcbuildmc.minecraft.hnp.bukkit.util;
+
+import org.bukkit.ChatColor;
+import xyz.tcbuildmc.common.util.HolderString;
+
+public class BukkitHolderString extends HolderString {
+    public BukkitHolderString(String string) {
+        super(string);
+    }
+
+    public BukkitHolderString() {
+    }
+
+    public BukkitHolderString appendColor(ChatColor color) {
+        this.setString(color + this.getString());
+        return this;
+    }
+}

bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/util/CommandUtils.java → bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/bukkit/util/CommandUtils.java

@@ -1,4 +1,4 @@
-package xyz.tcbuildmc.minecraft.hnp.util;
+package xyz.tcbuildmc.minecraft.hnp.bukkit.util;
 
 import dev.jorel.commandapi.CommandAPICommand;
 import dev.jorel.commandapi.CommandPermission;
@@ -10,7 +10,7 @@
 import org.bukkit.command.ProxiedCommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import xyz.tcbuildmc.minecraft.hnp.annotations.Testing;
+import xyz.tcbuildmc.common.annotations.Testing;
 
 import java.util.List;
 import java.util.function.Predicate;

bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/util/ExecutorSupplier.java → bukkit/src/main/java/xyz/tcbuildmc/minecraft/hnp/bukkit/util/ExecutorSupplier.java

@@ -1,7 +1,7 @@
-package xyz.tcbuildmc.minecraft.hnp.util;
+package xyz.tcbuildmc.minecraft.hnp.bukkit.util;
 
 import dev.jorel.commandapi.executors.CommandArguments;
-import xyz.tcbuildmc.minecraft.hnp.annotations.Testing;
+import xyz.tcbuildmc.common.annotations.Testing;
 
 @Testing
 @FunctionalInterface