style: 修改日志
This commit is contained in:
@@ -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.entity.BallPlayerInfo;
|
||||||
import cn.hamster3.mc.plugin.ball.common.event.BallActions;
|
import cn.hamster3.mc.plugin.ball.common.event.BallActions;
|
||||||
import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
|
import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
|
||||||
|
import lombok.Getter;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
|
@SuppressWarnings("CallToPrintStackTrace")
|
||||||
public class HamsterBallPlugin extends JavaPlugin {
|
public class HamsterBallPlugin extends JavaPlugin {
|
||||||
|
@Getter
|
||||||
private static HamsterBallPlugin instance;
|
private static HamsterBallPlugin instance;
|
||||||
|
|
||||||
public static HamsterBallPlugin getInstance() {
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void sync(@NotNull Runnable runnable) {
|
public static void sync(@NotNull Runnable runnable) {
|
||||||
Bukkit.getScheduler().runTask(instance, runnable);
|
Bukkit.getScheduler().runTask(instance, runnable);
|
||||||
}
|
}
|
||||||
|
@@ -48,10 +48,10 @@ public class BallBukkitAPI extends BallAPI {
|
|||||||
|
|
||||||
DataSource datasource;
|
DataSource datasource;
|
||||||
if (config.contains("datasource")) {
|
if (config.contains("datasource")) {
|
||||||
plugin.getLogger().info("检测到配置文件中包含 datasource 节点,启用自定义数据库连接");
|
plugin.getLogger().info("启用仓鼠球自定义数据库连接池");
|
||||||
datasource = BallBukkitUtils.getDataSource(config.getConfigurationSection("datasource"));
|
datasource = BallBukkitUtils.getDataSource(config.getConfigurationSection("datasource"));
|
||||||
} else {
|
} else {
|
||||||
plugin.getLogger().info("未检测到配置文件中的 datasource 节点,复用 HamsterCore 数据库连接");
|
plugin.getLogger().info("复用 HamsterCore 的数据库连接池");
|
||||||
datasource = CoreAPI.getInstance().getDataSource();
|
datasource = CoreAPI.getInstance().getDataSource();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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.api.BallAPI;
|
||||||
import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
|
import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
|
||||||
import cn.hamster3.mc.plugin.ball.common.event.operate.*;
|
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.api.CoreAPI;
|
||||||
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
|
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
|
||||||
import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.audience.Audience;
|
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.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@SuppressWarnings("CallToPrintStackTrace")
|
||||||
public class BallBukkitListener implements Listener {
|
public class BallBukkitListener implements Listener {
|
||||||
public static final BallBukkitListener INSTANCE = new BallBukkitListener();
|
public static final BallBukkitListener INSTANCE = new BallBukkitListener();
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ public class BallBukkitListener implements Listener {
|
|||||||
player.teleport(toLocationData.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
|
player.teleport(toLocationData.getLocation(), PlayerTeleportEvent.TeleportCause.PLUGIN);
|
||||||
DisplayMessage doneMessage = toLocationData.getDoneMessage();
|
DisplayMessage doneMessage = toLocationData.getDoneMessage();
|
||||||
if (doneMessage != null) {
|
if (doneMessage != null) {
|
||||||
Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player);
|
Audience audience = CoreAPI.getInstance().getAudienceProvider().player(player.getUniqueId());
|
||||||
doneMessage.show(audience);
|
doneMessage.show(audience);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -58,14 +58,14 @@ public class BallBukkitListener implements Listener {
|
|||||||
if (toPlayerData != null) {
|
if (toPlayerData != null) {
|
||||||
player.teleport(toPlayerData.location);
|
player.teleport(toPlayerData.location);
|
||||||
if (toPlayerData.doneMessage != null) {
|
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()
|
toPlayerData.doneMessage.show(audience, TextReplacementConfig.builder()
|
||||||
.matchLiteral("%player_name%")
|
.matchLiteral("%player_name%")
|
||||||
.replacement(BallAPI.getInstance().getPlayerName(toPlayerData.toPlayerUUID, ""))
|
.replacement(BallAPI.getInstance().getPlayerName(toPlayerData.toPlayerUUID, ""))
|
||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
if (toPlayerData.doneTargetMessage != null) {
|
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()
|
toPlayerData.doneTargetMessage.show(audience, TextReplacementConfig.builder()
|
||||||
.matchLiteral("%player_name%")
|
.matchLiteral("%player_name%")
|
||||||
.replacement(player.getName())
|
.replacement(player.getName())
|
||||||
@@ -134,7 +134,7 @@ public class BallBukkitListener implements Listener {
|
|||||||
HamsterBallPlugin.sync(() -> {
|
HamsterBallPlugin.sync(() -> {
|
||||||
player.teleport(location.toBukkitLocation());
|
player.teleport(location.toBukkitLocation());
|
||||||
if (event.getDoneMessage() != null) {
|
if (event.getDoneMessage() != null) {
|
||||||
Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player);
|
Audience audience = CoreAPI.getInstance().getAudienceProvider().player(player.getUniqueId());
|
||||||
event.getDoneMessage().show(audience);
|
event.getDoneMessage().show(audience);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -157,14 +157,14 @@ public class BallBukkitListener implements Listener {
|
|||||||
HamsterBallPlugin.sync(() -> {
|
HamsterBallPlugin.sync(() -> {
|
||||||
sendPlayer.teleport(location);
|
sendPlayer.teleport(location);
|
||||||
if (event.getDoneMessage() != null) {
|
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()
|
event.getDoneMessage().show(audience, TextReplacementConfig.builder()
|
||||||
.matchLiteral("%player_name%")
|
.matchLiteral("%player_name%")
|
||||||
.replacement(toPlayer.getName())
|
.replacement(toPlayer.getName())
|
||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
if (event.getDoneTargetMessage() != null) {
|
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()
|
event.getDoneTargetMessage().show(audience, TextReplacementConfig.builder()
|
||||||
.matchLiteral("%player_name%")
|
.matchLiteral("%player_name%")
|
||||||
.replacement(sendPlayer.getName())
|
.replacement(sendPlayer.getName())
|
||||||
|
@@ -45,10 +45,10 @@ public class BallBungeeCordAPI extends BallAPI {
|
|||||||
|
|
||||||
DataSource datasource;
|
DataSource datasource;
|
||||||
if (config.contains("datasource")) {
|
if (config.contains("datasource")) {
|
||||||
plugin.getLogger().info("检测到配置文件中包含 datasource 节点,启用自定义数据库连接");
|
plugin.getLogger().info("启用仓鼠球自定义数据库连接池");
|
||||||
datasource = BallBungeeCordUtils.getDataSource(config.getSection("datasource"));
|
datasource = BallBungeeCordUtils.getDataSource(config.getSection("datasource"));
|
||||||
} else {
|
} else {
|
||||||
plugin.getLogger().info("未检测到配置文件中的 datasource 节点,复用 HamsterCore 数据库连接");
|
plugin.getLogger().info("复用 HamsterCore 的数据库连接池");
|
||||||
datasource = CoreAPI.getInstance().getDataSource();
|
datasource = CoreAPI.getInstance().getDataSource();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user