From 517074f2b3decac342a712f3544f49571e0599d3 Mon Sep 17 00:00:00 2001 From: ME1312 Date: Mon, 14 Jun 2021 00:42:06 -0400 Subject: [PATCH] Remove some unnecessary conversions --- .../ME1312/SubServers/Bungee/BungeeAPI.java | 9 ++++++ .../SubServers/Bungee/BungeeCommon.java | 11 ------- .../Library/Compatibility/RemotePlayer.java | 30 ++++++++++++++--- .../SubServers/Bungee/Host/RemotePlayer.java | 14 ++++---- .../Network/Packet/PacketExMessagePlayer.java | 5 +-- .../Network/Packet/PacketMessagePlayer.java | 2 +- .../Common/Network/API/RemotePlayer.java | 32 +++++++++++++++---- .../SubServers/Sync/Server/CachedPlayer.java | 8 ++--- 8 files changed, 76 insertions(+), 35 deletions(-) diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java index 9c808f88..d8cfd10f 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java @@ -26,6 +26,15 @@ public interface BungeeAPI { return ((BungeeCommon) ProxyServer.getInstance()).api.run(); } + /** + * Gets the BungeeCommon Internals + * + * @deprecated Use BungeeAPI Methods when available + * @return BungeeCommon Internals + */ + @Deprecated + BungeeCommon getInternals(); + /** * Get the number of players on this network across all known proxies * diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java index b39613e2..0f583f7c 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java @@ -12,12 +12,10 @@ import java.util.Map; * BungeeCord Common Layout Class */ public abstract class BungeeCommon extends BungeeCord { - private static BungeeCommon instance; final ReturnRunnable api; protected BungeeCommon(ReturnRunnable api) throws IOException { this.api = api; - instance = this; } /** @@ -33,13 +31,4 @@ public abstract class BungeeCommon extends BungeeCord { * @return Server Map Copy */ public abstract Map getServersCopy(); - - /** - * Gets the ProxyServer Common Object - * - * @return ProxyServer Common - */ - public static BungeeCommon getInstance() { - return instance; - } } diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RemotePlayer.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RemotePlayer.java index f32b6944..1d0c16e0 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RemotePlayer.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RemotePlayer.java @@ -75,6 +75,16 @@ public interface RemotePlayer { sendMessage(messages, i -> {}); } + /** + * Sends messages to this player + * + * @param message Message to send + * @param response Success Status + */ + default void sendMessage(String message, Callback response) { + sendMessage(new String[]{ message }, response); + } + /** * Sends messages to this player * @@ -92,6 +102,16 @@ public interface RemotePlayer { sendMessage(messages, i -> {}); } + /** + * Sends messages to this player + * + * @param message Message to send + * @param response Success Status + */ + default void sendMessage(BaseComponent message, Callback response) { + sendMessage(new BaseComponent[]{ message }, response); + } + /** * Sends messages to this player * @@ -153,17 +173,17 @@ public interface RemotePlayer { /** * Disconnects this player from the network * - * @param message Disconnect Message + * @param reason Disconnect Reason */ - default void disconnect(String message) { - disconnect(message, i -> {}); + default void disconnect(String reason) { + disconnect(reason, i -> {}); } /** * Disconnects this player from the network * - * @param message Disconnect Message + * @param reason Disconnect Reason * @param response Success status */ - void disconnect(String message, Callback response); + void disconnect(String reason, Callback response); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java index caaa494f..860caa03 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java @@ -17,6 +17,8 @@ import net.md_5.bungee.chat.ComponentSerializer; import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; +import java.util.Arrays; +import java.util.Collections; import java.util.UUID; /** @@ -140,7 +142,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat SubDataClient client = getProxyConnection(); if (client != null) { StackTraceElement[] origin = new Exception().getStackTrace(); - client.sendPacket(new PacketExMessagePlayer(getUniqueId(), messages, null, data -> { + client.sendPacket(new PacketExMessagePlayer(getUniqueId(), Arrays.asList(messages), null, data -> { try { response.run(data.getInt(0x0001)); } catch (Throwable e) { @@ -162,7 +164,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat SubDataClient client = getProxyConnection(); if (client != null) { StackTraceElement[] origin = new Exception().getStackTrace(); - client.sendPacket(new PacketExMessagePlayer(getUniqueId(), null, new String[]{ ComponentSerializer.toString(messages) }, data -> { + client.sendPacket(new PacketExMessagePlayer(getUniqueId(), null, Collections.singletonList(ComponentSerializer.toString(messages)), data -> { try { response.run(data.getInt(0x0001)); } catch (Throwable e) { @@ -223,17 +225,17 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat } @Override - public void disconnect(String message, Callback response) { + public void disconnect(String reason, Callback response) { if (local != null) { - if (message != null) { - local.disconnect(message); + if (reason != null) { + local.disconnect(reason); } else local.disconnect(); response.run(0); } else { SubDataClient client = getProxyConnection(); if (client != null) { StackTraceElement[] origin = new Exception().getStackTrace(); - client.sendPacket(new PacketExDisconnectPlayer(getUniqueId(), message, data -> { + client.sendPacket(new PacketExDisconnectPlayer(getUniqueId(), reason, data -> { try { response.run(data.getInt(0x0001)); } catch (Throwable e) { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExMessagePlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExMessagePlayer.java index 0fe5d848..66de98d0 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExMessagePlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExMessagePlayer.java @@ -8,6 +8,7 @@ import net.ME1312.SubData.Server.Protocol.PacketObjectOut; import net.ME1312.SubData.Server.SubDataClient; import java.util.HashMap; +import java.util.List; import java.util.UUID; /** @@ -16,7 +17,7 @@ import java.util.UUID; public class PacketExMessagePlayer implements PacketObjectIn, PacketObjectOut { private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; - private String[] legacy, raw; + private List legacy, raw; private UUID id; /** @@ -33,7 +34,7 @@ public class PacketExMessagePlayer implements PacketObjectIn, PacketObj * @param callback Callbacks */ @SafeVarargs - public PacketExMessagePlayer(UUID player, String[] legacy, String[] raw, Callback>... callback) { + public PacketExMessagePlayer(UUID player, List legacy, List raw, Callback>... callback) { if (Util.isNull(player, callback)) throw new NullPointerException(); this.player = player; this.legacy = legacy; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java index 1b8a9f4b..d3a87121 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java @@ -75,7 +75,7 @@ public class PacketMessagePlayer implements PacketObjectIn, PacketObjec client.sendPacket(new PacketMessagePlayer(0, tracker)); } else if ((remote = plugin.api.getRemotePlayer(id)) != null) { if (remote.getProxy().getSubData()[0] != null) { - ((SubDataClient) remote.getProxy().getSubData()[0]).sendPacket(new PacketExMessagePlayer(remote.getUniqueId(), (data.contains(0x0002)?data.getRawStringList(0x0002).toArray(new String[0]):null), (data.contains(0x0003)?data.getRawStringList(0x0003).toArray(new String[0]):null), r -> { + ((SubDataClient) remote.getProxy().getSubData()[0]).sendPacket(new PacketExMessagePlayer(remote.getUniqueId(), (data.contains(0x0002)?data.getRawStringList(0x0002):null), (data.contains(0x0003)?data.getRawStringList(0x0003):null), r -> { client.sendPacket(new PacketMessagePlayer(r.getInt(0x0001), tracker)); })); } else { diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java index 58274dfd..5038c178 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/RemotePlayer.java @@ -176,6 +176,16 @@ public class RemotePlayer { sendMessage(messages, i -> {}); } + /** + * Sends messages to this player + * + * @param message Message to send + * @param response Success Status + */ + public void sendMessage(String message, Callback response) { + sendMessage(new String[]{ message }, response); + } + /** * Sends messages to this player * @@ -204,6 +214,16 @@ public class RemotePlayer { sendRawMessage(messages, i -> {}); } + /** + * Sends JSON format messages to this player + * + * @param message Message to send + * @param response Success Status + */ + public void sendRawMessage(String message, Callback response) { + sendRawMessage(new String[]{ message }, response); + } + /** * Sends JSON format messages to this player * @@ -289,21 +309,21 @@ public class RemotePlayer { /** * Disconnects this player from the network * - * @param message Disconnect Message + * @param reason Disconnect Reason */ - public void disconnect(String message) { - disconnect(message, i -> {}); + public void disconnect(String reason) { + disconnect(reason, i -> {}); } /** * Disconnects this player from the network * - * @param message Disconnect Message + * @param reason Disconnect Reason * @param response Success status */ - public void disconnect(String message, Callback response) { + public void disconnect(String reason, Callback response) { StackTraceElement[] origin = new Exception().getStackTrace(); - client().sendPacket(new PacketDisconnectPlayer(getUniqueId(), message, data -> { + client().sendPacket(new PacketDisconnectPlayer(getUniqueId(), reason, data -> { try { response.run(data.getInt(0x0001)); } catch (Throwable e) { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java index bcfcac7f..b6c3254a 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java @@ -139,15 +139,15 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. } @Override - public void disconnect(String message, Callback response) { + public void disconnect(String reason, Callback response) { ProxiedPlayer local = get(); if (local != null) { - if (message != null) { - local.disconnect(message); + if (reason != null) { + local.disconnect(reason); } else local.disconnect(); response.run(0); } else { - super.disconnect(message, response); + super.disconnect(reason, response); } } }