feat: 适配新版API更新

README.md

@@ -32,9 +32,9 @@ repositories {
 
 dependencies {
     // 对于 Bukkit 插件
-    compileOnly "cn.hamster3.mc.plugin:hamster-ball-bukkit:1.0.0"
+    compileOnly "cn.hamster3.mc.plugin:ball-bukkit:1.0.0"
     // 对于 BungeeCord 插件
-    compileOnly "cn.hamster3.mc.plugin:hamster-ball-bungeecord:1.0.0"
+    compileOnly "cn.hamster3.mc.plugin:ball-bungeecord:1.0.0"
 }
 ```
 
@@ -56,13 +56,13 @@ dependencies {
         <!--对于 Bukkit 插件-->
         <dependency>
             <groupId>cn.hamster3.mc.plugin</groupId>
-            <artifactId>hamster-ball-bukkit</artifactId>
+            <artifactId>ball-bukkit</artifactId>
             <version>1.0.0</version>
         </dependency>
         <!--对于 BungeeCord 插件-->
         <dependency>
             <groupId>cn.hamster3.mc.plugin</groupId>
-            <artifactId>hamster-ball-bungeecord</artifactId>
+            <artifactId>ball-bungeecord</artifactId>
             <version>1.0.0</version>
         </dependency>
     </dependencies>

ball-bukkit/build.gradle

@@ -1,14 +1,14 @@
 setArchivesBaseName("HamsterBall-Bukkit")
 
-evaluationDependsOn(':hamster-ball-common')
+evaluationDependsOn(':ball-common')
 
 dependencies {
-    apiShade project(":hamster-ball-common") transitive false
+    apiShade project(":ball-common") transitive false
 
     //noinspection VulnerableLibrariesLocal
     compileOnly 'org.spigotmc:spigot-api:1.19.4-R0.1-SNAPSHOT'
 
-    compileOnly "cn.hamster3.mc.plugin.core:bukkit:${hamster_core_version}"
+    compileOnly "cn.hamster3.mc.plugin:core-bukkit:${hamster_core_version}"
     compileOnly "me.clip:placeholderapi:2.11.2" transitive false
 }
 
@@ -20,7 +20,7 @@ processResources {
     duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
-tasks.compileJava.dependsOn(":hamster-ball-common:build")
+tasks.compileJava.dependsOn(":ball-common:build")
 tasks.register("shadowJar", Jar) {
     dependsOn("jar")
     from([

ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java

@@ -12,10 +12,10 @@ import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
 import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
 import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
 import cn.hamster3.mc.plugin.core.common.util.Pair;
+import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.audience.Audience;
+import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.TextReplacementConfig;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import net.kyori.adventure.audience.Audience;
-import net.kyori.adventure.text.TextReplacementConfig;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

ball-bungeecord/build.gradle

@@ -1,14 +1,14 @@
 setArchivesBaseName("HamsterBall-BungeeCord")
 
-evaluationDependsOn(':hamster-ball-common')
+evaluationDependsOn(':ball-common')
 
 dependencies {
-    apiShade project(":hamster-ball-common") transitive false
+    apiShade project(":ball-common") transitive false
 
     //noinspection VulnerableLibrariesLocal
     compileOnly 'net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT' exclude group: 'io.netty'
 
-    compileOnly "cn.hamster3.mc.plugin.core:bungeecord:${hamster_core_version}"
+    compileOnly "cn.hamster3.mc.plugin:core-bungeecord:${hamster_core_version}"
 }
 
 processResources {
@@ -19,7 +19,7 @@ processResources {
     duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
-tasks.compileJava.dependsOn(":hamster-ball-common:build")
+tasks.compileJava.dependsOn(":ball-common:build")
 tasks.register("shadowJar", Jar) {
     dependsOn("jar")
     from([

ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java

@@ -11,8 +11,8 @@ import cn.hamster3.mc.plugin.core.bungee.HamsterBallPlugin;
 import cn.hamster3.mc.plugin.core.bungee.util.BallBungeeCordUtils;
 import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
 import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
-import net.kyori.adventure.audience.Audience;
-import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
+import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.audience.Audience;
+import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.config.ServerInfo;

ball-common/build.gradle

@@ -8,12 +8,7 @@ dependencies {
     // https://mvnrepository.com/artifact/io.netty/netty-all
     compileOnly 'io.netty:netty-all:4.1.86.Final'
 
-    compileOnly "cn.hamster3.mc.plugin.core:common:${hamster_core_version}"
-
-    // https://mvnrepository.com/artifact/net.kyori/adventure-api
-    compileOnly 'net.kyori:adventure-api:4.11.0'
-    // https://mvnrepository.com/artifact/net.kyori/adventure-text-serializer-plain
-    compileOnly 'net.kyori:adventure-text-serializer-plain:4.11.0'
+    compileOnly "cn.hamster3.mc.plugin:core-common:${hamster_core_version}"
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0'

ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java

@@ -18,6 +18,7 @@ import cn.hamster3.mc.plugin.ball.common.utils.OS;
 import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
 import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
 import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
+import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.Component;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import io.netty.bootstrap.Bootstrap;
@@ -25,7 +26,6 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java

@@ -1,8 +1,8 @@
 package cn.hamster3.mc.plugin.ball.common.event.operate;
 
+import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.Component;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;

ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerChatEvent.java

@@ -1,8 +1,8 @@
 package cn.hamster3.mc.plugin.ball.common.event.player;
 
+import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.Component;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;

ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java

@@ -5,7 +5,7 @@ import cn.hamster3.mc.plugin.ball.common.data.BallMessageInfo;
 import cn.hamster3.mc.plugin.ball.common.event.player.*;
 import cn.hamster3.mc.plugin.ball.common.event.server.ServerOfflineEvent;
 import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.logging.Level;
@@ -84,7 +84,7 @@ public final class BallDebugListener implements BallListener {
         BallAPI.getInstance().getLogger().info("BallPlayerChatEvent: ");
         BallAPI.getInstance().getLogger().info("displayName: " + event.getDisplayName());
         BallAPI.getInstance().getLogger().info("playerUUID: " + event.getPlayerUUID());
-        BallAPI.getInstance().getLogger().info("message: " + PlainTextComponentSerializer.plainText().serialize(event.getMessage()));
+        BallAPI.getInstance().getLogger().info("message: " + JSONComponentSerializer.json().serialize(event.getMessage()));
     }
 
     @Override

ball-server/build.gradle

@@ -1,10 +1,10 @@
 setArchivesBaseName("HamsterBall-Server")
 
-evaluationDependsOn(':hamster-ball-common')
+evaluationDependsOn(':ball-common')
 
 dependencies {
-    apiShade project(":hamster-ball-common") transitive false
-    shade "cn.hamster3.mc.plugin.core:common:${hamster_core_version}"
+    apiShade project(":ball-common") transitive false
+    shade "cn.hamster3.mc.plugin:core-common:${hamster_core_version}"
 
 //    // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
 //    implementation 'org.slf4j:slf4j-api:2.0.3'
@@ -30,7 +30,7 @@ test {
     useJUnitPlatform()
 }
 
-tasks.compileJava.dependsOn(":hamster-ball-common:build")
+tasks.compileJava.dependsOn(":ball-common:build")
 tasks.register("shadowJar", Jar) {
     dependsOn("jar")
     manifest.attributes('Main-Class': 'cn.hamster3.mc.plugin.ball.server.Bootstrap')

build.gradle

@@ -64,8 +64,6 @@ subprojects {
     publishing {
         publications {
             mavenJava(MavenPublication) {
-                def projectNameSplit = project.name.split('-')
-                artifactId = projectNameSplit[projectNameSplit.length - 1]
                 from project.components.java
             }
         }

settings.gradle

@@ -1,6 +1,6 @@
 rootProject.name = 'hamster-ball'
-include 'hamster-ball-common'
-include 'hamster-ball-bukkit'
-include 'hamster-ball-bungeecord'
-include 'hamster-ball-server'
+include 'ball-common'
+include 'ball-bukkit'
+include 'ball-bungeecord'
+include 'ball-server'