diff --git a/hamster-auto-server-info/build.gradle b/hamster-auto-server-info/build.gradle index ed4e66a..7933e04 100644 --- a/hamster-auto-server-info/build.gradle +++ b/hamster-auto-server-info/build.gradle @@ -2,5 +2,5 @@ version = '1.0.0' setArchivesBaseName("HamsterAuto-ServerInfo") dependencies { - compileOnly "cn.hamster3.mc.plugin.ball:common:${hamster_ball_version}" + compileOnly "cn.hamster3.mc.plugin:ball-common:${hamster_ball_version}" } diff --git a/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/ServerInfoPlugin.java b/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/ServerInfoPlugin.java index 08960e9..8c44d41 100644 --- a/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/ServerInfoPlugin.java +++ b/hamster-auto-server-info/src/main/java/cn/hamster3/mc/plugin/auto/server/info/ServerInfoPlugin.java @@ -25,6 +25,7 @@ public class ServerInfoPlugin extends Plugin implements BallListener { @Override public void onEnable() { ProxyServer.getInstance().getServers().clear(); + getLogger().info("已清除配置文件中子服接入点配置."); for (BallServerInfo serverInfo : BallAPI.getInstance().getAllServerInfo().values()) { if (serverInfo.getType() != BallServerType.GAME) { continue; diff --git a/hamster-ball-bridge/build.gradle b/hamster-ball-bridge/build.gradle index 098eaa6..3a6bcd3 100644 --- a/hamster-ball-bridge/build.gradle +++ b/hamster-ball-bridge/build.gradle @@ -2,8 +2,8 @@ version = '1.1.2' setArchivesBaseName("HamsterBall-Bridge") dependencies { - compileOnly "cn.hamster3.mc.plugin.ball:common:${hamster_ball_version}" - compileOnly "cn.hamster3.mc.plugin.core:bukkit:${hamster_core_version}" + compileOnly "cn.hamster3.mc.plugin:ball-common:${hamster_ball_version}" + compileOnly "cn.hamster3.mc.plugin:core-bukkit:${hamster_core_version}" compileOnly "me.clip:placeholderapi:${placeholder_api_version}" } diff --git a/hamster-join-message/build.gradle b/hamster-join-message/build.gradle index a7297c6..ff1db73 100644 --- a/hamster-join-message/build.gradle +++ b/hamster-join-message/build.gradle @@ -5,5 +5,5 @@ dependencies { //noinspection VulnerableLibrariesLocal compileOnly "net.md-5:bungeecord-api:${bungeecord_api_version}" - compileOnly "cn.hamster3.mc.plugin.core:bungeecord:${hamster_core_version}" + compileOnly "cn.hamster3.mc.plugin:core-bungeecord:${hamster_core_version}" } diff --git a/hamster-join-message/src/main/java/cn/hamster3/mc/plugin/join/message/bungee/JoinMessagePlugin.java b/hamster-join-message/src/main/java/cn/hamster3/mc/plugin/join/message/bungee/JoinMessagePlugin.java index ea8cf63..7dc4abb 100644 --- a/hamster-join-message/src/main/java/cn/hamster3/mc/plugin/join/message/bungee/JoinMessagePlugin.java +++ b/hamster-join-message/src/main/java/cn/hamster3/mc/plugin/join/message/bungee/JoinMessagePlugin.java @@ -1,9 +1,9 @@ package cn.hamster3.mc.plugin.join.message.bungee; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.TranslatableComponent; -import net.kyori.adventure.text.format.NamedTextColor; +import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.Component; +import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.TranslatableComponent; +import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.format.NamedTextColor; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PlayerDisconnectEvent; diff --git a/hamster-lobby/build.gradle b/hamster-lobby/build.gradle index b0f2af9..39bd7f9 100644 --- a/hamster-lobby/build.gradle +++ b/hamster-lobby/build.gradle @@ -5,6 +5,6 @@ dependencies { //noinspection VulnerableLibrariesLocal compileOnly "net.md-5:bungeecord-api:${bungeecord_api_version}" - compileOnly "cn.hamster3.mc.plugin.core:bukkit:${hamster_core_version}" - compileOnly "cn.hamster3.mc.plugin.ball:bukkit:${hamster_ball_version}" + compileOnly "cn.hamster3.mc.plugin:core-bukkit:${hamster_core_version}" + compileOnly "cn.hamster3.mc.plugin:ball-bukkit:${hamster_ball_version}" } diff --git a/hamster-name-case-fix/build.gradle b/hamster-name-case-fix/build.gradle index f5b2610..393617f 100644 --- a/hamster-name-case-fix/build.gradle +++ b/hamster-name-case-fix/build.gradle @@ -4,5 +4,5 @@ setArchivesBaseName("HamsterNameCaseFix") dependencies { //noinspection VulnerableLibrariesLocal compileOnly "net.md-5:bungeecord-api:${bungeecord_api_version}" - compileOnly "cn.hamster3.mc.plugin.ball:common:${hamster_ball_version}" + compileOnly "cn.hamster3.mc.plugin:ball-common:${hamster_ball_version}" } diff --git a/hamster-spawn/build.gradle b/hamster-spawn/build.gradle index ce58739..6e1ae71 100644 --- a/hamster-spawn/build.gradle +++ b/hamster-spawn/build.gradle @@ -5,6 +5,6 @@ dependencies { //noinspection VulnerableLibrariesLocal compileOnly "net.md-5:bungeecord-api:${bungeecord_api_version}" - compileOnly "cn.hamster3.mc.plugin.core:bukkit:${hamster_core_version}" - compileOnly "cn.hamster3.mc.plugin.ball:bukkit:${hamster_ball_version}" + compileOnly "cn.hamster3.mc.plugin:core-bukkit:${hamster_core_version}" + compileOnly "cn.hamster3.mc.plugin:ball-bukkit:${hamster_ball_version}" } diff --git a/hamster-sudo/build.gradle b/hamster-sudo/build.gradle index f51daea..734ebc1 100644 --- a/hamster-sudo/build.gradle +++ b/hamster-sudo/build.gradle @@ -2,5 +2,5 @@ version = '1.0.0' setArchivesBaseName("HamsterSudo") dependencies { - compileOnly "cn.hamster3.mc.plugin.ball:common:${hamster_ball_version}" + compileOnly "cn.hamster3.mc.plugin:ball-common:${hamster_ball_version}" } diff --git a/hamster-tpa/build.gradle b/hamster-tpa/build.gradle index e2467ab..acc40af 100644 --- a/hamster-tpa/build.gradle +++ b/hamster-tpa/build.gradle @@ -2,6 +2,6 @@ version = '1.0.0' setArchivesBaseName("HamsterTPA") dependencies { - compileOnly "cn.hamster3.mc.plugin.core:bukkit:${hamster_ball_version}" - compileOnly "cn.hamster3.mc.plugin.ball:common:${hamster_ball_version}" + compileOnly "cn.hamster3.mc.plugin:core-bukkit:${hamster_ball_version}" + compileOnly "cn.hamster3.mc.plugin:ball-common:${hamster_ball_version}" } diff --git a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/command/TPACommand.java b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/command/TPACommand.java index 722ab37..348f0bd 100644 --- a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/command/TPACommand.java +++ b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/command/TPACommand.java @@ -5,12 +5,12 @@ import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo; import cn.hamster3.mc.plugin.core.bukkit.command.ParentCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; import cn.hamster3.mc.plugin.core.common.util.CoreUtils; +import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.TextReplacementConfig; import cn.hamster3.mc.plugin.tpa.HamsterTPAPlugin; import cn.hamster3.mc.plugin.tpa.config.ConfigManager; import cn.hamster3.mc.plugin.tpa.core.DataManager; import cn.hamster3.mc.plugin.tpa.core.Message; import cn.hamster3.mc.plugin.tpa.thread.TimeoutThread; -import net.kyori.adventure.text.TextReplacementConfig; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/command/TPDenyCommand.java b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/command/TPDenyCommand.java index f6c74a0..85bee87 100644 --- a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/command/TPDenyCommand.java +++ b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/command/TPDenyCommand.java @@ -3,11 +3,11 @@ package cn.hamster3.mc.plugin.tpa.command; import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.mc.plugin.core.bukkit.command.ParentCommand; import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage; +import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.TextReplacementConfig; import cn.hamster3.mc.plugin.tpa.HamsterTPAPlugin; import cn.hamster3.mc.plugin.tpa.config.ConfigManager; import cn.hamster3.mc.plugin.tpa.core.DataManager; import cn.hamster3.mc.plugin.tpa.core.Message; -import net.kyori.adventure.text.TextReplacementConfig; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/core/Message.java b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/core/Message.java index c0d0201..8b5224d 100644 --- a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/core/Message.java +++ b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/core/Message.java @@ -3,8 +3,8 @@ package cn.hamster3.mc.plugin.tpa.core; import cn.hamster3.mc.plugin.core.bukkit.api.CoreBukkitAPI; import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; -import net.kyori.adventure.audience.Audience; -import net.kyori.adventure.text.TextReplacementConfig; +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 org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.plugin.Plugin; diff --git a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/thread/TimeoutThread.java b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/thread/TimeoutThread.java index 336f05e..eea1204 100644 --- a/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/thread/TimeoutThread.java +++ b/hamster-tpa/src/main/java/cn/hamster3/mc/plugin/tpa/thread/TimeoutThread.java @@ -1,9 +1,9 @@ package cn.hamster3.mc.plugin.tpa.thread; import cn.hamster3.mc.plugin.ball.common.api.BallAPI; +import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.TextReplacementConfig; import cn.hamster3.mc.plugin.tpa.core.DataManager; import cn.hamster3.mc.plugin.tpa.core.Message; -import net.kyori.adventure.text.TextReplacementConfig; import java.util.Map; import java.util.UUID;