MiniDay/hamster-ball
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Activity

Revert "feat: 新版 API"

Browse Source 
This reverts commit 4fe49f83aa.
This commit is contained in:
叁只仓鼠
2023-11-20 15:56:13 +08:00
parent 100bf689d3
commit 100bfabcf5
73 changed files with 1004 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/HamsterBallPlugin.java
View File

@@ -3,6 +3,8 @@ package cn.hamster3.mc.plugin.ball.bukkit;
import cn.hamster3.mc.plugin.ball.bukkit.api.BallBukkitAPI;
import cn.hamster3.mc.plugin.ball.bukkit.hook.PlaceholderHook;
import cn.hamster3.mc.plugin.ball.bukkit.listener.BallBukkitListener;
import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
import cn.hamster3.mc.plugin.ball.common.event.server.ServerOnlineEvent;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull;
@@ -53,8 +55,20 @@ public class HamsterBallPlugin extends JavaPlugin {
} catch (Exception e) {
e.printStackTrace();
}
if (!BallAPI.getInstance().isEnabled()) {
sync(() -> {
logger.info("由于 HamsterBall 未能成功连接, 服务器将立即关闭");
Bukkit.shutdown();
});
return;
}
Bukkit.getPluginManager().registerEvents(BallBukkitListener.INSTANCE, this);
logger.info("已注册 BallBukkitListener");
BallAPI.getInstance().sendBallMessage(
BallAPI.BALL_CHANNEL,
ServerOnlineEvent.ACTION,
new ServerOnlineEvent(BallAPI.getInstance().getLocalServerInfo())
);
sync(() -> {
if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
PlaceholderHook.INSTANCE.register();

170
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/api/BallBukkitAPI.java
View File

@@ -1,18 +1,10 @@
package cn.hamster3.mc.plugin.ball.bukkit.api;
import cn.hamster3.mc.plugin.ball.bukkit.HamsterBallPlugin;
import cn.hamster3.mc.plugin.ball.bukkit.event.MessageSendEvent;
import cn.hamster3.mc.plugin.ball.bukkit.event.operate.*;
import cn.hamster3.mc.plugin.ball.bukkit.event.player.*;
import cn.hamster3.mc.plugin.ball.bukkit.event.server.ServerOfflineEvent;
import cn.hamster3.mc.plugin.ball.bukkit.event.server.ServerOnlineEvent;
import cn.hamster3.mc.plugin.ball.bukkit.util.BallBukkitUtils;
import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
import cn.hamster3.mc.plugin.ball.common.data.BallMessage;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo;
import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
import cn.hamster3.mc.plugin.ball.common.event.BallActions;
import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
import io.lettuce.core.RedisClient;
import org.bukkit.Bukkit;
@@ -79,167 +71,9 @@ public class BallBukkitAPI extends BallAPI {
super.disable();
}
@Override
public void sendBallMessage(@NotNull String channel, @NotNull BallMessage message, boolean block) {
Bukkit.getPluginManager().callEvent(new MessageSendEvent(Bukkit.isPrimaryThread(), channel, message));
super.sendBallMessage(channel, message, block);
}
@Override
protected void onMessage(String channel, BallMessage message) {
if (!BallAPI.BALL_CHANNEL.equals(channel)) {
return;
}
switch (BallActions.valueOf(message.getAction())) {
case BroadcastPlayerMessage: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(BroadcastPlayerMessageEvent.class)
);
break;
}
case DispatchConsoleCommand: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(DispatchConsoleCommandEvent.class)
);
break;
}
case DispatchPlayerCommand: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(DispatchPlayerCommandEvent.class)
);
break;
}
case KickPlayer: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(KickPlayerEvent.class)
);
break;
}
case SendMessageToPlayer: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(SendMessageToPlayerEvent.class)
);
break;
}
case SendPlayerToLocation: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(SendPlayerToLocationEvent.class)
);
break;
}
case SendPlayerToPlayer: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(SendPlayerToPlayerEvent.class)
);
break;
}
case PlayerInfoUpdate: {
BallPlayerInfoUpdateEvent event = message.getContentAs(BallPlayerInfoUpdateEvent.class);
Bukkit.getPluginManager().callEvent(event);
BallPlayerInfo info = event.getPlayerInfo();
playerInfo.put(info.getUuid(), info);
break;
}
case PlayerPreLogin: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(BallPlayerPreLoginEvent.class)
);
break;
}
case PlayerLogin: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(BallPlayerLoginEvent.class)
);
break;
}
case PlayerPostLogin: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(BallPlayerPostLoginEvent.class)
);
break;
}
case PlayerPreConnectServer: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(BallPlayerPreConnectServerEvent.class)
);
break;
}
case PlayerConnectServer: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(BallPlayerConnectServerEvent.class)
);
break;
}
case PlayerPostConnectServer: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(BallPlayerPostConnectServerEvent.class)
);
break;
}
case PlayerLogout: {
Bukkit.getPluginManager().callEvent(
message.getContentAs(BallPlayerLogoutEvent.class)
);
break;
}
case ServerOnline: {
ServerOnlineEvent event = message.getContentAs(ServerOnlineEvent.class);
Bukkit.getPluginManager().callEvent(event);
BallServerInfo info = event.getServerInfo();
serverInfo.put(info.getId(), info);
switch (info.getType()) {
case GAME: {
playerInfo.forEach((uuid, playerInfo) -> {
if (playerInfo.getGameServer().equals(info.getId())) {
playerInfo.setOnline(false);
}
});
break;
}
case PROXY: {
playerInfo.forEach((uuid, playerInfo) -> {
if (playerInfo.getProxyServer().equals(info.getId())) {
playerInfo.setOnline(false);
}
});
break;
}
}
break;
}
case ServerOffline: {
ServerOfflineEvent event = message.getContentAs(ServerOfflineEvent.class);
Bukkit.getPluginManager().callEvent(event);
String serverID = event.getServerInfo().getId();
BallServerInfo info = serverInfo.remove(serverID);
if (info == null) {
return;
}
switch (info.getType()) {
case GAME: {
playerInfo.forEach((uuid, playerInfo) -> {
if (playerInfo.getGameServer().equals(info.getId())) {
playerInfo.setOnline(false);
}
});
break;
}
case PROXY: {
playerInfo.forEach((uuid, playerInfo) -> {
if (playerInfo.getProxyServer().equals(info.getId())) {
playerInfo.setOnline(false);
}
});
break;
}
}
break;
}
}
}
@Override
public @NotNull Logger getLogger() {
return HamsterBallPlugin.getInstance().getLogger();
}
}
}

30
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/MessageReceiveEvent.java
View File

@@ -1,30 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event;
import cn.hamster3.mc.plugin.ball.common.data.BallMessage;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
@Getter
public class MessageReceiveEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final String channel;
@NotNull
private final BallMessage message;
public MessageReceiveEvent(@NotNull String channel, @NotNull BallMessage message) {
super(true);
this.channel = channel;
this.message = message;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

30
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/MessageSendEvent.java
View File

@@ -1,30 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event;
import cn.hamster3.mc.plugin.ball.common.data.BallMessage;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
@Getter
public class MessageSendEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final String channel;
@NotNull
private final BallMessage message;
public MessageSendEvent(boolean isAsync, @NotNull String channel, @NotNull BallMessage message) {
super(isAsync);
this.channel = channel;
this.message = message;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

28
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/operate/BroadcastPlayerMessageEvent.java
View File

@@ -1,28 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.operate;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
@Getter
public class BroadcastPlayerMessageEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final DisplayMessage message;
public BroadcastPlayerMessageEvent(@NotNull DisplayMessage message) {
super(true);
this.message = message;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

34
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/operate/DispatchConsoleCommandEvent.java
View File

@@ -1,34 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.operate;
import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@Getter
public class DispatchConsoleCommandEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@Nullable
private final BallServerType serverType;
@Nullable
private final String serverID;
@NotNull
private final String command;
public DispatchConsoleCommandEvent(@Nullable BallServerType serverType, @Nullable String serverID, @NotNull String command) {
super(true);
this.serverType = serverType;
this.serverID = serverID;
this.command = command;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

36
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/operate/DispatchPlayerCommandEvent.java
View File

@@ -1,36 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.operate;
import cn.hamster3.mc.plugin.ball.common.entity.BallServerType;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.UUID;
@Getter
public class DispatchPlayerCommandEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@Nullable
private final BallServerType serverType;
@Nullable
private final UUID uuid;
@NotNull
private final String command;
public DispatchPlayerCommandEvent(@Nullable BallServerType serverType, @Nullable UUID uuid, @NotNull String command) {
super(true);
this.serverType = serverType;
this.uuid = uuid;
this.command = command;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

32
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/operate/KickPlayerEvent.java
View File

@@ -1,32 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.operate;
import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.Component;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
@Getter
public class KickPlayerEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final UUID uuid;
@NotNull
private final Component reason;
public KickPlayerEvent(@NotNull UUID uuid, @NotNull Component reason) {
super(true);
this.uuid = uuid;
this.reason = reason;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

33
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/operate/SendMessageToPlayerEvent.java
View File

@@ -1,33 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.operate;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import java.util.Set;
import java.util.UUID;
@Getter
public class SendMessageToPlayerEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final Set<UUID> receivers;
@NotNull
private final DisplayMessage message;
public SendMessageToPlayerEvent(@NotNull Set<UUID> receivers, @NotNull DisplayMessage message) {
super(true);
this.receivers = receivers;
this.message = message;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

38
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/operate/SendPlayerToLocationEvent.java
View File

@@ -1,38 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.operate;
import cn.hamster3.mc.plugin.ball.common.data.BallLocation;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Set;
import java.util.UUID;
@Getter
public class SendPlayerToLocationEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final Set<UUID> sendPlayer;
@NotNull
private final BallLocation location;
@Nullable
private final DisplayMessage doneMessage;
public SendPlayerToLocationEvent(@NotNull Set<UUID> sendPlayer, @NotNull BallLocation location, @Nullable DisplayMessage doneMessage) {
super(true);
this.sendPlayer = sendPlayer;
this.location = location;
this.doneMessage = doneMessage;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

41
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/operate/SendPlayerToPlayerEvent.java
View File

@@ -1,41 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.operate;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Set;
import java.util.UUID;
@Getter
public class SendPlayerToPlayerEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final Set<UUID> sendPlayer;
@NotNull
private final UUID toPlayer;
@Nullable
private final DisplayMessage doneMessage;
@Nullable
private final DisplayMessage doneTargetMessage;
public SendPlayerToPlayerEvent(@NotNull Set<UUID> sendPlayer, @NotNull UUID toPlayer, @Nullable DisplayMessage doneMessage, @Nullable DisplayMessage doneTargetMessage) {
super(true);
this.sendPlayer = sendPlayer;
this.toPlayer = toPlayer;
this.doneMessage = doneMessage;
this.doneTargetMessage = doneTargetMessage;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

43
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/player/BallPlayerConnectServerEvent.java
View File

@@ -1,43 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.player;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* 玩家进入子服
* <p>
* 仅在使用 velocity 代理端时才会触发这个事件
*
* @see BallPlayerPreConnectServerEvent 玩家准备进入子服
* @see BallPlayerConnectServerEvent 玩家进入子服
* @see BallPlayerPostConnectServerEvent 玩家已经进入子服
*/
@Getter
public class BallPlayerConnectServerEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallPlayerInfo playerInfo;
@Nullable
private final String from;
@NotNull
private final String to;
public BallPlayerConnectServerEvent(@NotNull BallPlayerInfo playerInfo, @Nullable String from, @NotNull String to) {
super(true);
this.playerInfo = playerInfo;
this.from = from;
this.to = to;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

30
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/player/BallPlayerInfoUpdateEvent.java
View File

@@ -1,30 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.player;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* 玩家已进入子服
*/
@Getter
public class BallPlayerInfoUpdateEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallPlayerInfo playerInfo;
public BallPlayerInfoUpdateEvent(@NotNull BallPlayerInfo playerInfo) {
super(true);
this.playerInfo = playerInfo;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

31
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/player/BallPlayerLoginEvent.java
View File

@@ -1,31 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.player;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* 玩家连接到代理服务器
*/
@Getter
public class BallPlayerLoginEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallPlayerInfo playerInfo;
public BallPlayerLoginEvent(@NotNull BallPlayerInfo playerInfo) {
super(true);
this.playerInfo = playerInfo;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

30
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/player/BallPlayerLogoutEvent.java
View File

@@ -1,30 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.player;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* 玩家与代理服务器断开连接
*/
@Getter
public class BallPlayerLogoutEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallPlayerInfo playerInfo;
public BallPlayerLogoutEvent(@NotNull BallPlayerInfo playerInfo) {
super(true);
this.playerInfo = playerInfo;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

40
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/player/BallPlayerPostConnectServerEvent.java
View File

@@ -1,40 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.player;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* 玩家已经进入子服
*
* @see BallPlayerPreConnectServerEvent 玩家准备进入子服
* @see BallPlayerConnectServerEvent 玩家进入子服
* @see BallPlayerPostConnectServerEvent 玩家已经进入子服
*/
@Getter
public class BallPlayerPostConnectServerEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallPlayerInfo playerInfo;
@NotNull
private final String from;
@NotNull
private final String to;
public BallPlayerPostConnectServerEvent(@NotNull BallPlayerInfo playerInfo, @NotNull String from, @NotNull String to) {
super(true);
this.playerInfo = playerInfo;
this.from = from;
this.to = to;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

30
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/player/BallPlayerPostLoginEvent.java
View File

@@ -1,30 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.player;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* 玩家已连接到代理服务器
*/
@Getter
public class BallPlayerPostLoginEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallPlayerInfo playerInfo;
public BallPlayerPostLoginEvent(@NotNull BallPlayerInfo playerInfo) {
super(true);
this.playerInfo = playerInfo;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

41
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/player/BallPlayerPreConnectServerEvent.java
View File

@@ -1,41 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.player;
import cn.hamster3.mc.plugin.ball.common.entity.BallPlayerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* 玩家准备进入子服
*
* @see BallPlayerPreConnectServerEvent 玩家准备进入子服
* @see BallPlayerConnectServerEvent 玩家进入子服
* @see BallPlayerPostConnectServerEvent 玩家已经进入子服
*/
@Getter
public class BallPlayerPreConnectServerEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallPlayerInfo playerInfo;
@Nullable
private final String from;
@NotNull
private final String to;
public BallPlayerPreConnectServerEvent(@NotNull BallPlayerInfo playerInfo, @Nullable String from, @NotNull String to) {
super(true);
this.playerInfo = playerInfo;
this.from = from;
this.to = to;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

29
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/player/BallPlayerPreLoginEvent.java
View File

@@ -1,29 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.player;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* 玩家准备连接到代理服务器
*/
@Getter
public class BallPlayerPreLoginEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final String playerName;
public BallPlayerPreLoginEvent(@NotNull String playerName) {
super(true);
this.playerName = playerName;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

30
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/server/ServerOfflineEvent.java
View File

@@ -1,30 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.server;
import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* 服务器离线
*/
@Getter
public class ServerOfflineEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallServerInfo serverInfo;
public ServerOfflineEvent(@NotNull BallServerInfo serverInfo) {
super(true);
this.serverInfo = serverInfo;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

30
ball-bukkit/src/main/java/cn/hamster3/mc/plugin/ball/bukkit/event/server/ServerOnlineEvent.java
View File

@@ -1,30 +0,0 @@
package cn.hamster3.mc.plugin.ball.bukkit.event.server;
import cn.hamster3.mc.plugin.ball.common.entity.BallServerInfo;
import lombok.Getter;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
/**
* 服务器上线
*/
@Getter
public class ServerOnlineEvent extends Event {
@Getter
private static final HandlerList handlerList = new HandlerList();
@NotNull
private final BallServerInfo serverInfo;
public ServerOnlineEvent(@NotNull BallServerInfo serverInfo) {
super(true);
this.serverInfo = serverInfo;
}
@NotNull
@Override
public HandlerList getHandlers() {
return handlerList;
}
}

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

@@ -2,9 +2,11 @@ package cn.hamster3.mc.plugin.ball.bukkit.listener;
import cn.hamster3.mc.plugin.ball.bukkit.HamsterBallPlugin;
import cn.hamster3.mc.plugin.ball.bukkit.data.BukkitLocation;
import cn.hamster3.mc.plugin.ball.bukkit.event.operate.*;
import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
import cn.hamster3.mc.plugin.ball.common.data.BallMessageInfo;
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.listener.BallListener;
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;
@@ -31,7 +33,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.UUID;
public class BallBukkitListener implements Listener {
public class BallBukkitListener implements Listener, BallListener {
public static final BallBukkitListener INSTANCE = new BallBukkitListener();
private final HashMap<UUID, ToLocation> playerToLocation = new HashMap<>();
@@ -40,6 +42,108 @@ public class BallBukkitListener implements Listener {
private BallBukkitListener() {
}
@Override
public void onMessageReceived(@NotNull BallMessageInfo info) {
switch (info.getAction()) {
case BroadcastPlayerMessageEvent.ACTION: {
BroadcastPlayerMessageEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), BroadcastPlayerMessageEvent.class);
DisplayMessage message = event.getMessage();
Audience audience = CoreAPI.getInstance().getAudienceProvider().all();
message.show(audience);
break;
}
case DispatchConsoleCommandEvent.ACTION: {
DispatchConsoleCommandEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), DispatchConsoleCommandEvent.class);
if (event.getType() != null && event.getType() != BallServerType.GAME) {
return;
}
if (event.getServerID() != null && !BallAPI.getInstance().isLocalServer(event.getServerID())) {
return;
}
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), event.getCommand());
break;
}
case DispatchPlayerCommandEvent.ACTION: {
DispatchPlayerCommandEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), DispatchPlayerCommandEvent.class);
if (event.getType() != null && event.getType() != BallServerType.GAME) {
return;
}
if (event.getUuid() != null) {
Player player = Bukkit.getPlayer(event.getUuid());
if (player == null) {
return;
}
Bukkit.dispatchCommand(player, event.getCommand());
return;
}
for (Player player : Bukkit.getOnlinePlayers()) {
Bukkit.dispatchCommand(player, event.getCommand());
}
break;
}
case SendPlayerToLocationEvent.ACTION: {
SendPlayerToLocationEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), SendPlayerToLocationEvent.class);
BukkitLocation location = new BukkitLocation(event.getLocation());
if (BallAPI.getInstance().isLocalServer(location.getServerID())) {
for (UUID uuid : event.getSendPlayerUUID()) {
Player player = Bukkit.getPlayer(uuid);
if (player != null) {
HamsterBallPlugin.sync(() -> {
player.teleport(location.toBukkitLocation());
if (event.getDoneMessage() != null) {
Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player);
event.getDoneMessage().show(audience);
}
});
} else {
playerToLocation.put(uuid, new ToLocation(location.toBukkitLocation(), event.getDoneMessage()));
}
}
}
break;
}
case SendPlayerToPlayerEvent.ACTION: {
SendPlayerToPlayerEvent event = CoreAPI.getInstance().getGson().fromJson(info.getContent(), SendPlayerToPlayerEvent.class);
Player toPlayer = Bukkit.getPlayer(event.getToPlayerUUID());
if (toPlayer == null) {
break;
}
Location location = toPlayer.getLocation();
for (UUID uuid : event.getSendPlayerUUID()) {
Player sendPlayer = Bukkit.getPlayer(uuid);
if (sendPlayer != null) {
HamsterBallPlugin.sync(() -> {
sendPlayer.teleport(location);
if (event.getDoneMessage() != null) {
Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(sendPlayer);
event.getDoneMessage().show(audience, TextReplacementConfig.builder()
.matchLiteral("%player_name%")
.replacement(toPlayer.getName())
.build());
}
if (event.getDoneTargetMessage() != null) {
Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(toPlayer);
event.getDoneTargetMessage().show(audience, TextReplacementConfig.builder()
.matchLiteral("%player_name%")
.replacement(sendPlayer.getName())
.build());
}
});
} else {
ToPlayer data = new ToPlayer(
toPlayer.getUniqueId(),
toPlayer.getLocation(),
event.getDoneMessage(),
event.getDoneTargetMessage()
);
playerToPlayer.put(uuid, data);
}
}
break;
}
}
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
public void onPlayerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
@@ -85,102 +189,6 @@ public class BallBukkitListener implements Listener {
});
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
public void onBroadcastPlayerMessage(BroadcastPlayerMessageEvent event) {
DisplayMessage message = event.getMessage();
Audience audience = CoreAPI.getInstance().getAudienceProvider().all();
message.show(audience);
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
public void onDispatchConsoleCommand(DispatchConsoleCommandEvent event) {
if (event.getServerType() != null && event.getServerType() != BallServerType.GAME) {
return;
}
if (event.getServerID() != null && !BallAPI.getInstance().isLocalServer(event.getServerID())) {
return;
}
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), event.getCommand());
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
public void onDispatchPlayerCommand(DispatchPlayerCommandEvent event) {
if (event.getServerType() != null && event.getServerType() != BallServerType.GAME) {
return;
}
if (event.getUuid() != null) {
Player player = Bukkit.getPlayer(event.getUuid());
if (player == null) {
return;
}
Bukkit.dispatchCommand(player, event.getCommand());
return;
}
for (Player player : Bukkit.getOnlinePlayers()) {
Bukkit.dispatchCommand(player, event.getCommand());
}
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
public void onSendPlayerToLocation(SendPlayerToLocationEvent event) {
BukkitLocation location = new BukkitLocation(event.getLocation());
if (BallAPI.getInstance().isLocalServer(location.getServerID())) {
for (UUID uuid : event.getSendPlayer()) {
Player player = Bukkit.getPlayer(uuid);
if (player != null) {
HamsterBallPlugin.sync(() -> {
player.teleport(location.toBukkitLocation());
if (event.getDoneMessage() != null) {
Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(player);
event.getDoneMessage().show(audience);
}
});
} else {
playerToLocation.put(uuid, new ToLocation(location.toBukkitLocation(), event.getDoneMessage()));
}
}
}
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
public void onSendPlayerToPlayer(SendPlayerToPlayerEvent event) {
Player toPlayer = Bukkit.getPlayer(event.getToPlayer());
if (toPlayer == null) {
return;
}
Location location = toPlayer.getLocation();
for (UUID uuid : event.getSendPlayer()) {
Player sendPlayer = Bukkit.getPlayer(uuid);
if (sendPlayer != null) {
HamsterBallPlugin.sync(() -> {
sendPlayer.teleport(location);
if (event.getDoneMessage() != null) {
Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(sendPlayer);
event.getDoneMessage().show(audience, TextReplacementConfig.builder()
.matchLiteral("%player_name%")
.replacement(toPlayer.getName())
.build());
}
if (event.getDoneTargetMessage() != null) {
Audience audience = CoreBukkitAPI.getInstance().getAudienceProvider().player(toPlayer);
event.getDoneTargetMessage().show(audience, TextReplacementConfig.builder()
.matchLiteral("%player_name%")
.replacement(sendPlayer.getName())
.build());
}
});
} else {
ToPlayer data = new ToPlayer(
toPlayer.getUniqueId(),
toPlayer.getLocation(),
event.getDoneMessage(),
event.getDoneTargetMessage()
);
playerToPlayer.put(uuid, data);
}
}
}
@NotNull
private List<DisplayMessage> getCachedPlayerMessage(@NotNull UUID uuid) throws SQLException {
ArrayList<DisplayMessage> list = new ArrayList<>();