diff --git a/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 index f62aa93..d15dd6d 100644 --- a/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 @@ -9,19 +9,18 @@ import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo; import cn.hamster3.mc.plugin.ball.common.event.BallActions; import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent; +import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; import java.util.logging.Logger; +@SuppressWarnings("CallToPrintStackTrace") public class HamsterBallPlugin extends JavaPlugin { + @Getter private static HamsterBallPlugin instance; - public static HamsterBallPlugin getInstance() { - return instance; - } - public static void sync(@NotNull Runnable runnable) { Bukkit.getScheduler().runTask(instance, runnable); } diff --git a/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 index 9e4a281..3de934a 100644 --- a/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 @@ -48,10 +48,10 @@ public class BallBukkitAPI extends BallAPI { DataSource datasource; if (config.contains("datasource")) { - plugin.getLogger().info("检测到配置文件中包含 datasource 节点,启用自定义数据库连接"); + plugin.getLogger().info("启用仓鼠球自定义数据库连接池"); datasource = BallBukkitUtils.getDataSource(config.getConfigurationSection("datasource")); } else { - plugin.getLogger().info("未检测到配置文件中的 datasource 节点,复用 HamsterCore 数据库连接"); + plugin.getLogger().info("复用 HamsterCore 的数据库连接池"); datasource = CoreAPI.getInstance().getDataSource(); } diff --git a/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 index ee4e5aa..dc36b6f 100644 --- a/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 @@ -5,7 +5,6 @@ import cn.hamster3.mc.plugin.ball.bukkit.data.BukkitLocation; import cn.hamster3.mc.plugin.ball.common.api.BallAPI; import cn.hamster3.mc.plugin.ball.common.entity.BallServerType; import cn.hamster3.mc.plugin.ball.common.event.operate.*; -import cn.hamster3.mc.plugin.core.bukkit.api.CoreBukkitAPI; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.audience.Audience; @@ -32,6 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.UUID; +@SuppressWarnings("CallToPrintStackTrace") public class BallBukkitListener implements Listener { public static final BallBukkitListener INSTANCE = new BallBukkitListener(); @@ -50,7 +50,7 @@ public class BallBukkitListener implements Listener { player.teleport(toLocationData.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN); DisplayMessage doneMessage = toLocationData.getDoneMessage(); if (doneMessage != null) { - Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player); + Audience audience = CoreAPI.getInstance().getAudienceProvider().player(player.getUniqueId()); doneMessage.show(audience); } } @@ -58,14 +58,14 @@ public class BallBukkitListener implements Listener { if (toPlayerData != null) { player.teleport(toPlayerData.location); if (toPlayerData.doneMessage != null) { - Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player); + Audience audience = CoreAPI.getInstance().getAudienceProvider().player(player.getUniqueId()); toPlayerData.doneMessage.show(audience, TextReplacementConfig.builder() .matchLiteral("%player_name%") .replacement(BallAPI.getInstance().getPlayerName(toPlayerData.toPlayerUUID, "")) .build()); } if (toPlayerData.doneTargetMessage != null) { - Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(toPlayerData.toPlayerUUID); + Audience audience = CoreAPI.getInstance().getAudienceProvider().player(toPlayerData.toPlayerUUID); toPlayerData.doneTargetMessage.show(audience, TextReplacementConfig.builder() .matchLiteral("%player_name%") .replacement(player.getName()) @@ -134,7 +134,7 @@ public class BallBukkitListener implements Listener { HamsterBallPlugin.sync(() -> { player.teleport(location.toBukkitLocation()); if (event.getDoneMessage() != null) { - Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player); + Audience audience = CoreAPI.getInstance().getAudienceProvider().player(player.getUniqueId()); event.getDoneMessage().show(audience); } }); @@ -157,14 +157,14 @@ public class BallBukkitListener implements Listener { HamsterBallPlugin.sync(() -> { sendPlayer.teleport(location); if (event.getDoneMessage() != null) { - Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(sendPlayer); + Audience audience = CoreAPI.getInstance().getAudienceProvider().player(sendPlayer.getUniqueId()); event.getDoneMessage().show(audience, TextReplacementConfig.builder() .matchLiteral("%player_name%") .replacement(toPlayer.getName()) .build()); } if (event.getDoneTargetMessage() != null) { - Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(toPlayer); + Audience audience = CoreAPI.getInstance().getAudienceProvider().player(toPlayer.getUniqueId()); event.getDoneTargetMessage().show(audience, TextReplacementConfig.builder() .matchLiteral("%player_name%") .replacement(sendPlayer.getName()) diff --git a/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/api/BallBungeeCordAPI.java b/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/api/BallBungeeCordAPI.java index 558630a..c42cbff 100644 --- a/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/api/BallBungeeCordAPI.java +++ b/ball-bungee/src/main/java/cn/hamster3/mc/plugin/ball/bungee/api/BallBungeeCordAPI.java @@ -45,10 +45,10 @@ public class BallBungeeCordAPI extends BallAPI { DataSource datasource; if (config.contains("datasource")) { - plugin.getLogger().info("检测到配置文件中包含 datasource 节点,启用自定义数据库连接"); + plugin.getLogger().info("启用仓鼠球自定义数据库连接池"); datasource = BallBungeeCordUtils.getDataSource(config.getSection("datasource")); } else { - plugin.getLogger().info("未检测到配置文件中的 datasource 节点,复用 HamsterCore 数据库连接"); + plugin.getLogger().info("复用 HamsterCore 的数据库连接池"); datasource = CoreAPI.getInstance().getDataSource(); }