From 4a76b774d12dae9c956a99f53fbddca952f12b19 Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Fri, 16 Jun 2023 21:55:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88API?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 8 ++++----
{hamster-ball-bukkit => ball-bukkit}/build.gradle | 8 ++++----
.../hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java | 0
.../hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java | 0
.../mc/plugin/ball/bukkit/data/BukkitBlockPos.java | 0
.../mc/plugin/ball/bukkit/data/BukkitLocation.java | 0
.../mc/plugin/ball/bukkit/hook/PlaceholderHook.java | 0
.../plugin/ball/bukkit/listener/BallBukkitListener.java | 4 ++--
.../src/main/resources/config.yml | 0
.../src/main/resources/plugin.yml | 0
{hamster-ball-bungeecord => ball-bungeecord}/build.gradle | 8 ++++----
.../hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java | 0
.../mc/plugin/core/bungee/api/BallBungeeCordAPI.java | 0
.../core/bungee/listener/BallBungeeCordListener.java | 4 ++--
.../mc/plugin/core/bungee/util/BallBungeeCordUtils.java | 0
.../src/main/resources/bungee.yml | 0
.../src/main/resources/config.yml | 0
{hamster-ball-common => ball-common}/build.gradle | 7 +------
.../cn/hamster3/mc/plugin/ball/common/api/BallAPI.java | 2 +-
.../hamster3/mc/plugin/ball/common/config/BallConfig.java | 0
.../plugin/ball/common/connector/BallChannelHandler.java | 0
.../ball/common/connector/BallChannelInitializer.java | 0
.../ball/common/connector/BallKeepAliveHandler.java | 0
.../hamster3/mc/plugin/ball/common/data/BallBlockPos.java | 0
.../hamster3/mc/plugin/ball/common/data/BallLocation.java | 0
.../mc/plugin/ball/common/data/BallMessageInfo.java | 0
.../mc/plugin/ball/common/entity/BallPlayerInfo.java | 0
.../mc/plugin/ball/common/entity/BallServerInfo.java | 0
.../mc/plugin/ball/common/entity/BallServerType.java | 0
.../common/event/operate/BroadcastPlayerMessageEvent.java | 0
.../common/event/operate/DispatchConsoleCommandEvent.java | 0
.../common/event/operate/DispatchPlayerCommandEvent.java | 0
.../plugin/ball/common/event/operate/KickPlayerEvent.java | 2 +-
.../common/event/operate/SendMessageToPlayerEvent.java | 0
.../common/event/operate/SendPlayerToLocationEvent.java | 0
.../common/event/operate/SendPlayerToPlayerEvent.java | 0
.../ball/common/event/player/BallPlayerChatEvent.java | 2 +-
.../common/event/player/BallPlayerConnectServerEvent.java | 0
.../common/event/player/BallPlayerInfoUpdateEvent.java | 0
.../ball/common/event/player/BallPlayerLoginEvent.java | 0
.../ball/common/event/player/BallPlayerLogoutEvent.java | 0
.../event/player/BallPlayerPostConnectServerEvent.java | 0
.../common/event/player/BallPlayerPostLoginEvent.java | 0
.../event/player/BallPlayerPreConnectServerEvent.java | 0
.../ball/common/event/player/BallPlayerPreLoginEvent.java | 0
.../ball/common/event/server/ServerOfflineEvent.java | 0
.../ball/common/event/server/ServerOnlineEvent.java | 0
.../mc/plugin/ball/common/listener/BallDebugListener.java | 4 ++--
.../mc/plugin/ball/common/listener/BallListener.java | 0
.../mc/plugin/ball/common/listener/ListenerPriority.java | 0
.../java/cn/hamster3/mc/plugin/ball/common/utils/OS.java | 0
{hamster-ball-server => ball-server}/build.gradle | 8 ++++----
.../java/cn/hamster3/mc/plugin/ball/server/Bootstrap.java | 0
.../mc/plugin/ball/server/command/CommandHandler.java | 0
.../mc/plugin/ball/server/config/ServerConfig.java | 0
.../ball/server/connector/BallServerChannelHandler.java | 0
.../server/connector/BallServerChannelInitializer.java | 0
.../ball/server/connector/BallServerKeepAliveHandler.java | 0
.../mc/plugin/ball/server/constant/ConstantObjects.java | 0
.../src/main/resources/config.yml | 0
.../src/main/resources/log4j2.component.properties | 0
.../src/main/resources/log4j2.xml | 0
build.gradle | 2 --
settings.gradle | 8 ++++----
64 files changed, 30 insertions(+), 37 deletions(-)
rename {hamster-ball-bukkit => ball-bukkit}/build.gradle (82%)
rename {hamster-ball-bukkit => ball-bukkit}/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java (100%)
rename {hamster-ball-bukkit => ball-bukkit}/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java (100%)
rename {hamster-ball-bukkit => ball-bukkit}/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitBlockPos.java (100%)
rename {hamster-ball-bukkit => ball-bukkit}/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitLocation.java (100%)
rename {hamster-ball-bukkit => ball-bukkit}/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/hook/PlaceholderHook.java (100%)
rename {hamster-ball-bukkit => ball-bukkit}/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java (98%)
rename {hamster-ball-bukkit => ball-bukkit}/src/main/resources/config.yml (100%)
rename {hamster-ball-bukkit => ball-bukkit}/src/main/resources/plugin.yml (100%)
rename {hamster-ball-bungeecord => ball-bungeecord}/build.gradle (81%)
rename {hamster-ball-bungeecord => ball-bungeecord}/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java (100%)
rename {hamster-ball-bungeecord => ball-bungeecord}/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java (100%)
rename {hamster-ball-bungeecord => ball-bungeecord}/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java (98%)
rename {hamster-ball-bungeecord => ball-bungeecord}/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/BallBungeeCordUtils.java (100%)
rename {hamster-ball-bungeecord => ball-bungeecord}/src/main/resources/bungee.yml (100%)
rename {hamster-ball-bungeecord => ball-bungeecord}/src/main/resources/config.yml (100%)
rename {hamster-ball-common => ball-common}/build.gradle (62%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java (99%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallKeepAliveHandler.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerType.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/BroadcastPlayerMessageEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchConsoleCommandEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchPlayerCommandEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java (83%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendMessageToPlayerEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToLocationEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToPlayerEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerChatEvent.java (86%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerConnectServerEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerInfoUpdateEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLoginEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLogoutEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostConnectServerEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostLoginEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreConnectServerEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreLoginEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOfflineEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOnlineEvent.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java (94%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/ListenerPriority.java (100%)
rename {hamster-ball-common => ball-common}/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java (100%)
rename {hamster-ball-server => ball-server}/build.gradle (88%)
rename {hamster-ball-server => ball-server}/src/main/java/cn/hamster3/mc/plugin/ball/server/Bootstrap.java (100%)
rename {hamster-ball-server => ball-server}/src/main/java/cn/hamster3/mc/plugin/ball/server/command/CommandHandler.java (100%)
rename {hamster-ball-server => ball-server}/src/main/java/cn/hamster3/mc/plugin/ball/server/config/ServerConfig.java (100%)
rename {hamster-ball-server => ball-server}/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java (100%)
rename {hamster-ball-server => ball-server}/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java (100%)
rename {hamster-ball-server => ball-server}/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java (100%)
rename {hamster-ball-server => ball-server}/src/main/java/cn/hamster3/mc/plugin/ball/server/constant/ConstantObjects.java (100%)
rename {hamster-ball-server => ball-server}/src/main/resources/config.yml (100%)
rename {hamster-ball-server => ball-server}/src/main/resources/log4j2.component.properties (100%)
rename {hamster-ball-server => ball-server}/src/main/resources/log4j2.xml (100%)
diff --git a/README.md b/README.md
index d2db94f..5f3a310 100644
--- a/README.md
+++ b/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 {
cn.hamster3.mc.plugin
- hamster-ball-bukkit
+ ball-bukkit
1.0.0
cn.hamster3.mc.plugin
- hamster-ball-bungeecord
+ ball-bungeecord
1.0.0
diff --git a/hamster-ball-bukkit/build.gradle b/ball-bukkit/build.gradle
similarity index 82%
rename from hamster-ball-bukkit/build.gradle
rename to ball-bukkit/build.gradle
index ca0616e..a878953 100644
--- a/hamster-ball-bukkit/build.gradle
+++ b/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([
diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
similarity index 100%
rename from hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
rename to ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
similarity index 100%
rename from hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
rename to ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitBlockPos.java b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitBlockPos.java
similarity index 100%
rename from hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitBlockPos.java
rename to ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitBlockPos.java
diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitLocation.java b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitLocation.java
similarity index 100%
rename from hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitLocation.java
rename to ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/data/BukkitLocation.java
diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/hook/PlaceholderHook.java b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/hook/PlaceholderHook.java
similarity index 100%
rename from hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/hook/PlaceholderHook.java
rename to ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/hook/PlaceholderHook.java
diff --git a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java b/ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java
similarity index 98%
rename from hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java
rename to ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java
index b0af4b8..ddc0da0 100644
--- a/hamster-ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/listener/BallBukkitListener.java
+++ b/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;
diff --git a/hamster-ball-bukkit/src/main/resources/config.yml b/ball-bukkit/src/main/resources/config.yml
similarity index 100%
rename from hamster-ball-bukkit/src/main/resources/config.yml
rename to ball-bukkit/src/main/resources/config.yml
diff --git a/hamster-ball-bukkit/src/main/resources/plugin.yml b/ball-bukkit/src/main/resources/plugin.yml
similarity index 100%
rename from hamster-ball-bukkit/src/main/resources/plugin.yml
rename to ball-bukkit/src/main/resources/plugin.yml
diff --git a/hamster-ball-bungeecord/build.gradle b/ball-bungeecord/build.gradle
similarity index 81%
rename from hamster-ball-bungeecord/build.gradle
rename to ball-bungeecord/build.gradle
index 5269926..87c57af 100644
--- a/hamster-ball-bungeecord/build.gradle
+++ b/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([
diff --git a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java b/ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java
similarity index 100%
rename from hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java
rename to ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterBallPlugin.java
diff --git a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java b/ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java
similarity index 100%
rename from hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java
rename to ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java
diff --git a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java b/ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java
similarity index 98%
rename from hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java
rename to ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java
index 0b74081..d3a5491 100644
--- a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/listener/BallBungeeCordListener.java
+++ b/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;
diff --git a/hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/BallBungeeCordUtils.java b/ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/BallBungeeCordUtils.java
similarity index 100%
rename from hamster-ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/BallBungeeCordUtils.java
rename to ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/util/BallBungeeCordUtils.java
diff --git a/hamster-ball-bungeecord/src/main/resources/bungee.yml b/ball-bungeecord/src/main/resources/bungee.yml
similarity index 100%
rename from hamster-ball-bungeecord/src/main/resources/bungee.yml
rename to ball-bungeecord/src/main/resources/bungee.yml
diff --git a/hamster-ball-bungeecord/src/main/resources/config.yml b/ball-bungeecord/src/main/resources/config.yml
similarity index 100%
rename from hamster-ball-bungeecord/src/main/resources/config.yml
rename to ball-bungeecord/src/main/resources/config.yml
diff --git a/hamster-ball-common/build.gradle b/ball-common/build.gradle
similarity index 62%
rename from hamster-ball-common/build.gradle
rename to ball-common/build.gradle
index f3db9f7..31e8104 100644
--- a/hamster-ball-common/build.gradle
+++ b/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'
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
similarity index 99%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
index eec082f..38945e2 100644
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
+++ b/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;
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelHandler.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallChannelInitializer.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallKeepAliveHandler.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallKeepAliveHandler.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallKeepAliveHandler.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/connector/BallKeepAliveHandler.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerInfo.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerType.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerType.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerType.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallServerType.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/BroadcastPlayerMessageEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/BroadcastPlayerMessageEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/BroadcastPlayerMessageEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/BroadcastPlayerMessageEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchConsoleCommandEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchConsoleCommandEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchConsoleCommandEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchConsoleCommandEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchPlayerCommandEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchPlayerCommandEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchPlayerCommandEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/DispatchPlayerCommandEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java
similarity index 83%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java
index 0e83ad2..64bee96 100644
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/KickPlayerEvent.java
+++ b/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;
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendMessageToPlayerEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendMessageToPlayerEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendMessageToPlayerEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendMessageToPlayerEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToLocationEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToLocationEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToLocationEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToLocationEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToPlayerEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToPlayerEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToPlayerEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/operate/SendPlayerToPlayerEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerChatEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerChatEvent.java
similarity index 86%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerChatEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerChatEvent.java
index 837c548..d42e1dc 100644
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerChatEvent.java
+++ b/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;
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerConnectServerEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerConnectServerEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerConnectServerEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerConnectServerEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerInfoUpdateEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerInfoUpdateEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerInfoUpdateEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerInfoUpdateEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLoginEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLoginEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLoginEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLoginEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLogoutEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLogoutEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLogoutEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerLogoutEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostConnectServerEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostConnectServerEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostConnectServerEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostConnectServerEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostLoginEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostLoginEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostLoginEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPostLoginEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreConnectServerEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreConnectServerEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreConnectServerEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreConnectServerEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreLoginEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreLoginEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreLoginEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/player/BallPlayerPreLoginEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOfflineEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOfflineEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOfflineEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOfflineEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOnlineEvent.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOnlineEvent.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOnlineEvent.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/event/server/ServerOnlineEvent.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java
similarity index 94%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java
index da0fea9..6a0d32b 100644
--- a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallDebugListener.java
+++ b/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
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallListener.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/ListenerPriority.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/ListenerPriority.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/ListenerPriority.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/ListenerPriority.java
diff --git a/hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java
similarity index 100%
rename from hamster-ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java
rename to ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/utils/OS.java
diff --git a/hamster-ball-server/build.gradle b/ball-server/build.gradle
similarity index 88%
rename from hamster-ball-server/build.gradle
rename to ball-server/build.gradle
index c309f88..66b44bf 100644
--- a/hamster-ball-server/build.gradle
+++ b/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')
diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/Bootstrap.java b/ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/Bootstrap.java
similarity index 100%
rename from hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/Bootstrap.java
rename to ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/Bootstrap.java
diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/command/CommandHandler.java b/ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/command/CommandHandler.java
similarity index 100%
rename from hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/command/CommandHandler.java
rename to ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/command/CommandHandler.java
diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/config/ServerConfig.java b/ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/config/ServerConfig.java
similarity index 100%
rename from hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/config/ServerConfig.java
rename to ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/config/ServerConfig.java
diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java b/ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java
similarity index 100%
rename from hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java
rename to ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelHandler.java
diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java b/ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java
similarity index 100%
rename from hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java
rename to ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerChannelInitializer.java
diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java b/ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java
similarity index 100%
rename from hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java
rename to ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/connector/BallServerKeepAliveHandler.java
diff --git a/hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/constant/ConstantObjects.java b/ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/constant/ConstantObjects.java
similarity index 100%
rename from hamster-ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/constant/ConstantObjects.java
rename to ball-server/src/main/java/cn/hamster3/mc/plugin/ball/server/constant/ConstantObjects.java
diff --git a/hamster-ball-server/src/main/resources/config.yml b/ball-server/src/main/resources/config.yml
similarity index 100%
rename from hamster-ball-server/src/main/resources/config.yml
rename to ball-server/src/main/resources/config.yml
diff --git a/hamster-ball-server/src/main/resources/log4j2.component.properties b/ball-server/src/main/resources/log4j2.component.properties
similarity index 100%
rename from hamster-ball-server/src/main/resources/log4j2.component.properties
rename to ball-server/src/main/resources/log4j2.component.properties
diff --git a/hamster-ball-server/src/main/resources/log4j2.xml b/ball-server/src/main/resources/log4j2.xml
similarity index 100%
rename from hamster-ball-server/src/main/resources/log4j2.xml
rename to ball-server/src/main/resources/log4j2.xml
diff --git a/build.gradle b/build.gradle
index 7e1534f..726caa2 100644
--- a/build.gradle
+++ b/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
}
}
diff --git a/settings.gradle b/settings.gradle
index 457151b..6b5a392 100644
--- a/settings.gradle
+++ b/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'