diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml index ee161309..02221954 100644 --- a/SubServers.Bungee/common/pom.xml +++ b/SubServers.Bungee/common/pom.xml @@ -28,7 +28,7 @@ net.ME1312.Galaxi GalaxiUtil - 21w27b + 21w43f compile 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 d8cfd10f..5fd43049 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeAPI.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee; -import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer; @@ -8,6 +7,7 @@ import net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.config.ServerInfo; +import java.io.File; import java.util.Collection; import java.util.Map; import java.util.UUID; @@ -23,7 +23,7 @@ public interface BungeeAPI { * @return SubAPI BungeeCord Common */ static BungeeAPI getInstance() { - return ((BungeeCommon) ProxyServer.getInstance()).api.run(); + return ((BungeeCommon) ProxyServer.getInstance()).api.get(); } /** @@ -96,7 +96,7 @@ public interface BungeeAPI { * @return Lang Values */ default String getLang(String channel, String key) { - if (Util.isNull(channel, key)) throw new NullPointerException(); + Util.nullpo(channel, key); return getLang(channel).get(key); } @@ -105,7 +105,7 @@ public interface BungeeAPI { * * @return Directory */ - UniversalFile getRuntimeDirectory(); + File getRuntimeDirectory(); /** * Gets the SubServers Version 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..b68cd25b 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/BungeeCommon.java @@ -1,21 +1,20 @@ package net.ME1312.SubServers.Bungee; -import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; - import net.md_5.bungee.BungeeCord; import net.md_5.bungee.api.config.ServerInfo; import java.io.IOException; import java.util.Map; +import java.util.function.Supplier; /** * BungeeCord Common Layout Class */ public abstract class BungeeCommon extends BungeeCord { private static BungeeCommon instance; - final ReturnRunnable api; + final Supplier api; - protected BungeeCommon(ReturnRunnable api) throws IOException { + protected BungeeCommon(Supplier api) throws IOException { this.api = api; instance = this; } diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RPSI.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RPSI.java index ac2a4613..5253f50b 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RPSI.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/RPSI.java @@ -1,10 +1,9 @@ package net.ME1312.SubServers.Bungee.Library.Compatibility; -import net.ME1312.Galaxi.Library.Callback.Callback; - import net.md_5.bungee.api.chat.BaseComponent; import java.util.UUID; +import java.util.function.IntConsumer; /** * RemotePlayer Static Implementation Layout Class @@ -22,7 +21,7 @@ public abstract class RPSI { * @param messages Messages to send * @param response Success Status */ - protected abstract void sendMessage(UUID[] players, String[] messages, Callback response); + protected abstract void sendMessage(UUID[] players, String[] messages, IntConsumer response); /** * Sends messages to this player @@ -31,7 +30,7 @@ public abstract class RPSI { * @param messages Messages to send * @param response Success Status */ - protected abstract void sendMessage(UUID[] players, BaseComponent[][] messages, Callback response); + protected abstract void sendMessage(UUID[] players, BaseComponent[][] messages, IntConsumer response); /** * Transfers this player to another server @@ -40,7 +39,7 @@ public abstract class RPSI { * @param server Target server * @param response Success Status */ - protected abstract void transfer(UUID[] players, String server, Callback response); + protected abstract void transfer(UUID[] players, String server, IntConsumer response); /** * Disconnects this player from the network @@ -49,5 +48,5 @@ public abstract class RPSI { * @param reason Disconnect Reason * @param response Success status */ - protected abstract void disconnect(UUID[] players, String reason, Callback response); + protected abstract void disconnect(UUID[] players, String reason, IntConsumer response); } 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 d0e3c93b..16403854 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 @@ -1,13 +1,12 @@ package net.ME1312.SubServers.Bungee.Library.Compatibility; -import net.ME1312.Galaxi.Library.Callback.Callback; - import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; import java.net.InetSocketAddress; import java.util.UUID; +import java.util.function.IntConsumer; import static net.ME1312.SubServers.Bungee.Library.Compatibility.RPSI.instance; @@ -80,7 +79,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - static void broadcastMessage(String message, Callback response) { + static void broadcastMessage(String message, IntConsumer response) { broadcastMessage(new String[]{ message }, response); } @@ -90,7 +89,7 @@ public interface RemotePlayer { * @param messages Messages to send * @param response Success Status */ - static void broadcastMessage(String[] messages, Callback response) { + static void broadcastMessage(String[] messages, IntConsumer response) { sendMessage(null, messages, response); } @@ -109,7 +108,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - default void sendMessage(String message, Callback response) { + default void sendMessage(String message, IntConsumer response) { sendMessage(new String[]{ message }, response); } @@ -119,7 +118,7 @@ public interface RemotePlayer { * @param messages Messages to send * @param response Success Status */ - default void sendMessage(String[] messages, Callback response) { + default void sendMessage(String[] messages, IntConsumer response) { sendMessage(new UUID[]{ getUniqueId() }, messages, response); } @@ -140,7 +139,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - static void sendMessage(UUID[] players, String message, Callback response) { + static void sendMessage(UUID[] players, String message, IntConsumer response) { sendMessage(players, new String[]{ message }, response); } @@ -151,7 +150,7 @@ public interface RemotePlayer { * @param messages Messages to send * @param response Success Status */ - static void sendMessage(UUID[] players, String[] messages, Callback response) { + static void sendMessage(UUID[] players, String[] messages, IntConsumer response) { instance.sendMessage(players, messages, response); } @@ -170,7 +169,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - static void broadcastMessage(BaseComponent message, Callback response) { + static void broadcastMessage(BaseComponent message, IntConsumer response) { broadcastMessage(new BaseComponent[]{ message }, response); } @@ -180,7 +179,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - static void broadcastMessage(BaseComponent[] message, Callback response) { + static void broadcastMessage(BaseComponent[] message, IntConsumer response) { broadcastMessage(new BaseComponent[][]{ message }, response); } @@ -199,7 +198,7 @@ public interface RemotePlayer { * @param messages Messages to send * @param response Success Status */ - static void broadcastMessage(BaseComponent[][] messages, Callback response) { + static void broadcastMessage(BaseComponent[][] messages, IntConsumer response) { sendMessage(null, messages, response); } @@ -218,7 +217,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - default void sendMessage(BaseComponent message, Callback response) { + default void sendMessage(BaseComponent message, IntConsumer response) { sendMessage(new BaseComponent[]{ message }, response); } @@ -228,7 +227,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - default void sendMessage(BaseComponent[] message, Callback response) { + default void sendMessage(BaseComponent[] message, IntConsumer response) { sendMessage(new BaseComponent[][]{ message }, response); } @@ -247,7 +246,7 @@ public interface RemotePlayer { * @param messages Messages to send * @param response Success Status */ - default void sendMessage(BaseComponent[][] messages, Callback response) { + default void sendMessage(BaseComponent[][] messages, IntConsumer response) { sendMessage(new UUID[]{ getUniqueId() }, messages, response); } @@ -268,7 +267,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - static void sendMessage(UUID[] players, BaseComponent message, Callback response) { + static void sendMessage(UUID[] players, BaseComponent message, IntConsumer response) { sendMessage(players, new BaseComponent[]{ message }, response); } @@ -279,7 +278,7 @@ public interface RemotePlayer { * @param message Message to send * @param response Success Status */ - static void sendMessage(UUID[] players, BaseComponent[] message, Callback response) { + static void sendMessage(UUID[] players, BaseComponent[] message, IntConsumer response) { sendMessage(players, new BaseComponent[][]{ message }, response); } @@ -300,7 +299,7 @@ public interface RemotePlayer { * @param messages Message to send * @param response Success Status */ - static void sendMessage(UUID[] players, BaseComponent[][] messages, Callback response) { + static void sendMessage(UUID[] players, BaseComponent[][] messages, IntConsumer response) { instance.sendMessage(players, messages, response); } @@ -319,7 +318,7 @@ public interface RemotePlayer { * @param server Target server * @param response Success status */ - default void transfer(String server, Callback response) { + default void transfer(String server, IntConsumer response) { transfer(new UUID[]{ getUniqueId() }, server, response); } @@ -340,7 +339,7 @@ public interface RemotePlayer { * @param server Target server * @param response Success status */ - static void transfer(UUID[] players, String server, Callback response) { + static void transfer(UUID[] players, String server, IntConsumer response) { instance.transfer(players, server, response); } @@ -359,7 +358,7 @@ public interface RemotePlayer { * @param server Target server * @param response Success status */ - default void transfer(ServerInfo server, Callback response) { + default void transfer(ServerInfo server, IntConsumer response) { transfer(new UUID[]{ getUniqueId() }, server, response); } @@ -380,7 +379,7 @@ public interface RemotePlayer { * @param server Target server * @param response Success status */ - static void transfer(UUID[] players, ServerInfo server, Callback response) { + static void transfer(UUID[] players, ServerInfo server, IntConsumer response) { instance.transfer(players, server.getName(), response); } @@ -396,7 +395,7 @@ public interface RemotePlayer { * * @param response Success status */ - default void disconnect(Callback response) { + default void disconnect(IntConsumer response) { disconnect((String) null, response); } @@ -415,7 +414,7 @@ public interface RemotePlayer { * @param reason Disconnect Reason * @param response Success status */ - default void disconnect(String reason, Callback response) { + default void disconnect(String reason, IntConsumer response) { disconnect(new UUID[]{ getUniqueId() }, reason, response); } @@ -434,7 +433,7 @@ public interface RemotePlayer { * @param players Players to select * @param response Success status */ - static void disconnect(UUID[] players, Callback response) { + static void disconnect(UUID[] players, IntConsumer response) { disconnect(players, null, response); } @@ -455,7 +454,7 @@ public interface RemotePlayer { * @param reason Disconnect Reason * @param response Success status */ - static void disconnect(UUID[] players, String reason, Callback response) { + static void disconnect(UUID[] players, String reason, IntConsumer response) { instance.disconnect(players, reason, response); } } diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Fallback/SmartFallback.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Fallback/SmartFallback.java index c0c72159..ee4286a3 100644 --- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Fallback/SmartFallback.java +++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Fallback/SmartFallback.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Library.Fallback; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Bungee.BungeeCommon; @@ -28,7 +29,7 @@ public class SmartFallback implements ReconnectHandler { public SmartFallback(ObjectMap settings) { dns_forward = settings.getBoolean("DNS-Forward", false); if (reconnect == null && settings.getBoolean("Reconnect", false)) - reconnect = Util.getDespiteException(() -> Util.reflect(ProxyServer.getInstance().getPluginManager().getPlugin("reconnect_yaml").getClass().getClassLoader().loadClass("net.md_5.bungee.module.reconnect.yaml.YamlReconnectHandler").getConstructor()), null); + reconnect = Try.all.get(() -> Util.reflect(ProxyServer.getInstance().getPluginManager().getPlugin("reconnect_yaml").getClass().getClassLoader().loadClass("net.md_5.bungee.module.reconnect.yaml.YamlReconnectHandler").getConstructor())); } @Override @@ -177,7 +178,7 @@ public class SmartFallback implements ReconnectHandler { * @param inspector Inspector */ public static void addInspector(FallbackInspector inspector) { - if (Util.isNull(inspector)) throw new NullPointerException(); + Util.nullpo(inspector); inspectors.add(inspector); } @@ -187,8 +188,8 @@ public class SmartFallback implements ReconnectHandler { * @param inspector Inspector */ public static void removeInspector(FallbackInspector inspector) { - if (Util.isNull(inspector)) throw new NullPointerException(); - Util.isException(() -> inspectors.remove(inspector)); + Util.nullpo(inspector); + Try.all.run(() -> inspectors.remove(inspector)); } @Override diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 1b8ce2c2..ec6b7a55 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -34,7 +34,7 @@ net.ME1312.SubData Server - 21w33a + 21w43a compile diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddHostEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddHostEvent.java index 38ea1fc5..18c55979 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddHostEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddHostEvent.java @@ -24,7 +24,7 @@ public class SubAddHostEvent extends Event implements SubEvent, Cancellable { * @param host Host Being Added */ public SubAddHostEvent(UUID player, Host host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddProxyEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddProxyEvent.java index 6afbdd5d..48fe9aa4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddProxyEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddProxyEvent.java @@ -18,7 +18,7 @@ public class SubAddProxyEvent extends Event implements SubEvent { * @param proxy Host Being Added */ public SubAddProxyEvent(Proxy proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddServerEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddServerEvent.java index 6b95a7f5..1acb2773 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddServerEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubAddServerEvent.java @@ -27,7 +27,7 @@ public class SubAddServerEvent extends Event implements SubEvent, Cancellable { * @param server Server Starting */ public SubAddServerEvent(UUID player, Host host, Server server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java index a9f17aac..0201ba94 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java @@ -36,7 +36,7 @@ public class SubCreateEvent extends Event implements SubEvent, Cancellable { * @param port Server Port Number */ public SubCreateEvent(UUID player, Host host, String name, SubCreator.ServerTemplate template, Version version, int port) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.host = host; this.name = name; @@ -54,7 +54,7 @@ public class SubCreateEvent extends Event implements SubEvent, Cancellable { * @param version Server Version */ public SubCreateEvent(UUID player, SubServer server, SubCreator.ServerTemplate template, Version version) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.update = server; this.name = server.getName(); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java index e35817a0..5751cee6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java @@ -39,7 +39,7 @@ public class SubCreatedEvent extends Event implements SubEvent { * @param success Success Status */ public SubCreatedEvent(UUID player, Host host, String name, SubCreator.ServerTemplate template, Version version, int port, SubServer server, boolean update, boolean success) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.host = host; this.name = name; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java index 3295d04f..4c244e75 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java @@ -30,7 +30,7 @@ public class SubEditServerEvent extends Event implements SubEvent, Cancellable { * @param edit Edit to make */ public SubEditServerEvent(UUID player, Server server, Pair edit) { - if (Util.isNull(server, edit)) throw new NullPointerException(); + Util.nullpo(server, edit); ObjectMap section = new ObjectMap(); section.set(".", edit.value()); this.player = player; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkConnectEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkConnectEvent.java index 120e6fcd..30a3f23b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkConnectEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkConnectEvent.java @@ -20,7 +20,7 @@ public class SubNetworkConnectEvent extends Event implements SubEvent, Cancellab * SubData Network Connect Event */ public SubNetworkConnectEvent(DataServer network, DataClient client) { - if (Util.isNull(network, client)) throw new NullPointerException(); + Util.nullpo(network, client); this.network = network; this.client = client; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkDisconnectEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkDisconnectEvent.java index 8e058ee9..834807f4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkDisconnectEvent.java @@ -20,7 +20,7 @@ public class SubNetworkDisconnectEvent extends Event implements SubEvent { * SubData Network Disconnect Event */ public SubNetworkDisconnectEvent(DataServer network, DataClient client, DisconnectReason reason) { - if (Util.isNull(network, client, reason)) throw new NullPointerException(); + Util.nullpo(network, client, reason); this.network = network; this.client = client; this.reason = reason; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkLoginEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkLoginEvent.java index 2d35a83e..61309ab2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkLoginEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubNetworkLoginEvent.java @@ -18,7 +18,7 @@ public class SubNetworkLoginEvent extends Event implements SubEvent { * SubData Network Login Event */ public SubNetworkLoginEvent(DataServer network, DataClient client) { - if (Util.isNull(network, client)) throw new NullPointerException(); + Util.nullpo(network, client); this.network = network; this.client = client; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveHostEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveHostEvent.java index 62fcdaf2..963d3a74 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveHostEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveHostEvent.java @@ -24,7 +24,7 @@ public class SubRemoveHostEvent extends Event implements SubEvent, Cancellable { * @param host Host to be added */ public SubRemoveHostEvent(UUID player, Host host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveProxyEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveProxyEvent.java index 1c727ec4..de120ff9 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveProxyEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveProxyEvent.java @@ -18,7 +18,7 @@ public class SubRemoveProxyEvent extends Event implements SubEvent { * @param proxy Host Being Added */ public SubRemoveProxyEvent(Proxy proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveServerEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveServerEvent.java index df44392d..4c0dfa84 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveServerEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubRemoveServerEvent.java @@ -27,7 +27,7 @@ public class SubRemoveServerEvent extends Event implements SubEvent, Cancellable * @param server Server Starting */ public SubRemoveServerEvent(UUID player, Host host, Server server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubSendCommandEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubSendCommandEvent.java index 4742925a..20340b8e 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubSendCommandEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubSendCommandEvent.java @@ -25,7 +25,7 @@ public class SubSendCommandEvent extends Event implements SubEvent, Cancellable * @param server Server being Commanded */ public SubSendCommandEvent(UUID player, SubServer server, String command) { - if (Util.isNull(server, command)) throw new NullPointerException(); + Util.nullpo(server, command); this.player = player; this.server = server; this.command = command; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartEvent.java index 3eb4f6b8..6f582629 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartEvent.java @@ -24,7 +24,7 @@ public class SubStartEvent extends Event implements SubEvent, Cancellable { * @param server Server Starting */ public SubStartEvent(UUID player, SubServer server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.server = server; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartedEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartedEvent.java index 6ccd652e..9023652b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartedEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStartedEvent.java @@ -19,7 +19,7 @@ public class SubStartedEvent extends Event implements SubEvent { * @param server Server Starting */ public SubStartedEvent(SubServer server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStopEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStopEvent.java index 48430a51..4392bc50 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStopEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStopEvent.java @@ -26,7 +26,7 @@ public class SubStopEvent extends Event implements SubEvent, Cancellable { * @param force If it was a Forced Shutdown */ public SubStopEvent(UUID player, SubServer server, boolean force) { - if (Util.isNull(server, force)) throw new NullPointerException(); + Util.nullpo(server, force); this.player = player; this.server = server; this.force = force; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.java index de4240fa..c3a8d049 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.java @@ -18,7 +18,7 @@ public class SubStoppedEvent extends Event implements SubEvent { * @param server Server that Stopped */ public SubStoppedEvent(SubServer server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java index 00a44347..91eeac3b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Executable.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Host; import net.ME1312.Galaxi.Library.Platform; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Bungee.Library.Compatibility.JNA; @@ -40,7 +41,7 @@ public class Executable { } static { - USE_SESSION_TRACKING = Platform.getSystem() != Platform.WINDOWS && Util.getDespiteException(() -> { + USE_SESSION_TRACKING = Platform.getSystem() != Platform.WINDOWS && Try.all.get(() -> { Process test = Runtime.getRuntime().exec(new String[]{"setsid", "bash", "-c", "exit 0"}); test.waitFor(); // The purpose of this block is to test for the 'setsid' command return test.exitValue() == 0; @@ -95,9 +96,9 @@ public class Executable { if (process.isAlive()) { Long pid; if (Platform.getSystem() == Platform.WINDOWS) { - if ((pid = pid(process)) != null) Util.isException(() -> Runtime.getRuntime().exec(new String[]{"taskkill.exe", "/T", "/F", "/PID", pid.toString()}).waitFor()); + if ((pid = pid(process)) != null) Try.all.run(() -> Runtime.getRuntime().exec(new String[]{"taskkill.exe", "/T", "/F", "/PID", pid.toString()}).waitFor()); } else if (USE_SESSION_TRACKING) { - if ((pid = pid(process)) != null) Util.isException(() -> Runtime.getRuntime().exec(new String[]{"bash", "-c", "kill -9 $(ps -s " + pid + " -o pid=)"}).waitFor()); + if ((pid = pid(process)) != null) Try.all.run(() -> Runtime.getRuntime().exec(new String[]{"bash", "-c", "kill -9 $(ps -s " + pid + " -o pid=)"}).waitFor()); } if (process.isAlive() && terminate9(process)) { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java index a229b8ca..b8c1c903 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Host.External; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.ClientHandler; import net.ME1312.SubData.Server.DataClient; @@ -189,7 +190,7 @@ public class ExternalHost extends Host implements ClientHandler { @Override protected boolean removeSubServer(UUID player, String name, boolean forced) throws InterruptedException { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); ExternalSubServer server = (ExternalSubServer) servers.get(name.toLowerCase()); SubRemoveServerEvent event = new SubRemoveServerEvent(player, this, server); @@ -214,7 +215,7 @@ public class ExternalHost extends Host implements ClientHandler { @Override protected boolean recycleSubServer(UUID player, String name, boolean forced) throws InterruptedException { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); ExternalSubServer s = (ExternalSubServer) servers.get(name.toLowerCase()); String server = s.getName(); @@ -256,7 +257,7 @@ public class ExternalHost extends Host implements ClientHandler { @Override protected boolean deleteSubServer(UUID player, String name, boolean forced) throws InterruptedException { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); ExternalSubServer s = (ExternalSubServer) servers.get(name.toLowerCase()); String server = s.getName(); @@ -298,7 +299,7 @@ public class ExternalHost extends Host implements ClientHandler { @Override public boolean destroy() { - if (Util.getDespiteException(() -> Util.reflect(SubProxy.class.getDeclaredField("running"), plugin), true)) { + if (Try.all.get(() -> Util.reflect(SubProxy.class.getDeclaredField("running"), plugin), true)) { return super.destroy(); } return true; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java index adffab03..3be9b9b4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java @@ -1,19 +1,21 @@ package net.ME1312.SubServers.Bungee.Host.External; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Server.SubDataClient; import net.ME1312.SubServers.Bungee.Event.SubCreateEvent; import net.ME1312.SubServers.Bungee.Event.SubCreatedEvent; -import net.ME1312.SubServers.Bungee.Host.*; +import net.ME1312.SubServers.Bungee.Host.Host; +import net.ME1312.SubServers.Bungee.Host.SubCreator; +import net.ME1312.SubServers.Bungee.Host.SubLogger; +import net.ME1312.SubServers.Bungee.Host.SubServer; import net.ME1312.SubServers.Bungee.Host.SubServer.StopAction; import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; import net.ME1312.SubServers.Bungee.Network.Packet.PacketExConfigureHost; @@ -30,6 +32,7 @@ import java.io.File; import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; import java.util.*; +import java.util.function.Consumer; /** * External SubCreator Class @@ -55,7 +58,7 @@ public class ExternalSubCreator extends SubCreator { */ public ExternalSubCreator(ExternalHost host, Range ports, boolean log, String gitBash) { if (!ports.hasLowerBound() || !ports.hasUpperBound()) throw new IllegalArgumentException("Port range is not bound"); - if (Util.isNull(host, ports, log, gitBash)) throw new NullPointerException(); + Util.nullpo(host, ports, log, gitBash); this.host = host; this.ports = ports; this.log = new Container(log); @@ -67,10 +70,10 @@ public class ExternalSubCreator extends SubCreator { @Override public void reload() { templatesR.clear(); - if (new UniversalFile(host.plugin.dir, "SubServers:Templates").exists()) for (File file : new UniversalFile(host.plugin.dir, "SubServers:Templates").listFiles()) { + if (new File(host.plugin.dir, "SubServers/Templates").exists()) for (File file : new File(host.plugin.dir, "SubServers/Templates").listFiles()) { try { if (file.isDirectory() && !file.getName().endsWith(".x")) { - ObjectMap config = (new UniversalFile(file, "template.yml").exists())?new YAMLConfig(new UniversalFile(file, "template.yml")).get().getMap("Template", new ObjectMap()):new ObjectMap(); + ObjectMap config = (new File(file, "template.yml").exists())? new YAMLConfig(new File(file, "template.yml")).get().getMap("Template", new ObjectMap()) : new ObjectMap(); ServerTemplate template = loadTemplate(file.getName(), config.getBoolean("Enabled", true), config.getBoolean("Internal", false), config.getRawString("Icon", "::NULL::"), file, config.getMap("Build", new ObjectMap()), config.getMap("Settings", new ObjectMap())); templatesR.put(file.getName().toLowerCase(), template); if (config.getKeys().contains("Display")) template.setDisplayName(config.getString("Display")); @@ -81,7 +84,7 @@ public class ExternalSubCreator extends SubCreator { } } - if (host.available && !Util.getDespiteException(() -> Util.reflect(SubProxy.class.getDeclaredField("reloading"), host.plugin), false)) { + if (host.available && !Try.all.get(() -> Util.reflect(SubProxy.class.getDeclaredField("reloading"), host.plugin), false)) { host.queue(new PacketExConfigureHost(host.plugin, host), new PacketExUploadTemplates(host.plugin, () -> { if (enableRT == null || enableRT) host.queue(new PacketExDownloadTemplates(host.plugin, host)); })); @@ -89,8 +92,8 @@ public class ExternalSubCreator extends SubCreator { } @Override - public boolean create(UUID player, String name, ServerTemplate template, Version version, Integer port, Callback callback) { - if (Util.isNull(name, template)) throw new NullPointerException(); + public boolean create(UUID player, String name, ServerTemplate template, Version version, Integer port, Consumer callback) { + Util.nullpo(name, template); if (host.isAvailable() && host.isEnabled() && template.isEnabled() && !SubAPI.getInstance().getSubServers().keySet().contains(name.toLowerCase()) && !SubCreator.isReserved(name) && (version != null || !template.requiresVersion())) { StackTraceElement[] origin = new Exception().getStackTrace(); @@ -123,9 +126,9 @@ public class ExternalSubCreator extends SubCreator { return false; } } else return false; - } private void callback(StackTraceElement[] origin, Callback callback, T value) { + } private void callback(StackTraceElement[] origin, Consumer callback, T value) { if (callback != null) try { - callback.run(value); + callback.accept(value); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -134,8 +137,8 @@ public class ExternalSubCreator extends SubCreator { } @Override - public boolean update(UUID player, SubServer server, ServerTemplate template, Version version, Callback callback) { - if (Util.isNull(server)) throw new NullPointerException(); + public boolean update(UUID player, SubServer server, ServerTemplate template, Version version, Consumer callback) { + Util.nullpo(server); final ServerTemplate ft = (template == null)?server.getTemplate():template; if (host.isAvailable() && host.isEnabled() && host == server.getHost() && server.isAvailable() && !server.isRunning() && ft != null && ft.isEnabled() && ft.canUpdate() && (version != null || !ft.requiresVersion())) { StackTraceElement[] origin = new Exception().getStackTrace(); @@ -153,7 +156,7 @@ public class ExternalSubCreator extends SubCreator { host.queue(new PacketExCreateServer(player, server, ft, version, logger.getExternalAddress(), data -> { finish(player, server, server.getName(), ft, version, server.getAddress().getPort(), prefix, origin, data, s -> { ((ExternalSubServer) server).updating(false); - if (callback != null) callback.run(s != null); + if (callback != null) callback.accept(s != null); }); this.thread.remove(name.toLowerCase()); })); @@ -165,7 +168,7 @@ public class ExternalSubCreator extends SubCreator { } else return false; } - private void finish(UUID player, SubServer update, String name, ServerTemplate template, Version version, int port, String prefix, StackTraceElement[] origin, ObjectMap data, Callback callback) { + private void finish(UUID player, SubServer update, String name, ServerTemplate template, Version version, int port, String prefix, StackTraceElement[] origin, ObjectMap data, Consumer callback) { try { if (data.getInt(0x0001) == 0) { Logger.get(prefix).info("Saving..."); @@ -201,14 +204,14 @@ public class ExternalSubCreator extends SubCreator { } server.setAll(config); - if (update != null) Util.isException(() -> update.getHost().forceRemoveSubServer(name)); + if (update != null) Try.all.run(() -> update.getHost().forceRemoveSubServer(name)); subserver = host.constructSubServer(name, server.getBoolean("Enabled"), port, ChatColor.translateAlternateColorCodes('&', server.getString("Motd")), server.getBoolean("Log"), server.getRawString("Directory"), server.getRawString("Executable"), server.getRawString("Stop-Command"), server.getBoolean("Hidden"), server.getBoolean("Restricted")); if (server.getString("Display").length() > 0) subserver.setDisplayName(server.getString("Display")); subserver.setTemplate(server.getRawString("Template")); for (String group : server.getStringList("Group")) subserver.addGroup(group); - SubServer.StopAction action = Util.getDespiteException(() -> SubServer.StopAction.valueOf(server.getRawString("Stop-Action").toUpperCase().replace('-', '_').replace(' ', '_')), null); + SubServer.StopAction action = Try.all.get(() -> SubServer.StopAction.valueOf(server.getRawString("Stop-Action").toUpperCase().replace('-', '_').replace(' ', '_'))); if (action != null) subserver.setStopAction(action); if (server.contains("Extra")) for (String extra : server.getMap("Extra").getKeys()) subserver.addExtra(extra, server.getMap("Extra").getObject(extra)); @@ -320,7 +323,7 @@ public class ExternalSubCreator extends SubCreator { @Override public void setLogging(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); log.value(value); } @@ -350,7 +353,7 @@ public class ExternalSubCreator extends SubCreator { @Override public ServerTemplate getTemplate(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); name = name.toLowerCase(); ServerTemplate template = templates.getOrDefault(name, null); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java index b4fc7a1d..c8486980 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Host.External; import net.ME1312.Galaxi.Library.Container.Value; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Bungee.Host.SubLogFilter; import net.ME1312.SubServers.Bungee.Host.SubLogger; @@ -20,8 +21,6 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * External Process Logger Class @@ -127,14 +126,14 @@ public class ExternalSubLogger extends SubLogger { @Override public void registerFilter(SubLogFilter filter) { - if (Util.isNull(filter)) throw new NullPointerException(); + Util.nullpo(filter); filters.add(filter); } @Override public void unregisterFilter(SubLogFilter filter) { - if (Util.isNull(filter)) throw new NullPointerException(); - Util.isException(() -> filters.remove(filter)); + Util.nullpo(filter); + Try.all.run(() -> filters.remove(filter)); } @Override diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java index 47421692..2e7b2577 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java @@ -1,11 +1,11 @@ package net.ME1312.SubServers.Bungee.Host.External; -import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.SubDataClient; import net.ME1312.SubServers.Bungee.Event.*; @@ -21,8 +21,11 @@ import net.ME1312.SubServers.Bungee.SubAPI; import net.md_5.bungee.api.ChatColor; import java.io.IOException; -import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; +import java.util.function.Supplier; /** * External SubServer Class @@ -83,7 +86,7 @@ public class ExternalSubServer extends SubServerImpl { } private void init(ExternalHost host, String name, boolean enabled, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted) throws InvalidServerException { - if (Util.isNull(host, name, enabled, port, motd, log, stopcmd, hidden, restricted)) throw new NullPointerException(); + Util.nullpo(host, name, enabled, port, motd, log, stopcmd, hidden, restricted); this.host = host; this.enabled = enabled; this.log = new Container(log); @@ -209,7 +212,7 @@ public class ExternalSubServer extends SubServerImpl { @Override public boolean command(UUID player, String command) { - if (Util.isNull(command)) throw new NullPointerException(); + Util.nullpo(command); if (running) { SubSendCommandEvent event = new SubSendCommandEvent(player, this, command); host.plugin.getPluginManager().callEvent(event); @@ -393,7 +396,7 @@ public class ExternalSubServer extends SubServerImpl { case "stop-cmd": case "stop-command": if (value.isString()) { - if (!stopcmd.equals(value)) host.queue(new PacketExControlServer(this, Action.SET_STOP_COMMAND, value.asRawString())); + if (!stopcmd.equals(value.asRawString())) host.queue(new PacketExControlServer(this, Action.SET_STOP_COMMAND, value.asRawString())); stopcmd = value.asRawString(); if (perma && this.host.plugin.servers.get().getMap("Servers").getKeys().contains(getName())) { this.host.plugin.servers.get().getMap("Servers").getMap(getName()).set("Stop-Command", getStopCommand()); @@ -404,7 +407,7 @@ public class ExternalSubServer extends SubServerImpl { break; case "stop-action": if (value.isString()) { - StopAction action = Util.getDespiteException(() -> StopAction.valueOf(value.asRawString().toUpperCase().replace('-', '_').replace(' ', '_')), null); + StopAction action = Try.all.get(() -> StopAction.valueOf(value.asRawString().toUpperCase().replace('-', '_').replace(' ', '_'))); if (action != null) { stopaction = action; if (perma && this.host.plugin.servers.get().getMap("Servers").getKeys().contains(getName())) { @@ -497,8 +500,8 @@ public class ExternalSubServer extends SubServerImpl { if (!isRunning() && forward == null && state) start(player); return c; } else return -1; - } private void waitFor(ReturnRunnable method, V value) throws InterruptedException { - while (method.run() != value) { + } private void waitFor(Supplier method, V value) throws InterruptedException { + while (method.get() != value) { Thread.sleep(250); } } @@ -533,7 +536,7 @@ public class ExternalSubServer extends SubServerImpl { @Override public void setEnabled(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); if (enabled != value) host.queue(new PacketExControlServer(this, Action.SET_ENABLED, (Boolean) value)); enabled = value; } @@ -545,7 +548,7 @@ public class ExternalSubServer extends SubServerImpl { @Override public void setLogging(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); if (log.value() != value) host.queue(new PacketExControlServer(this, Action.SET_LOGGING, (Boolean) value)); log.value(value); } @@ -577,7 +580,7 @@ public class ExternalSubServer extends SubServerImpl { @Override public void setStopCommand(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); if (!stopcmd.equals(value)) host.queue(new PacketExControlServer(this, Action.SET_STOP_COMMAND, value)); stopcmd = value; } @@ -589,7 +592,7 @@ public class ExternalSubServer extends SubServerImpl { @Override public void setStopAction(StopAction action) { - if (Util.isNull(action)) throw new NullPointerException(); + Util.nullpo(action); stopaction = action; } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java index 8de8b082..1718ce06 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java @@ -14,13 +14,16 @@ import com.google.common.collect.Range; import net.md_5.bungee.api.connection.ProxiedPlayer; import java.net.InetAddress; -import java.util.*; +import java.util.Collection; +import java.util.LinkedList; +import java.util.Map; +import java.util.UUID; /** * Host Layout Class */ -public abstract class Host implements ExtraDataHandler { - private ObjectMap extra = new ObjectMap(); +public abstract class Host implements ExtraDataHandler { + private final ObjectMap extra = new ObjectMap(); private final String signature; private String nick = null; @@ -40,7 +43,7 @@ public abstract class Host implements ExtraDataHandler { public Host(SubProxy plugin, String name, boolean enabled, Range ports, boolean log, InetAddress address, String directory, String gitBash) { if (name.contains(" ")) throw new InvalidHostException("Host names cannot have spaces: " + name); if (!ports.hasLowerBound() || !ports.hasUpperBound()) throw new InvalidHostException("Port range is not bound"); - if (Util.isNull(plugin, name, enabled, ports, log, address, directory, gitBash)) throw new NullPointerException(); + Util.nullpo(plugin, name, enabled, ports, log, address, directory, gitBash); signature = plugin.api.signAnonymousObject(); SubAPI.getInstance().getInternals().subprotocol.whitelist(address.getHostAddress()); } @@ -533,19 +536,19 @@ public abstract class Host implements ExtraDataHandler { @Override public void addExtra(String handle, Object value) { - if (Util.isNull(handle, value)) throw new NullPointerException(); + Util.nullpo(handle, value); extra.set(handle, value); } @Override public boolean hasExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return extra.getKeys().contains(handle); } @Override public ObjectMapValue getExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return extra.get(handle); } @@ -556,7 +559,7 @@ public abstract class Host implements ExtraDataHandler { @Override public void removeExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); extra.remove(handle); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java index 4cc0a27f..1fb3f8a7 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java @@ -1,8 +1,8 @@ package net.ME1312.SubServers.Bungee.Host.Internal; import net.ME1312.Galaxi.Library.Config.YAMLSection; +import net.ME1312.Galaxi.Library.Directories; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Bungee.Event.SubAddServerEvent; import net.ME1312.SubServers.Bungee.Event.SubRemoveServerEvent; @@ -121,7 +121,7 @@ public class InternalHost extends Host { @Override protected boolean removeSubServer(UUID player, String name, boolean forced) throws InterruptedException { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); InternalSubServer server = (InternalSubServer) servers.get(name.toLowerCase()); SubRemoveServerEvent event = new SubRemoveServerEvent(player, this, server); plugin.getPluginManager().callEvent(event); @@ -153,22 +153,22 @@ public class InternalHost extends Host { * @return Success Status */ protected boolean recycleSubServer(UUID player, String name, boolean forced, boolean multithreading) throws InterruptedException { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); String server = servers.get(name.toLowerCase()).getName(); File from = new File(getPath(), servers.get(server.toLowerCase()).getPath()); if (removeSubServer(player, server, forced)) { Runnable method = () -> { - UniversalFile to = new UniversalFile(plugin.dir, "SubServers:Recently Deleted:" + server.toLowerCase()); + File to = new File(plugin.dir, "SubServers/Recently Deleted/" + server.toLowerCase()); try { if (from.exists()) { Logger.get("SubServers").info("Moving Files..."); if (to.exists()) { - if (to.isDirectory()) Util.deleteDirectory(to); + if (to.isDirectory()) Directories.delete(to); else to.delete(); } to.mkdirs(); - Util.copyDirectory(from, to); - Util.deleteDirectory(from); + Directories.copy(from, to); + Directories.delete(from); } } catch (Exception e) { e.printStackTrace(); @@ -215,7 +215,7 @@ public class InternalHost extends Host { * @return Success Status */ protected boolean deleteSubServer(UUID player, String name, boolean forced, boolean multithreading) throws InterruptedException { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); String server = servers.get(name.toLowerCase()).getName(); File from = new File(getPath(), servers.get(server.toLowerCase()).getPath()); if (removeSubServer(player, server, forced)) { @@ -223,7 +223,7 @@ public class InternalHost extends Host { try { if (from.exists()) { Logger.get("SubServers").info("Removing Files..."); - Util.deleteDirectory(from); + Directories.delete(from); } } catch (Exception e) { e.printStackTrace(); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java index 1a600a20..83107553 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java @@ -1,15 +1,15 @@ package net.ME1312.SubServers.Bungee.Host.Internal; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; +import net.ME1312.Galaxi.Library.Directories; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Bungee.Event.SubCreateEvent; @@ -37,9 +37,11 @@ import java.nio.file.LinkOption; import java.nio.file.StandardCopyOption; import java.security.MessageDigest; import java.util.*; +import java.util.function.Consumer; import java.util.regex.Pattern; -import static java.util.logging.Level.*; +import static java.util.logging.Level.INFO; +import static java.util.logging.Level.WARNING; /** * Internal SubCreator Class @@ -63,10 +65,10 @@ public class InternalSubCreator extends SubCreator { private final String prefix; private final InternalSubLogger log; private final HashMap replacements; - private final Callback callback; + private final Consumer callback; private Process process; - private CreatorTask(UUID player, String name, ServerTemplate template, Version version, int port, Callback callback) { + private CreatorTask(UUID player, String name, ServerTemplate template, Version version, int port, Consumer callback) { super("SubServers.Bungee::Internal_SubCreator_Process_Handler(" + name + ')'); this.player = player; this.update = null; @@ -79,7 +81,7 @@ public class InternalSubCreator extends SubCreator { this.callback = callback; } - private CreatorTask(UUID player, SubServer server, ServerTemplate template, Version version, Callback callback) { + private CreatorTask(UUID player, SubServer server, ServerTemplate template, Version version, Consumer callback) { super("SubServers.Bungee::Internal_SubCreator_Process_Handler(" + server.getName() + ')'); this.player = player; this.update = server; @@ -183,7 +185,7 @@ public class InternalSubCreator extends SubCreator { if (template.getBuildOptions().contains("Executable")) { File cache = null; if (template.getBuildOptions().getBoolean("Use-Cache", true)) { - cache = new UniversalFile(host.plugin.dir, "SubServers:Cache:Templates:" + template.getName()); + cache = new File(host.plugin.dir, "SubServers/Cache/Templates/" + template.getName()); cache.mkdirs(); var.put("cache", cache.getAbsolutePath()); } @@ -211,14 +213,14 @@ public class InternalSubCreator extends SubCreator { if (cache != null) { if (cache.isDirectory() && cache.listFiles().length == 0) cache.delete(); - cache = new UniversalFile(host.plugin.dir, "SubServers:Cache:Templates"); + cache = new File(host.plugin.dir, "SubServers/Cache/Templates"); if (cache.isDirectory() && cache.listFiles().length == 0) cache.delete(); - cache = new UniversalFile(host.plugin.dir, "SubServers:Cache"); + cache = new File(host.plugin.dir, "SubServers/Cache"); if (cache.isDirectory() && cache.listFiles().length == 0) cache.delete(); } } - new UniversalFile(dir, "template.yml").delete(); + new File(dir, "template.yml").delete(); if (error) throw new SubCreatorException(); return server; } @@ -303,14 +305,14 @@ public class InternalSubCreator extends SubCreator { } server.setAll(config); - if (update != null) Util.isException(() -> update.getHost().forceRemoveSubServer(name)); + if (update != null) Try.all.run(() -> update.getHost().forceRemoveSubServer(name)); subserver = host.constructSubServer(name, server.getBoolean("Enabled"), port, ChatColor.translateAlternateColorCodes('&', server.getString("Motd")), server.getBoolean("Log"), server.getRawString("Directory"), server.getRawString("Executable"), server.getRawString("Stop-Command"), server.getBoolean("Hidden"), server.getBoolean("Restricted")); if (server.getString("Display").length() > 0) subserver.setDisplayName(server.getString("Display")); subserver.setTemplate(server.getRawString("Template")); for (String group : server.getStringList("Group")) subserver.addGroup(group); - SubServer.StopAction action = Util.getDespiteException(() -> SubServer.StopAction.valueOf(server.getRawString("Stop-Action").toUpperCase().replace('-', '_').replace(' ', '_')), null); + SubServer.StopAction action = Try.all.get(() -> SubServer.StopAction.valueOf(server.getRawString("Stop-Action").toUpperCase().replace('-', '_').replace(' ', '_'))); if (action != null) subserver.setStopAction(action); if (server.contains("Extra")) for (String extra : server.getMap("Extra").getKeys()) subserver.addExtra(extra, server.getMap("Extra").getObject(extra)); @@ -329,16 +331,16 @@ public class InternalSubCreator extends SubCreator { InternalSubCreator.this.thread.remove(name.toLowerCase()); host.plugin.getPluginManager().callEvent(new SubCreatedEvent(player, host, name, template, version, port, subserver, update != null, true)); - callback.run(subserver); + callback.accept(subserver); } catch (Exception e) { e.printStackTrace(); host.plugin.getPluginManager().callEvent(new SubCreatedEvent(player, host, name, template, version, port, update, update != null, false)); - callback.run(null); + callback.accept(null); } } else { Logger.get(prefix).info("Couldn't build the server jar. Check the SubCreator logs for more detail."); host.plugin.getPluginManager().callEvent(new SubCreatedEvent(player, host, name, template, version, port, update, update != null, false)); - callback.run(null); + callback.accept(null); } InternalSubCreator.this.thread.remove(name.toLowerCase()); } @@ -354,7 +356,7 @@ public class InternalSubCreator extends SubCreator { */ public InternalSubCreator(InternalHost host, Range ports, boolean log, String gitBash) { if (!ports.hasLowerBound() || !ports.hasUpperBound()) throw new IllegalArgumentException("Port range is not bound"); - if (Util.isNull(host, ports, log, gitBash)) throw new NullPointerException(); + Util.nullpo(host, ports, log, gitBash); this.host = host; this.ports = ports; this.log = new Container(log); @@ -367,11 +369,11 @@ public class InternalSubCreator extends SubCreator { @Override public void reload() { templates.clear(); - if (new UniversalFile(host.plugin.dir, "SubServers:Templates").exists()) - for (File file : new UniversalFile(host.plugin.dir, "SubServers:Templates").listFiles()) { + if (new File(host.plugin.dir, "SubServers/Templates").exists()) + for (File file : new File(host.plugin.dir, "SubServers/Templates").listFiles()) { try { if (file.isDirectory() && !file.getName().endsWith(".x")) { - ObjectMap config = (new UniversalFile(file, "template.yml").exists()) ? new YAMLConfig(new UniversalFile(file, "template.yml")).get().getMap("Template", new ObjectMap()) : new ObjectMap(); + ObjectMap config = (new File(file, "template.yml").exists())? new YAMLConfig(new File(file, "template.yml")).get().getMap("Template", new ObjectMap()) : new ObjectMap(); ServerTemplate template = loadTemplate(file.getName(), config.getBoolean("Enabled", true), config.getBoolean("Internal", false), config.getRawString("Icon", "::NULL::"), file, config.getMap("Build", new ObjectMap()), config.getMap("Settings", new ObjectMap())); templates.put(file.getName().toLowerCase(), template); if (config.getKeys().contains("Display")) template.setDisplayName(config.getString("Display")); @@ -385,8 +387,8 @@ public class InternalSubCreator extends SubCreator { @SuppressWarnings("deprecation") @Override - public boolean create(UUID player, String name, ServerTemplate template, Version version, Integer port, Callback callback) { - if (Util.isNull(name, template)) throw new NullPointerException(); + public boolean create(UUID player, String name, ServerTemplate template, Version version, Integer port, Consumer callback) { + Util.nullpo(name, template); if (host.isAvailable() && host.isEnabled() && template.isEnabled() && !SubAPI.getInstance().getSubServers().keySet().contains(name.toLowerCase()) && !SubCreator.isReserved(name) && (version != null || !template.requiresVersion())) { StackTraceElement[] origin = new Exception().getStackTrace(); @@ -403,7 +405,7 @@ public class InternalSubCreator extends SubCreator { CreatorTask task = new CreatorTask(player, name, template, version, port, server -> { if (callback != null) try { - callback.run(server); + callback.accept(server); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -426,8 +428,8 @@ public class InternalSubCreator extends SubCreator { @SuppressWarnings("deprecation") @Override - public boolean update(UUID player, SubServer server, ServerTemplate template, Version version, Callback callback) { - if (Util.isNull(server)) throw new NullPointerException(); + public boolean update(UUID player, SubServer server, ServerTemplate template, Version version, Consumer callback) { + Util.nullpo(server); final ServerTemplate ft = (template == null)?server.getTemplate():template; if (host.isAvailable() && host.isEnabled() && host == server.getHost() && server.isAvailable() && !server.isRunning() && ft != null && ft.isEnabled() && ft.canUpdate() && (version != null || !ft.requiresVersion())) { StackTraceElement[] origin = new Exception().getStackTrace(); @@ -436,7 +438,7 @@ public class InternalSubCreator extends SubCreator { CreatorTask task = new CreatorTask(player, server, ft, version, x -> { ((InternalSubServer) server).updating(false); if (callback != null) try { - callback.run(x != null); + callback.accept(x != null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -538,7 +540,7 @@ public class InternalSubCreator extends SubCreator { @Override public void setLogging(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); log.value(value); } @@ -565,7 +567,7 @@ public class InternalSubCreator extends SubCreator { @Override public ServerTemplate getTemplate(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); ServerTemplate template = templates.getOrDefault(name.toLowerCase(), null); if (template == null || template.isInternal()) { @@ -590,32 +592,32 @@ public class InternalSubCreator extends SubCreator { boolean installed = false; if (type == ServerType.SPIGOT) { installed = true; - if (!new UniversalFile(dir, "plugins").exists()) new UniversalFile(dir, "plugins").mkdirs(); - if (!new UniversalFile(dir, "plugins:SubServers.Client.jar").exists()) - Util.copyFromJar(SubProxy.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/client.jar", new UniversalFile(dir, "plugins:SubServers.Client.jar").getPath()); + if (!new File(dir, "plugins").exists()) new File(dir, "plugins").mkdirs(); + if (!new File(dir, "plugins/SubServers.Client.jar").exists()) + Util.copyFromJar(SubProxy.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/client.jar", new File(dir, "plugins/SubServers.Client.jar").getPath()); } else if (type == ServerType.FORGE || type == ServerType.SPONGE) { installed = true; - if (!new UniversalFile(dir, "mods").exists()) new UniversalFile(dir, "mods").mkdirs(); - if (!new UniversalFile(dir, "mods:SubServers.Client.jar").exists()) - Util.copyFromJar(SubProxy.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/client.jar", new UniversalFile(dir, "mods:SubServers.Client.jar").getPath()); + if (!new File(dir, "mods").exists()) new File(dir, "mods").mkdirs(); + if (!new File(dir, "mods/SubServers.Client.jar").exists()) + Util.copyFromJar(SubProxy.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/client.jar", new File(dir, "mods/SubServers.Client.jar").getPath()); } if (installed) { YAMLSection config = new YAMLSection(); - FileWriter writer = new FileWriter(new UniversalFile(dir, "subdata.json"), false); + FileWriter writer = new FileWriter(new File(dir, "subdata.json"), false); config.setAll(getSubData()); writer.write(config.toJSON().toString()); writer.close(); - if (!new UniversalFile(dir, "subdata.rsa.key").exists() && new UniversalFile("SubServers:subdata.rsa.key").exists()) { - Files.copy(new UniversalFile("SubServers:subdata.rsa.key").toPath(), new UniversalFile(dir, "subdata.rsa.key").toPath()); + if (!new File(dir, "subdata.rsa.key").exists() && new File("SubServers/subdata.rsa.key").exists()) { + Files.copy(new File("SubServers/subdata.rsa.key").toPath(), new File(dir, "subdata.rsa.key").toPath()); } } } private void updateDirectory(File from, File to, boolean overwrite) { if (!to.exists()) { - Util.copyDirectory(from, to); + Directories.copy(from, to); } else if (from.isDirectory() && !Files.isSymbolicLink(from.toPath())) { String files[] = from.list(); @@ -629,7 +631,7 @@ public class InternalSubCreator extends SubCreator { try { if (overwrite && (from.length() != to.length() || !Arrays.equals(generateSHA256(to), generateSHA256(from)))) { if (to.exists()) { - if (to.isDirectory()) Util.deleteDirectory(to); + if (to.isDirectory()) Directories.delete(to); else to.delete(); } Files.copy(from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS, StandardCopyOption.REPLACE_EXISTING); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java index f452b975..b2f1a549 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Host.Internal; import net.ME1312.Galaxi.Library.Container.Value; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Bungee.Host.SubLogFilter; import net.ME1312.SubServers.Bungee.Host.SubLogger; @@ -189,14 +190,14 @@ public class InternalSubLogger extends SubLogger { @Override public void registerFilter(SubLogFilter filter) { - if (Util.isNull(filter)) throw new NullPointerException(); + Util.nullpo(filter); filters.add(filter); } @Override public void unregisterFilter(SubLogFilter filter) { - if (Util.isNull(filter)) throw new NullPointerException(); - Util.isException(() -> filters.remove(filter)); + Util.nullpo(filter); + Try.all.run(() -> filters.remove(filter)); } @Override diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java index 9a57f2ad..7c1379fb 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java @@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Server.SubDataClient; @@ -18,15 +18,16 @@ import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExEditServer.Edit; import net.ME1312.SubServers.Bungee.SubAPI; import net.ME1312.SubServers.Bungee.SubProxy; -import net.md_5.bungee.BungeeServerInfo; import net.md_5.bungee.api.ChatColor; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; import java.io.OutputStreamWriter; -import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; import java.util.jar.JarFile; import java.util.jar.JarInputStream; @@ -93,7 +94,7 @@ public class InternalSubServer extends SubServerImpl { } private void init(InternalHost host, String name, boolean enabled, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted) throws InvalidServerException { - if (Util.isNull(host, name, enabled, port, motd, log, directory, executable, stopcmd, hidden, restricted)) throw new NullPointerException(); + Util.nullpo(host, name, enabled, port, motd, log, directory, executable, stopcmd, hidden, restricted); this.host = host; this.enabled = enabled; this.log = new Container(log); @@ -107,12 +108,12 @@ public class InternalSubServer extends SubServerImpl { this.logger = new InternalSubLogger(null, this, getName(), this.log, null); this.thread = null; this.command = null; - final UniversalFile[] locations = new UniversalFile[] { - new UniversalFile(this.directory, "plugins:SubServers.Client.jar"), - new UniversalFile(this.directory, "mods:SubServers.Client.jar") + final File[] locations = new File[] { + new File(this.directory, "plugins/SubServers.Client.jar"), + new File(this.directory, "mods/SubServers.Client.jar") }; - for (UniversalFile location : locations) { + for (File location : locations) { if (location.exists()) { try { JarInputStream updated = new JarInputStream(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/client.jar")); @@ -275,7 +276,7 @@ public class InternalSubServer extends SubServerImpl { @Override public boolean command(UUID player, String command) { - if (Util.isNull(command)) throw new NullPointerException(); + Util.nullpo(command); if (thread != null && thread.isAlive()) { SubSendCommandEvent event = new SubSendCommandEvent(player, this, command); host.plugin.getPluginManager().callEvent(event); @@ -467,7 +468,7 @@ public class InternalSubServer extends SubServerImpl { break; case "stop-action": if (value.isString()) { - StopAction action = Util.getDespiteException(() -> StopAction.valueOf(value.asRawString().toUpperCase().replace('-', '_').replace(' ', '_')), null); + StopAction action = Try.all.get(() -> StopAction.valueOf(value.asRawString().toUpperCase().replace('-', '_').replace(' ', '_'))); if (action != null) { stopaction = action; if (perma && this.host.plugin.servers.get().getMap("Servers").getKeys().contains(getName())) { @@ -598,7 +599,7 @@ public class InternalSubServer extends SubServerImpl { @Override public void setEnabled(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); enabled = value; } @@ -609,7 +610,7 @@ public class InternalSubServer extends SubServerImpl { @Override public void setLogging(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); log.value(value); } @@ -640,7 +641,7 @@ public class InternalSubServer extends SubServerImpl { @Override public void setStopCommand(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); stopcmd = value; } @@ -651,7 +652,7 @@ public class InternalSubServer extends SubServerImpl { @Override public void setStopAction(StopAction action) { - if (Util.isNull(action)) throw new NullPointerException(); + Util.nullpo(action); stopaction = action; } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java index b729b234..4fbb9aa4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java @@ -19,9 +19,9 @@ import java.util.*; /** * Proxy Class */ -public class Proxy implements ClientHandler, ExtraDataHandler { - private HashMap subdata = new HashMap(); - private ObjectMap extra = new ObjectMap(); +public class Proxy implements ClientHandler, ExtraDataHandler { + private final HashMap subdata = new HashMap(); + private final ObjectMap extra = new ObjectMap(); private final String signature; private boolean persistent = false; private String nick = null; @@ -158,19 +158,19 @@ public class Proxy implements ClientHandler, ExtraDataHandler { @Override public void addExtra(String handle, Object value) { - if (Util.isNull(handle, value)) throw new NullPointerException(); + Util.nullpo(handle, value); extra.set(handle, value); } @Override public boolean hasExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return extra.getKeys().contains(handle); } @Override public ObjectMapValue getExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return extra.get(handle); } @@ -181,7 +181,7 @@ public class Proxy implements ClientHandler, ExtraDataHandler { @Override public void removeExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); extra.remove(handle); } 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 de51a565..515166e2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/RemotePlayer.java @@ -1,13 +1,14 @@ package net.ME1312.SubServers.Bungee.Host; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.SubDataClient; import net.ME1312.SubData.Server.SubDataSerializable; import net.ME1312.SubServers.Bungee.Library.Compatibility.RPSI; -import net.ME1312.SubServers.Bungee.Network.Packet.*; +import net.ME1312.SubServers.Bungee.Network.Packet.PacketDisconnectPlayer; +import net.ME1312.SubServers.Bungee.Network.Packet.PacketMessagePlayer; +import net.ME1312.SubServers.Bungee.Network.Packet.PacketTransferPlayer; import net.ME1312.SubServers.Bungee.SubAPI; import net.md_5.bungee.api.ProxyServer; @@ -19,6 +20,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; import java.util.Arrays; import java.util.UUID; +import java.util.function.IntConsumer; /** * Remote Player Class @@ -48,7 +50,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat * @param server Server the player is on */ public RemotePlayer(ProxiedPlayer player, ServerInfo server) { - if (Util.isNull(player)) throw new NullPointerException(); + Util.nullpo(player); this.local = player; this.id = player.getUniqueId(); this.server = (server instanceof Server)? (Server) server : null; @@ -64,7 +66,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat * @param ip Player IP Address */ public RemotePlayer(String name, UUID id, Proxy proxy, ServerInfo server, InetSocketAddress ip) { - if (Util.isNull(name, id, proxy, ip)) throw new NullPointerException(); + Util.nullpo(name, id, proxy, ip); this.id = id; this.name = name; this.ip = ip; @@ -156,11 +158,11 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat // These overrides provide for the static methods in BungeeCommon new RPSI() { @Override - protected void sendMessage(UUID[] players, String[] messages, Callback response) { + protected void sendMessage(UUID[] players, String[] messages, IntConsumer response) { StackTraceElement[] origin = new Exception().getStackTrace(); PacketMessagePlayer.run(Arrays.asList(players), new ContainedPair<>(messages, null), null, i -> { try { - response.run(i); + response.accept(i); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -170,11 +172,11 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat } @Override - protected void sendMessage(UUID[] players, BaseComponent[][] messages, Callback response) { + protected void sendMessage(UUID[] players, BaseComponent[][] messages, IntConsumer response) { StackTraceElement[] origin = new Exception().getStackTrace(); PacketMessagePlayer.run(Arrays.asList(players), new ContainedPair<>(null, messages), null, i -> { try { - response.run(i); + response.accept(i); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -184,11 +186,11 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat } @Override - protected void transfer(UUID[] players, String server, Callback response) { + protected void transfer(UUID[] players, String server, IntConsumer response) { StackTraceElement[] origin = new Exception().getStackTrace(); PacketTransferPlayer.run(Arrays.asList(players), server, i -> { try { - response.run(i); + response.accept(i); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -198,11 +200,11 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat } @Override - protected void disconnect(UUID[] players, String reason, Callback response) { + protected void disconnect(UUID[] players, String reason, IntConsumer response) { StackTraceElement[] origin = new Exception().getStackTrace(); PacketDisconnectPlayer.run(Arrays.asList(players), reason, i -> { try { - response.run(i); + response.accept(i); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -218,11 +220,11 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(messages); } - public static void broadcastMessage(String message, Callback response) { + public static void broadcastMessage(String message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(message, response); } - public static void broadcastMessage(String[] messages, Callback response) { + public static void broadcastMessage(String[] messages, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(messages, response); } @@ -230,11 +232,11 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, messages); } - public static void sendMessage(UUID[] players, String message, Callback response) { + public static void sendMessage(UUID[] players, String message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, message, response); } - public static void sendMessage(UUID[] players, String[] messages, Callback response) { + public static void sendMessage(UUID[] players, String[] messages, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, messages, response); } @@ -242,11 +244,11 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(message); } - public static void broadcastMessage(BaseComponent message, Callback response) { + public static void broadcastMessage(BaseComponent message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(message, response); } - public static void broadcastMessage(BaseComponent[] message, Callback response) { + public static void broadcastMessage(BaseComponent[] message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(message, response); } @@ -254,7 +256,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(messages); } - public static void broadcastMessage(BaseComponent[][] messages, Callback response) { + public static void broadcastMessage(BaseComponent[][] messages, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(messages, response); } @@ -262,11 +264,11 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, message); } - public static void sendMessage(UUID[] players, BaseComponent message, Callback response) { + public static void sendMessage(UUID[] players, BaseComponent message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, message, response); } - public static void sendMessage(UUID[] players, BaseComponent[] message, Callback response) { + public static void sendMessage(UUID[] players, BaseComponent[] message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, message, response); } @@ -274,7 +276,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, messages); } - public static void sendMessage(UUID[] players, BaseComponent[][] messages, Callback response) { + public static void sendMessage(UUID[] players, BaseComponent[][] messages, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, messages, response); } @@ -282,7 +284,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.transfer(players, server); } - public static void transfer(UUID[] players, String server, Callback response) { + public static void transfer(UUID[] players, String server, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.transfer(players, server, response); } @@ -290,7 +292,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.transfer(players, server); } - public static void transfer(UUID[] players, ServerInfo server, Callback response) { + public static void transfer(UUID[] players, ServerInfo server, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.transfer(players, server, response); } @@ -298,7 +300,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.disconnect(players); } - public static void disconnect(UUID[] players, Callback response) { + public static void disconnect(UUID[] players, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.disconnect(players, response); } @@ -306,7 +308,7 @@ public class RemotePlayer implements net.ME1312.SubServers.Bungee.Library.Compat net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.disconnect(players, reason); } - public static void disconnect(UUID[] players, String reason, Callback response) { + public static void disconnect(UUID[] players, String reason, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.disconnect(players, reason, response); } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java index abe6cb95..2ab30937 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java @@ -13,7 +13,7 @@ import java.util.UUID; /** * Server Interface */ -public interface Server extends ServerInfo, ClientHandler, ExtraDataHandler { +public interface Server extends ServerInfo, ClientHandler, ExtraDataHandler { /** * Link a SubData Client to this Object diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java index a4da49a3..d5af0410 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java @@ -5,7 +5,6 @@ import net.ME1312.Galaxi.Library.Map.ObjectMapValue; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.DataClient; import net.ME1312.SubData.Server.SubDataClient; -import net.ME1312.SubServers.Bungee.Event.SubRemoveProxyEvent; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException; import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExEditServer; import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExEditServer.Edit; @@ -13,7 +12,6 @@ import net.ME1312.SubServers.Bungee.SubAPI; import net.md_5.bungee.BungeeServerInfo; import net.md_5.bungee.api.CommandSender; -import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; import java.net.InetSocketAddress; @@ -71,7 +69,7 @@ public class ServerImpl extends BungeeServerInfo implements Server { @SuppressWarnings("deprecation") private void init(String name, SocketAddress address, String motd, boolean hidden, boolean restricted) throws InvalidServerException { - if (Util.isNull(name, address, motd, hidden, restricted)) throw new NullPointerException(); + Util.nullpo(name, address, motd, hidden, restricted); if (name.contains(" ")) throw new InvalidServerException("Server names cannot have spaces: " + name); SubAPI.getInstance().getInternals().subprotocol.whitelist(getAddress().getAddress().getHostAddress()); this.hidden = hidden; @@ -160,7 +158,7 @@ public class ServerImpl extends BungeeServerInfo implements Server { @Override @SuppressWarnings("deprecation") public void addGroup(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); if (value.length() > 0 && !groups.contains(value)) { groups.add(value); Collections.sort(groups); @@ -170,7 +168,7 @@ public class ServerImpl extends BungeeServerInfo implements Server { @Override @SuppressWarnings("deprecation") public void removeGroup(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); groups.remove(value); Collections.sort(groups); } @@ -194,7 +192,7 @@ public class ServerImpl extends BungeeServerInfo implements Server { } public void setMotd(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); try { Util.reflect(BungeeServerInfo.class.getDeclaredField("motd"), this, value); for (Proxy proxy : SubAPI.getInstance().getProxies().values()) if (proxy.getSubData()[0] != null) { @@ -206,7 +204,7 @@ public class ServerImpl extends BungeeServerInfo implements Server { } public void setRestricted(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); try { Util.reflect(BungeeServerInfo.class.getDeclaredField("restricted"), this, value); @@ -241,7 +239,7 @@ public class ServerImpl extends BungeeServerInfo implements Server { @Override public void whitelist(UUID player) { - if (Util.isNull(player)) throw new NullPointerException(); + Util.nullpo(player); if (!whitelist.contains(player)) whitelist.add(player); if (isRegistered()) for (Proxy proxy : SubAPI.getInstance().getProxies().values()) if (proxy.getSubData()[0] != null) { ((SubDataClient) proxy.getSubData()[0]).sendPacket(new PacketOutExEditServer(this, Edit.WHITELIST_ADD, player)); @@ -250,7 +248,7 @@ public class ServerImpl extends BungeeServerInfo implements Server { @Override public void unwhitelist(UUID player) { - if (Util.isNull(player)) throw new NullPointerException(); + Util.nullpo(player); whitelist.remove(player); if (isRegistered()) for (Proxy proxy : SubAPI.getInstance().getProxies().values()) if (proxy.getSubData()[0] != null) { ((SubDataClient) proxy.getSubData()[0]).sendPacket(new PacketOutExEditServer(this, Edit.WHITELIST_REMOVE, player)); @@ -269,19 +267,19 @@ public class ServerImpl extends BungeeServerInfo implements Server { @Override public void addExtra(String handle, Object value) { - if (Util.isNull(handle, value)) throw new NullPointerException(); + Util.nullpo(handle, value); extra.set(handle, value); } @Override public boolean hasExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return extra.getKeys().contains(handle); } @Override public ObjectMapValue getExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return extra.get(handle); } @@ -292,7 +290,7 @@ public class ServerImpl extends BungeeServerInfo implements Server { @Override public void removeExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); extra.remove(handle); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java index f2085f72..2d6d996f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Host; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; @@ -12,6 +11,7 @@ import com.google.common.collect.Range; import java.io.File; import java.net.InetSocketAddress; import java.util.*; +import java.util.function.Consumer; /** * SubCreator Layout Class @@ -44,7 +44,7 @@ public abstract class SubCreator { } private ServerTemplate(String name, boolean enabled, boolean internal, String icon, File directory, ObjectMap build, ObjectMap options, boolean dynamic) { - if (Util.isNull(name, enabled, directory, build, options)) throw new NullPointerException(); + Util.nullpo(name, enabled, directory, build, options); if (name.contains(" ")) throw new InvalidTemplateException("Template names cannot have spaces: " + name); this.name = name; this.enabled = enabled; @@ -233,7 +233,7 @@ public abstract class SubCreator { * @param callback Callback * @return Success Status */ - public abstract boolean create(UUID player, String name, ServerTemplate template, Version version, Integer port, Callback callback); + public abstract boolean create(UUID player, String name, ServerTemplate template, Version version, Integer port, Consumer callback); /** * Create a SubServer @@ -259,7 +259,7 @@ public abstract class SubCreator { * @param callback Callback * @return Success Status */ - public boolean create(String name, ServerTemplate template, Version version, Integer port, Callback callback) { + public boolean create(String name, ServerTemplate template, Version version, Integer port, Consumer callback) { return create(null, name, template, version, port, callback); } @@ -286,7 +286,7 @@ public abstract class SubCreator { * @param callback Callback * @return Success Status */ - public abstract boolean update(UUID player, SubServer server, ServerTemplate template, Version version, Callback callback); + public abstract boolean update(UUID player, SubServer server, ServerTemplate template, Version version, Consumer callback); /** * Update a SubServer @@ -310,7 +310,7 @@ public abstract class SubCreator { * @param callback Callback * @return Success Status */ - public boolean update(SubServer server, ServerTemplate template, Version version, Callback callback) { + public boolean update(SubServer server, ServerTemplate template, Version version, Consumer callback) { return update(null, server, template, version, callback); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServer.java index efb8c5e5..ff602504 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServer.java @@ -40,7 +40,7 @@ public interface SubServer extends Server { * @param command Command */ public LoggedCommand(String command) { - if (Util.isNull(command)) throw new NullPointerException(); + Util.nullpo(command); this.date = Calendar.getInstance().getTime(); this.sender = null; this.command = command; @@ -53,7 +53,7 @@ public interface SubServer extends Server { * @param command Command */ public LoggedCommand(UUID sender, String command) { - if (Util.isNull(command)) throw new NullPointerException(); + Util.nullpo(command); this.date = Calendar.getInstance().getTime(); this.sender = sender; this.command = command; @@ -67,7 +67,7 @@ public interface SubServer extends Server { * @param command Command */ public LoggedCommand(Date date, UUID sender, String command) { - if (Util.isNull(date, command)) throw new NullPointerException(); + Util.nullpo(date, command); this.date = date; this.sender = sender; this.command = command; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java index 64cb4449..e6d7116a 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java @@ -1,13 +1,12 @@ package net.ME1312.SubServers.Bungee; import net.ME1312.Galaxi.Library.Platform; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Try; import java.security.Security; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import java.util.logging.Logger; /** * SubServers/BungeeCord Launch Class @@ -26,7 +25,7 @@ public final class Launch { System.setProperty("jdk.util.jar.enableMultiRelease", "force"); System.setProperty("apple.laf.useScreenMenuBar", "true"); - if (Util.getDespiteException(() -> Class.forName("net.md_5.bungee.BungeeCord") == null, true)) { + if (Try.all.get(() -> Class.forName("net.md_5.bungee.BungeeCord") == null, true)) { System.out.println(""); System.out.println("*******************************************"); System.out.println("*** Error: BungeeCord.jar Doesn't Exist ***"); @@ -92,9 +91,9 @@ public final class Launch { if (!options.has("noconsole")) { try { - if (Util.getDespiteException(() -> Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("readCommands") != null, false)) { // Waterfall Setup + if (Try.all.get(() -> Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("readCommands") != null, false)) { // Waterfall Setup Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("readCommands").invoke(null); - } else if (Util.getDespiteException(() -> Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("start") != null, false)) { + } else if (Try.all.get(() -> Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("start") != null, false)) { Class console = Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole"); console.getMethod("start").invoke(console.getConstructor().newInstance()); } else { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java index dc221261..dc8f7609 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/JNA.java @@ -1,10 +1,11 @@ package net.ME1312.SubServers.Bungee.Library.Compatibility; -import net.ME1312.Galaxi.Library.UniversalFile; + import net.ME1312.SubServers.Bungee.SubAPI; import com.google.common.io.Resources; +import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.net.URL; @@ -28,8 +29,8 @@ public class JNA { public static ClassLoader get() { if (JNA == null) { boolean announced = false; - UniversalFile library = new UniversalFile(SubAPI.getInstance().getInternals().dir, "SubServers:Cache:Libraries"); - UniversalFile jna = new UniversalFile(library, "jna-" + JNA_VERSION + ".jar"); + File library = new File(SubAPI.getInstance().getInternals().dir, "SubServers/Cache/Libraries"); + File jna = new File(library, "jna-" + JNA_VERSION + ".jar"); jna.getParentFile().mkdirs(); if (!jna.exists()) { announced = true; @@ -41,7 +42,7 @@ public class JNA { e.printStackTrace(); } } - UniversalFile platform = new UniversalFile(library, "jna-platform-" + JNA_VERSION + ".jar"); + File platform = new File(library, "jna-platform-" + JNA_VERSION + ".jar"); platform.getParentFile().mkdirs(); if (!platform.exists()) { if (!announced) System.out.println(">> Downloading JNA Library v" + JNA_VERSION); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/LegacyServerMap.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/LegacyServerMap.java index 446941d9..fe99e0f0 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/LegacyServerMap.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/LegacyServerMap.java @@ -5,10 +5,8 @@ import net.ME1312.SubServers.Bungee.SubAPI; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.util.CaseInsensitiveMap; -import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; /** * Legacy Server Map Translation Class diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/FileScanner.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/FileScanner.java index 609e5802..a0b3e925 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/FileScanner.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/FileScanner.java @@ -1,10 +1,13 @@ package net.ME1312.SubServers.Bungee.Library; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Directories; -import java.io.*; -import java.lang.reflect.InvocationTargetException; -import java.util.*; +import java.io.File; +import java.io.IOException; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.PrimitiveIterator; import java.util.regex.Pattern; /** @@ -19,7 +22,7 @@ public abstract class FileScanner { * @param whitelist File Whitelist */ protected void scan(File dir, String... whitelist) throws IOException { - List files = Util.searchDirectory(dir); + List files = Directories.search(dir); if (files.size() <= 0 || whitelist.length <= 0) return; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java index f98fbed4..7feff2ed 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java @@ -4,14 +4,17 @@ import net.ME1312.SubData.Server.DataServer; import net.ME1312.SubServers.Bungee.BungeeCommon; import net.ME1312.SubServers.Bungee.SubAPI; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; +import gnu.trove.map.hash.TIntObjectHashMap; +import net.md_5.bungee.api.ProxyServer; +import net.md_5.bungee.api.connection.ProxiedPlayer; +import net.md_5.bungee.api.plugin.Plugin; +import net.md_5.bungee.config.Configuration; +import net.md_5.bungee.config.ConfigurationProvider; +import net.md_5.bungee.config.YamlConfiguration; +import net.md_5.bungee.protocol.ProtocolConstants; + +import javax.net.ssl.HttpsURLConnection; +import java.io.*; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.net.URL; @@ -27,16 +30,6 @@ import java.util.function.Supplier; import java.util.logging.Level; import java.util.stream.Collectors; import java.util.zip.GZIPOutputStream; -import javax.net.ssl.HttpsURLConnection; - -import gnu.trove.map.hash.TIntObjectHashMap; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.api.plugin.Plugin; -import net.md_5.bungee.config.Configuration; -import net.md_5.bungee.config.ConfigurationProvider; -import net.md_5.bungee.config.YamlConfiguration; -import net.md_5.bungee.protocol.ProtocolConstants; public class Metrics { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/ReplacementScanner.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/ReplacementScanner.java index 839cb0ca..353bd004 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/ReplacementScanner.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/ReplacementScanner.java @@ -3,9 +3,7 @@ package net.ME1312.SubServers.Bungee.Library; import net.ME1312.Galaxi.Library.Util; import java.io.*; -import java.lang.reflect.InvocationTargetException; import java.util.*; -import java.util.regex.Pattern; /** * File Replacement Scanner diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java index 1ca75566..6d843190 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketAddServer.java @@ -28,7 +28,7 @@ public class PacketAddServer implements PacketObjectIn, PacketObjectOut * @param plugin SubPlugin */ public PacketAddServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermission.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermission.java index fd085c88..de9c21cf 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermission.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermission.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Server.SubDataClient; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Check Permission Packet */ public class PacketCheckPermission implements PacketObjectIn, PacketObjectOut { - static HashMap[]> callbacks = new HashMap[]>(); + static HashMap[]> callbacks = new HashMap[]>(); private UUID player; private String permission; private UUID tracker; @@ -32,7 +32,7 @@ public class PacketCheckPermission implements PacketObjectIn, PacketObj * @param callback Callbacks */ @SafeVarargs - public PacketCheckPermission(UUID player, String permission, Callback... callback) { + public PacketCheckPermission(UUID player, String permission, Consumer... callback) { this.player = player; this.permission = permission; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java index 664b0a95..99667eb9 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java @@ -1,8 +1,7 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; import net.ME1312.SubData.Server.Protocol.PacketObjectOut; import net.ME1312.SubData.Server.SubDataClient; @@ -10,6 +9,7 @@ import net.ME1312.SubData.Server.SubDataClient; import net.md_5.bungee.api.ProxyServer; import java.util.UUID; +import java.util.function.Consumer; import static net.ME1312.SubServers.Bungee.Network.Packet.PacketCheckPermission.callbacks; @@ -34,7 +34,7 @@ public class PacketCheckPermissionResponse implements PacketObjectIn, P * @param tracker Receiver ID */ public PacketCheckPermissionResponse(UUID player, String permission, UUID tracker) { - this.result = Util.getDespiteException(() -> ProxyServer.getInstance().getPlayer(player).hasPermission(permission), false); + this.result = Try.all.get(() -> ProxyServer.getInstance().getPlayer(player).hasPermission(permission), false); this.tracker = tracker; } @@ -48,7 +48,7 @@ public class PacketCheckPermissionResponse implements PacketObjectIn, P @Override public void receive(SubDataClient client, ObjectMap data) throws Throwable { - for (Callback callback : callbacks.get(data.getUUID(0x0000))) callback.run(data.getBoolean(0x0001)); + for (Consumer callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data.getBoolean(0x0001)); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java index d556a407..4018baa2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCommandServer.java @@ -26,7 +26,7 @@ public class PacketCommandServer implements PacketObjectIn, PacketObjec * @param plugin SubPlugin */ public PacketCommandServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDeleteServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDeleteServer.java index 61b05fe6..7665e2bb 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDeleteServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDeleteServer.java @@ -26,7 +26,7 @@ public class PacketDeleteServer implements PacketObjectIn, PacketObject * @param plugin SubPlugin */ public PacketDeleteServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java index 5f2ec5b3..f6903278 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java @@ -1,7 +1,6 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.Galaxi.Library.AsyncConsolidator; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -9,13 +8,13 @@ import net.ME1312.SubData.Server.Protocol.PacketObjectOut; import net.ME1312.SubData.Server.SubDataClient; import net.ME1312.SubServers.Bungee.Host.Proxy; import net.ME1312.SubServers.Bungee.Host.RemotePlayer; -import net.ME1312.SubServers.Bungee.Host.Server; import net.ME1312.SubServers.Bungee.SubAPI; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; import java.util.*; +import java.util.function.IntConsumer; /** * Disconnect Player Packet @@ -59,7 +58,7 @@ public class PacketDisconnectPlayer implements PacketObjectIn, PacketOb } @SuppressWarnings("deprecation") - public static void run(List ids, String reason, Callback callback) { + public static void run(List ids, String reason, IntConsumer callback) { try { Container failures = new Container<>(0); HashMap> requests = new HashMap>(); @@ -81,10 +80,10 @@ public class PacketDisconnectPlayer implements PacketObjectIn, PacketOb } if (requests.size() == 0) { - callback.run(failures.value); + callback.accept(failures.value); } else { AsyncConsolidator merge = new AsyncConsolidator(() -> { - callback.run(failures.value); + callback.accept(failures.value); }); for (Map.Entry> entry : requests.entrySet()) { merge.reserve(); @@ -96,7 +95,7 @@ public class PacketDisconnectPlayer implements PacketObjectIn, PacketOb } } catch (Throwable e) { e.printStackTrace(); - callback.run(-1); + callback.accept(-1); } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java index 5c2d74f1..ea65dae6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadGroupInfo.java @@ -24,7 +24,7 @@ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketO * @param plugin SubPlugin */ public PacketDownloadGroupInfo(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -36,7 +36,7 @@ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketO * @param tracker Receiver ID */ public PacketDownloadGroupInfo(SubProxy plugin, List groups, UUID tracker) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.tracker = tracker; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java index 5c00ad65..b63bf91a 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java @@ -26,7 +26,7 @@ public class PacketDownloadHostInfo implements PacketObjectIn, PacketOb * @param plugin SubPlugin */ public PacketDownloadHostInfo(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -38,7 +38,7 @@ public class PacketDownloadHostInfo implements PacketObjectIn, PacketOb * @param tracker Receiver ID */ public PacketDownloadHostInfo(SubProxy plugin, List hosts, UUID tracker) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.tracker = tracker; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java index 2ef0dd9f..8f0efe82 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadPlayerInfo.java @@ -26,7 +26,7 @@ public class PacketDownloadPlayerInfo implements PacketObjectIn, Packet * @param plugin SubPlugin */ public PacketDownloadPlayerInfo(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -39,7 +39,7 @@ public class PacketDownloadPlayerInfo implements PacketObjectIn, Packet * @param tracker Receiver ID */ public PacketDownloadPlayerInfo(SubProxy plugin, List names, List ids, UUID tracker) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.tracker = tracker; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java index f941f392..15b7ab87 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadProxyInfo.java @@ -26,7 +26,7 @@ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketO * @param plugin SubPlugin */ public PacketDownloadProxyInfo(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -38,7 +38,7 @@ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketO * @param tracker Receiver ID */ public PacketDownloadProxyInfo(SubProxy plugin, List proxies, UUID tracker) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.tracker = tracker; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java index ebd82619..ca6cf046 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java @@ -26,7 +26,7 @@ public class PacketDownloadServerInfo implements PacketObjectIn, Packet * @param plugin SubPlugin */ public PacketDownloadServerInfo(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -38,7 +38,7 @@ public class PacketDownloadServerInfo implements PacketObjectIn, Packet * @param tracker Receiver ID */ public PacketDownloadServerInfo(SubProxy plugin, List servers, UUID tracker) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.tracker = tracker; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketEditServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketEditServer.java index 0f906b5c..535e6760 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketEditServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketEditServer.java @@ -27,7 +27,7 @@ public class PacketEditServer implements PacketObjectIn, PacketObjectOu * @param plugin SubPlugin */ public PacketEditServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java index 9b153d5e..b30bb56c 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -10,12 +9,13 @@ import net.ME1312.SubServers.Bungee.Host.External.ExternalSubServer; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Add Server External Host Packet */ public class PacketExAddServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private String name; private boolean enabled; private int port; @@ -35,7 +35,7 @@ public class PacketExAddServer implements PacketObjectIn, PacketObjectO * New PacketExAddServer (Out) */ @SafeVarargs - public PacketExAddServer(ExternalSubServer server, UUID running, Callback>... callback) { + public PacketExAddServer(ExternalSubServer server, UUID running, Consumer>... callback) { if (callback == null) throw new NullPointerException(); this.name = server.getName(); this.enabled = server.isEnabled(); @@ -66,7 +66,7 @@ public class PacketExAddServer implements PacketObjectIn, PacketObjectO @Override public void receive(SubDataClient client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java index c8899208..915614d6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; import net.ME1312.SubData.Server.Protocol.PacketObjectOut; @@ -43,7 +44,7 @@ public class PacketExConfigureHost implements PacketObjectIn, PacketObj public void receive(SubDataClient client, ObjectMap data) { if (client.getHandler() != null && client.getHandler() instanceof ExternalHost && plugin.config.get().getMap("Hosts").getKeys().contains(((ExternalHost) client.getHandler()).getName())) { client.sendPacket(new PacketExConfigureHost(plugin, (ExternalHost) client.getHandler())); - Util.isException(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("enableRT"), ((ExternalHost) client.getHandler()).getCreator(), ((data == null || data.getBoolean(0x0000, false))?null:false))); + Try.all.run(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("enableRT"), ((ExternalHost) client.getHandler()).getCreator(), ((data == null || data.getBoolean(0x0000, false))?null:false))); } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java index 50670752..195eed25 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; @@ -12,12 +11,13 @@ import net.ME1312.SubServers.Bungee.Host.SubServer; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Create Server External Host Packet */ public class PacketExCreateServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String name; private SubCreator.ServerTemplate template; @@ -45,8 +45,8 @@ public class PacketExCreateServer implements PacketObjectIn, PacketObje * @param callback Callbacks */ @SafeVarargs - public PacketExCreateServer(UUID player, SubServer server, SubCreator.ServerTemplate template, Version version, UUID log, Callback>... callback) { - if (Util.isNull(server, template, log, callback)) throw new NullPointerException(); + public PacketExCreateServer(UUID player, SubServer server, SubCreator.ServerTemplate template, Version version, UUID log, Consumer>... callback) { + Util.nullpo(server, template, log, callback); this.player = player; this.name = server.getName(); this.template = template; @@ -70,8 +70,8 @@ public class PacketExCreateServer implements PacketObjectIn, PacketObje * @param callback Callbacks */ @SafeVarargs - public PacketExCreateServer(UUID player, String name, SubCreator.ServerTemplate template, Version version, int port, UUID log, Callback>... callback) { - if (Util.isNull(name, template, port, log, callback)) throw new NullPointerException(); + public PacketExCreateServer(UUID player, String name, SubCreator.ServerTemplate template, Version version, int port, UUID log, Consumer>... callback) { + Util.nullpo(name, template, port, log, callback); this.player = player; this.name = name; this.template = template; @@ -117,7 +117,7 @@ public class PacketExCreateServer implements PacketObjectIn, PacketObje @Override public void receive(SubDataClient client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java index 1391172c..8fc5e712 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDeleteServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Server.SubDataClient; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Delete Server External Host Packet */ public class PacketExDeleteServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private String name; private ObjectMap info; private boolean recycle; @@ -33,8 +33,8 @@ public class PacketExDeleteServer implements PacketObjectIn, PacketObje * @param callback Callbacks */ @SafeVarargs - public PacketExDeleteServer(String name, ObjectMap info, boolean recycle, Callback>... callback) { - if (Util.isNull(name, info, callback)) throw new NullPointerException(); + public PacketExDeleteServer(String name, ObjectMap info, boolean recycle, Consumer>... callback) { + Util.nullpo(name, info, callback); this.name = name; this.info = info; this.recycle = recycle; @@ -58,7 +58,7 @@ public class PacketExDeleteServer implements PacketObjectIn, PacketObje @Override public void receive(SubDataClient client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDisconnectPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDisconnectPlayer.java index d632ca1e..798fb57f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDisconnectPlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDisconnectPlayer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Server.SubDataClient; import java.util.HashMap; import java.util.List; import java.util.UUID; +import java.util.function.Consumer; /** * Disconnect External Player Packet */ public class PacketExDisconnectPlayer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private List players; private String reason; private UUID id; @@ -33,8 +33,8 @@ public class PacketExDisconnectPlayer implements PacketObjectIn, Packet * @param callback Callbacks */ @SafeVarargs - public PacketExDisconnectPlayer(List players, String reason, Callback>... callback) { - if (Util.isNull(players, callback)) throw new NullPointerException(); + public PacketExDisconnectPlayer(List players, String reason, Consumer>... callback) { + Util.nullpo(players, callback); this.players = players; this.reason = reason; this.id = Util.getNew(callbacks.keySet(), UUID::randomUUID); @@ -52,7 +52,7 @@ public class PacketExDisconnectPlayer implements PacketObjectIn, Packet @Override public void receive(SubDataClient client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java index 3ccbbc6a..40dfced6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExDownloadTemplates.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Directories; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Library.DataSize; import net.ME1312.SubData.Server.Protocol.PacketIn; @@ -45,12 +46,12 @@ public class PacketExDownloadTemplates implements PacketIn, PacketStreamOut { public void send(SubDataClient client, OutputStream stream) throws Throwable { try { if (client.getBlockSize() < DataSize.MBB) client.tempBlockSize(DataSize.MBB); - HashMap map = Util.getDespiteException(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("templates"), ((ExternalHost) client.getHandler()).getCreator()), new HashMap<>()); - File dir = new UniversalFile(plugin.dir, "SubServers:Templates"); + HashMap map = Try.all.getOrSupply(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("templates"), ((ExternalHost) client.getHandler()).getCreator()), HashMap::new); + File dir = new File(plugin.dir, "SubServers/Templates"); ZipOutputStream zip = new ZipOutputStream(stream); byte[] buffer = new byte[4096]; - for (String file : Util.searchDirectory(dir)) { + for (String file : Directories.search(dir)) { int index = file.indexOf(File.separatorChar); if (index != -1 && !map.containsKey(file.substring(0, index).toLowerCase())) { @@ -67,7 +68,7 @@ public class PacketExDownloadTemplates implements PacketIn, PacketStreamOut { } zip.close(); - Util.isException(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("enableRT"), host.getCreator(), true)); + Try.all.run(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("enableRT"), host.getCreator(), true)); } catch (Exception e) { Logger.get("SubData").info("Problem encoding template files for Host: " + host.getName()); e.printStackTrace(); 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 8b33fdb6..c911c646 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 @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Server.SubDataClient; import java.util.HashMap; import java.util.List; import java.util.UUID; +import java.util.function.Consumer; /** * Message External Player Packet */ public class PacketExMessagePlayer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private List players; private List legacy, raw; private UUID id; @@ -34,7 +34,7 @@ public class PacketExMessagePlayer implements PacketObjectIn, PacketObj * @param callback Callbacks */ @SafeVarargs - public PacketExMessagePlayer(List players, List legacy, List raw, Callback>... callback) { + public PacketExMessagePlayer(List players, List legacy, List raw, Consumer>... callback) { this.players = players; this.legacy = legacy; this.raw = raw; @@ -54,7 +54,7 @@ public class PacketExMessagePlayer implements PacketObjectIn, PacketObj @Override public void receive(SubDataClient client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExRemoveServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExRemoveServer.java index 35edc3d8..8428627f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExRemoveServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExRemoveServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Server.SubDataClient; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Create Server External Host Packet */ public class PacketExRemoveServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private String name; private UUID tracker; @@ -30,8 +30,8 @@ public class PacketExRemoveServer implements PacketObjectIn, PacketObje * @param callback Callbacks */ @SafeVarargs - public PacketExRemoveServer(String name, Callback>... callback) { - if (Util.isNull(name, callback)) throw new NullPointerException(); + public PacketExRemoveServer(String name, Consumer>... callback) { + Util.nullpo(name, callback); this.name = name; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); callbacks.put(tracker, callback); @@ -47,7 +47,7 @@ public class PacketExRemoveServer implements PacketObjectIn, PacketObje @Override public void receive(SubDataClient client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java index cb68b0d8..ff58cada 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExSyncPlayer.java @@ -32,7 +32,7 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject * @param plugin SubPlugin */ public PacketExSyncPlayer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExTransferPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExTransferPlayer.java index 1bf4216e..aba7b688 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExTransferPlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExTransferPlayer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Server.SubDataClient; import java.util.HashMap; import java.util.List; import java.util.UUID; +import java.util.function.Consumer; /** * Transfer External Player Packet */ public class PacketExTransferPlayer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private List players; private String server; private UUID id; @@ -33,8 +33,8 @@ public class PacketExTransferPlayer implements PacketObjectIn, PacketOb * @param callback Callbacks */ @SafeVarargs - public PacketExTransferPlayer(List players, String server, Callback>... callback) { - if (Util.isNull(players, server, callback)) throw new NullPointerException(); + public PacketExTransferPlayer(List players, String server, Consumer>... callback) { + Util.nullpo(players, server, callback); this.players = players; this.server = server; this.id = Util.getNew(callbacks.keySet(), UUID::randomUUID); @@ -52,7 +52,7 @@ public class PacketExTransferPlayer implements PacketObjectIn, PacketOb @Override public void receive(SubDataClient client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExUploadTemplates.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExUploadTemplates.java index d0a6d798..689ea03b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExUploadTemplates.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExUploadTemplates.java @@ -1,7 +1,7 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; import net.ME1312.SubData.Server.Protocol.PacketOut; @@ -37,13 +37,13 @@ public class PacketExUploadTemplates implements PacketObjectIn, PacketO @Override public void receive(SubDataClient client, ObjectMap data) { if (client.getHandler() != null && client.getHandler() instanceof ExternalHost) { - HashMap map = Util.getDespiteException(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("templates"), ((ExternalHost) client.getHandler()).getCreator()), new HashMap<>()); - UniversalFile templatedir = new UniversalFile(plugin.dir, "SubServers:Cache:Remote:Templates"); + HashMap map = Try.all.get(() -> Util.reflect(ExternalSubCreator.class.getDeclaredField("templates"), ((ExternalHost) client.getHandler()).getCreator()), new HashMap<>()); + File templatedir = new File(plugin.dir, "SubServers/Cache/Remote/Templates"); ObjectMap templates = new ObjectMap<>((Map) data.getObject(0x0000)); map.clear(); for (String name : templates.getKeys()) { try { - UniversalFile dir = new UniversalFile(templatedir, name); + File dir = new File(templatedir, name); SubCreator.ServerTemplate template = Util.reflect(SubCreator.class.getDeclaredMethod("loadTemplate", String.class, boolean.class, boolean.class, String.class, File.class, ObjectMap.class, ObjectMap.class), ((ExternalHost) client.getHandler()).getCreator(), name, templates.getMap(name).getBoolean("enabled"), templates.getMap(name).getBoolean("internal"), templates.getMap(name).getRawString("icon"), dir, templates.getMap(name).getMap("build").clone(), templates.getMap(name).getMap("settings").clone()); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java index e0464d3e..3052b2dd 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.Initial.InitialPacket; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -30,7 +31,7 @@ public class PacketLinkExHost implements InitialPacket, PacketObjectIn, * @param plugin SubPlugin */ public PacketLinkExHost(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -41,7 +42,7 @@ public class PacketLinkExHost implements InitialPacket, PacketObjectIn, * @param message Message */ public PacketLinkExHost(int response, String message) { - if (Util.isNull(response)) throw new NullPointerException(); + Util.nullpo(response); this.response = response; this.message = message; } @@ -62,7 +63,7 @@ public class PacketLinkExHost implements InitialPacket, PacketObjectIn, Host host = hosts.get(data.getRawString(0x0000).toLowerCase()); if (host instanceof ExternalHost) { Integer channel = data.getInt(0x0001); - HashMap subdata = Util.getDespiteException(() -> Util.reflect(ExternalHost.class.getDeclaredField("subdata"), host), null); + HashMap subdata = Try.all.get(() -> Util.reflect(ExternalHost.class.getDeclaredField("subdata"), host)); if (!subdata.keySet().contains(channel) || (channel == 0 && subdata.get(0) == null)) { ((ExternalHost) host).setSubData(client, channel); Logger.get("SubData").info(client.getAddress().toString() + " has been defined as Host: " + host.getName() + ((channel > 0)?" [+"+channel+"]":"")); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java index dc99cad3..692cddec 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.Initial.InitialPacket; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -31,7 +32,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn, * @param plugin SubPlugin */ public PacketLinkProxy(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -72,7 +73,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn, isnew = true; plugin.proxies.put(proxy.getName().toLowerCase(), proxy); } - HashMap subdata = Util.getDespiteException(() -> Util.reflect(Proxy.class.getDeclaredField("subdata"), proxy), null); + HashMap subdata = Try.all.get(() -> Util.reflect(Proxy.class.getDeclaredField("subdata"), proxy)); if (!subdata.keySet().contains(channel) || (channel == 0 && subdata.get(0) == null)) { proxy.setSubData(client, channel); if (isnew) plugin.getPluginManager().callEvent(new SubAddProxyEvent(proxy)); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java index 92378600..c66a4f99 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Library.DisconnectReason; import net.ME1312.SubData.Server.Protocol.Initial.InitialPacket; @@ -44,7 +45,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, * @param plugin SubPlugin */ public PacketLinkServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -56,7 +57,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, * @param message Message */ public PacketLinkServer(String name, int response, String message) { - if (Util.isNull(response)) throw new NullPointerException(); + Util.nullpo(response); this.name = name; this.response = response; this.message = message; @@ -137,7 +138,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, static long req = 1; static long last = Calendar.getInstance().getTime().getTime(); private void link(SubDataClient client, Server server, int channel) throws Throwable { - HashMap subdata = Util.getDespiteException(() -> Util.reflect(ServerImpl.class.getDeclaredField("subdata"), server), null); + HashMap subdata = Try.all.get(() -> Util.reflect(ServerImpl.class.getDeclaredField("subdata"), server)); if (!subdata.keySet().contains(channel) || (channel == 0 && subdata.get(0) == null)) { server.setSubData(client, channel); Logger.get("SubData").info(client.getAddress().toString() + " has been defined as " + ((server instanceof SubServer) ? "SubServer" : "Server") + ": " + server.getName() + ((channel > 0)?" [+"+channel+"]":"")); @@ -148,11 +149,11 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, client.sendPacket(new PacketOutExReset("Rogue SubServer Detected")); } else { // Drop connection if host is unavailable for rogue checking (try again later) - Util.isException(() -> Util.reflect(SubDataClient.class.getDeclaredMethod("close", DisconnectReason.class), client, DisconnectReason.CLOSE_REQUESTED)); + Try.all.run(() -> Util.reflect(SubDataClient.class.getDeclaredMethod("close", DisconnectReason.class), client, DisconnectReason.CLOSE_REQUESTED)); } } else { - if (server instanceof SubServer && !Util.getDespiteException(() -> Util.reflect(SubServerImpl.class.getDeclaredField("started"), server), true)) { - Util.isException(() -> Util.reflect(SubServerImpl.class.getDeclaredField("started"), server, true)); + if (server instanceof SubServer && !Try.all.get(() -> Util.reflect(SubServerImpl.class.getDeclaredField("started"), server), true)) { + Try.all.run(() -> Util.reflect(SubServerImpl.class.getDeclaredField("started"), server, true)); SubStartedEvent event = new SubStartedEvent((SubServer) server); ProxyServer.getInstance().getPluginManager().callEvent(event); } 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 5dbced4d..94e177bd 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 @@ -1,18 +1,15 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.Galaxi.Library.AsyncConsolidator; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; import net.ME1312.SubData.Server.Protocol.PacketObjectOut; import net.ME1312.SubData.Server.SubDataClient; import net.ME1312.SubServers.Bungee.Host.Proxy; import net.ME1312.SubServers.Bungee.Host.RemotePlayer; import net.ME1312.SubServers.Bungee.SubAPI; -import net.ME1312.SubServers.Bungee.SubProxy; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.chat.BaseComponent; @@ -20,6 +17,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.chat.ComponentSerializer; import java.util.*; +import java.util.function.IntConsumer; /** * Message Player Packet @@ -63,7 +61,7 @@ public class PacketMessagePlayer implements PacketObjectIn, PacketObjec } @SuppressWarnings("deprecation") - public static void run(List ids, ContainedPair message, ObjectMap data, Callback callback) { + public static void run(List ids, ContainedPair message, ObjectMap data, IntConsumer callback) { try { Container failures = new Container<>(0); HashMap> requests = new HashMap>(); @@ -101,10 +99,10 @@ public class PacketMessagePlayer implements PacketObjectIn, PacketObjec } if (requests.size() == 0) { - callback.run(failures.value); + callback.accept(failures.value); } else { AsyncConsolidator merge = new AsyncConsolidator(() -> { - callback.run(failures.value); + callback.accept(failures.value); }); List legacy, raw; if (data == null) { @@ -129,7 +127,7 @@ public class PacketMessagePlayer implements PacketObjectIn, PacketObjec } } catch (Throwable e) { e.printStackTrace(); - callback.run((ids == null || ids.size() == 0)? 1 : ids.size()); + callback.accept((ids == null || ids.size() == 0)? 1 : ids.size()); } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java index edcfe3cb..0052bfc1 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java @@ -28,7 +28,7 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut { * @param plugin */ public PacketOutExRunEvent(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -39,7 +39,7 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut { * @param args Arguments */ public PacketOutExRunEvent(Class event, ObjectMap args) { - if (Util.isNull(event, args)) throw new NullPointerException(); + Util.nullpo(event, args); this.type = event.getSimpleName(); this.args = args; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRemoveServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRemoveServer.java index f952d3ac..c09fbe91 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRemoveServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRemoveServer.java @@ -27,7 +27,7 @@ public class PacketRemoveServer implements PacketObjectIn, PacketObject * @param plugin SubPlugin */ public PacketRemoveServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java index e52c8ab3..9790b9e6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketRestartServer.java @@ -26,7 +26,7 @@ public class PacketRestartServer implements PacketObjectIn, PacketObjec * @param plugin SubPlugin */ public PacketRestartServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java index bb6c3a7d..74e33258 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStartServer.java @@ -27,7 +27,7 @@ public class PacketStartServer implements PacketObjectIn, PacketObjectO * @param plugin SubPlugin */ public PacketStartServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java index 6d8ce8a0..8287d981 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketStopServer.java @@ -26,7 +26,7 @@ public class PacketStopServer implements PacketObjectIn, PacketObjectOu * @param plugin SubPlugin */ public PacketStopServer(SubProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketTransferPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketTransferPlayer.java index 4d96e664..a194dbf4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketTransferPlayer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketTransferPlayer.java @@ -1,7 +1,6 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.Galaxi.Library.AsyncConsolidator; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubData.Server.Protocol.PacketObjectIn; @@ -16,6 +15,7 @@ import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; import java.util.*; +import java.util.function.IntConsumer; /** * Transfer Player Packet @@ -58,7 +58,7 @@ public class PacketTransferPlayer implements PacketObjectIn, PacketObje }); } - public static void run(List ids, String name, Callback callback) { + public static void run(List ids, String name, IntConsumer callback) { try { Container failures = new Container<>(0); HashMap> requests = new HashMap>(); @@ -81,10 +81,10 @@ public class PacketTransferPlayer implements PacketObjectIn, PacketObje } if (requests.size() == 0) { - callback.run(failures.value); + callback.accept(failures.value); } else { AsyncConsolidator merge = new AsyncConsolidator(() -> { - callback.run(failures.value); + callback.accept(failures.value); }); for (Map.Entry> entry : requests.entrySet()) { merge.reserve(); @@ -96,7 +96,7 @@ public class PacketTransferPlayer implements PacketObjectIn, PacketObje } } catch (Throwable e) { e.printStackTrace(); - callback.run(-1); + callback.accept(-1); } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java index 3fae0664..d14f0930 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Bungee.Network; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Server.SubDataProtocol; import net.ME1312.SubData.Server.SubDataServer; @@ -13,6 +12,7 @@ import net.ME1312.SubServers.Bungee.SubProxy; import java.io.IOException; import java.net.InetAddress; +import java.util.function.Consumer; import java.util.logging.Logger; /** @@ -154,7 +154,7 @@ public class SubProtocol extends SubDataProtocol { @SuppressWarnings("deprecation") @Override - public SubDataServer open(Callback scheduler, Logger logger, InetAddress address, int port, String cipher) throws IOException { + public SubDataServer open(Consumer scheduler, Logger logger, InetAddress address, int port, String cipher) throws IOException { SubDataServer subdata = super.open(scheduler, logger, address, port, cipher); SubProxy plugin = SubAPI.getInstance().getInternals(); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java index d1b4cd27..7e624898 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java @@ -2,7 +2,7 @@ package net.ME1312.SubServers.Bungee; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Server.DataProtocol; @@ -19,6 +19,7 @@ import com.google.common.collect.Range; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.protocol.ProtocolConstants; +import java.io.File; import java.lang.reflect.InvocationTargetException; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -93,7 +94,7 @@ public final class SubAPI implements BungeeAPI { * @param handle Handle to Bind */ public void addHostDriver(Class driver, String handle) { - if (Util.isNull(driver, handle)) throw new NullPointerException(); + Util.nullpo(driver, handle); if (plugin.hostDrivers.keySet().contains(handle.toUpperCase().replace('-', '_').replace(' ', '_'))) throw new IllegalStateException("Driver already exists: " + handle); plugin.hostDrivers.put(handle.toUpperCase().replace('-', '_').replace(' ', '_'), driver); } @@ -167,7 +168,7 @@ public final class SubAPI implements BungeeAPI { * @throws InstantiationException */ public Host addHost(UUID player, String driver, String name, boolean enabled, Range ports, boolean log, InetAddress address, String directory, String gitBash) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { - if (Util.isNull(driver, name, enabled, ports, log, address, directory, gitBash)) throw new NullPointerException(); + Util.nullpo(driver, name, enabled, ports, log, address, directory, gitBash); if (!getHostDrivers().contains(driver.toUpperCase().replace('-', '_').replace(' ', '_'))) throw new InvalidHostException("Invalid Driver for host: " + name); return addHost(player, plugin.hostDrivers.get(driver.toUpperCase().replace('-', '_').replace(' ', '_')), name, enabled, ports, log, address, directory, gitBash); } @@ -212,7 +213,7 @@ public final class SubAPI implements BungeeAPI { * @throws InstantiationException */ public Host addHost(UUID player, Class driver, String name, boolean enabled, Range ports, boolean log, InetAddress address, String directory, String gitBash) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { - if (Util.isNull(driver, name, enabled, ports, log, address, directory, gitBash)) throw new NullPointerException(); + Util.nullpo(driver, name, enabled, ports, log, address, directory, gitBash); Host host = plugin.constructHost(driver, name, enabled, ports, log, address, directory, gitBash); return addHost(player, host)?host:null; } @@ -263,7 +264,7 @@ public final class SubAPI implements BungeeAPI { * @return Success Status */ public boolean removeHost(UUID player, String name) { - if (Util.isNull(name, getHost(name))) throw new NullPointerException(); + Util.nullpo(name, getHost(name)); SubRemoveHostEvent event = new SubRemoveHostEvent(player, getHost(name)); plugin.getPluginManager().callEvent(event); if (!event.isCancelled()) { @@ -294,7 +295,7 @@ public final class SubAPI implements BungeeAPI { * @return Success Status */ public boolean forceRemoveHost(UUID player, String name) { - if (Util.isNull(name, getHost(name))) throw new NullPointerException(); + Util.nullpo(name, getHost(name)); SubRemoveHostEvent event = new SubRemoveHostEvent(player, getHost(name)); plugin.getPluginManager().callEvent(event); if (getHost(name).destroy()) { @@ -463,7 +464,7 @@ public final class SubAPI implements BungeeAPI { * @return Success Status */ public boolean removeServer(UUID player, String name) { - if (Util.isNull(name, getServer(name))) throw new NullPointerException(); + Util.nullpo(name, getServer(name)); SubRemoveServerEvent event = new SubRemoveServerEvent(player, null, getServer(name)); plugin.getPluginManager().callEvent(event); if (!event.isCancelled()) { @@ -490,7 +491,7 @@ public final class SubAPI implements BungeeAPI { * @return Success Status */ public boolean forceRemoveServer(UUID player, String name) { - if (Util.isNull(name, getServer(name))) throw new NullPointerException(); + Util.nullpo(name, getServer(name)); SubRemoveServerEvent event = new SubRemoveServerEvent(player, null, getServer(name)); plugin.getPluginManager().callEvent(event); plugin.exServers.remove(name.toLowerCase()); @@ -599,7 +600,7 @@ public final class SubAPI implements BungeeAPI { * @return Remote Player */ public RemotePlayer getRemotePlayer(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); for (RemotePlayer player : plugin.rPlayers.values()) { if (player.getName().equalsIgnoreCase(name)) return player; } @@ -613,7 +614,7 @@ public final class SubAPI implements BungeeAPI { * @return Remote Player */ public RemotePlayer getRemotePlayer(UUID id) { - if (Util.isNull(id)) throw new NullPointerException(); + Util.nullpo(id); return plugin.rPlayers.getOrDefault(id, null); } @@ -625,7 +626,7 @@ public final class SubAPI implements BungeeAPI { * @param value Lang Value */ public void setLang(String channel, String key, String value) { - if (Util.isNull(channel, key, value)) throw new NullPointerException(); + Util.nullpo(channel, key, value); LinkedHashMap map = (plugin.exLang.containsKey(channel.toLowerCase()))?plugin.exLang.get(channel.toLowerCase()):new LinkedHashMap(); map.put(key, value); plugin.exLang.put(channel.toLowerCase(), map); @@ -685,7 +686,7 @@ public final class SubAPI implements BungeeAPI { */ @SuppressWarnings("unchecked") public R getObjectBySignature(String signature) { - if (Util.isNull(signature)) throw new NullPointerException(); + Util.nullpo(signature); return (R) knownSignatures.getOrDefault(signature, null); } @@ -703,7 +704,7 @@ public final class SubAPI implements BungeeAPI { * * @return Directory */ - public UniversalFile getRuntimeDirectory() { + public File getRuntimeDirectory() { return plugin.dir; } @@ -743,12 +744,12 @@ public final class SubAPI implements BungeeAPI { if (GAME_VERSION == null) { if (System.getProperty("subservers.minecraft.version", "").length() > 0) { return new Version[]{new Version(System.getProperty("subservers.minecraft.version"))}; - } else if (Util.getDespiteException(() -> ProtocolConstants.SUPPORTED_VERSIONS != null, false)) { + } else if (Try.all.get(() -> ProtocolConstants.SUPPORTED_VERSIONS != null, false)) { List versions = new LinkedList(); for (String version : ProtocolConstants.SUPPORTED_VERSIONS) versions.add(new Version(version)); Collections.sort(versions); return versions.toArray(new Version[versions.size()]); - } else if (Util.getDespiteException(() -> plugin.getGameVersion() != null, false)) { + } else if (Try.all.get(() -> plugin.getGameVersion() != null, false)) { String raw = plugin.getGameVersion(); if (raw.contains("-") || raw.contains(",")) { List versions = new LinkedList(); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index cb943b59..43c118e1 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java @@ -1,11 +1,10 @@ package net.ME1312.SubServers.Bungee; -import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Platform; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Server.ClientHandler; @@ -33,6 +32,8 @@ import java.net.URL; import java.nio.charset.Charset; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Supplier; /** * Plugin Command Class @@ -102,7 +103,7 @@ public final class SubCommand extends Command implements TabExecutor { plugin.stopListeners(); plugin.getLogger().info("Closing player connections"); for (ProxiedPlayer player : plugin.getPlayers()) { - Util.isException(() -> player.disconnect(plugin.getTranslation("restart"))); + Try.all.run(() -> player.disconnect(plugin.getTranslation("restart"))); } plugin.shutdown(); case "*": @@ -432,7 +433,7 @@ public final class SubCommand extends Command implements TabExecutor { if (args.length > 1) { ServerSelection select = selectServers(sender, args, 1, true); if (select.subservers.length > 0) { - Callback starter = server -> { + Consumer starter = server -> { Map servers = plugin.api.getServers(); if (!servers.keySet().contains(server.getName().toLowerCase()) || !(servers.get(server.getName().toLowerCase()) instanceof SubServer)) { sender.sendMessage("SubServers > Could not restart server: Subserver " + server.getName() + " has disappeared"); @@ -467,7 +468,7 @@ public final class SubCommand extends Command implements TabExecutor { try { server.waitFor(); Thread.sleep(100); - starter.run(server); + starter.accept(server); } catch (Exception e) { e.printStackTrace(); } @@ -475,7 +476,7 @@ public final class SubCommand extends Command implements TabExecutor { success++; } } else { - starter.run(server); + starter.accept(server); success++; } } @@ -583,7 +584,7 @@ public final class SubCommand extends Command implements TabExecutor { sender.sendMessage("SubServers > That template is not enabled"); } else if (args.length <= 4 && plugin.hosts.get(args[2].toLowerCase()).getCreator().getTemplate(args[3].toLowerCase()).requiresVersion()) { sender.sendMessage("SubServers > That template requires a Minecraft version to be specified"); - } else if (args.length > 5 && (Util.isException(() -> Integer.parseInt(args[5])) || Integer.parseInt(args[5]) <= 0 || Integer.parseInt(args[5]) > 65535)) { + } else if (args.length > 5 && (!Try.all.run(() -> Integer.parseInt(args[5])) || Integer.parseInt(args[5]) <= 0 || Integer.parseInt(args[5]) > 65535)) { sender.sendMessage("SubServers > Invalid port number"); } else { plugin.hosts.get(args[2].toLowerCase()).getCreator().create(args[1], plugin.hosts.get(args[2].toLowerCase()).getCreator().getTemplate(args[3].toLowerCase()), (args.length > 4)?new Version(args[4]):null, (args.length > 5)?Integer.parseInt(args[5]):null); @@ -877,7 +878,7 @@ public final class SubCommand extends Command implements TabExecutor { return list; } else { if (args[0].equals("info") || args[0].equals("status")) { - ReturnRunnable> getPlayers = () -> { + Supplier> getPlayers = () -> { LinkedList names = new LinkedList(); for (ProxiedPlayer player : plugin.getPlayers()) names.add(player.getName()); for (RemotePlayer player : plugin.api.getRemotePlayers().values()) if (!names.contains(player.getName())) names.add(player.getName()); @@ -917,7 +918,7 @@ public final class SubCommand extends Command implements TabExecutor { if (!list.contains(server.getName()) && server.getName().toLowerCase().startsWith(last)) list.add(Last + server.getName().substring(last.length())); } - for (String player : getPlayers.run()) { + for (String player : getPlayers.get()) { if (!list.contains(player) && player.toLowerCase().startsWith(last)) list.add(Last + player.substring(last.length())); } @@ -958,8 +959,10 @@ public final class SubCommand extends Command implements TabExecutor { list.add(Last + server.getName().substring(last.length())); } break; + case "u": + case "user": case "player": - for (String player : getPlayers.run()) { + for (String player : getPlayers.get()) { if (player.toLowerCase().startsWith(last)) list.add(Last + player.substring(last.length())); } @@ -1072,7 +1075,7 @@ public final class SubCommand extends Command implements TabExecutor { return Collections.singletonList("[Version]"); } else if (args.length == 6) { if (last.length() > 0) { - if (Util.isException(() -> Integer.parseInt(last)) || Integer.parseInt(last) <= 0 || Integer.parseInt(last) > 65535) { + if (!Try.all.run(() -> Integer.parseInt(last)) || Integer.parseInt(last) <= 0 || Integer.parseInt(last) > 65535) { return Collections.emptyList(); } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java index f4e3f284..eecc2882 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java @@ -3,8 +3,9 @@ package net.ME1312.SubServers.Bungee; import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Container.Container; +import net.ME1312.Galaxi.Library.Directories; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Server.ClientHandler; @@ -81,7 +82,7 @@ public final class SubProxy extends BungeeCommon implements Listener { private final HashMap fallback = new HashMap(); public final PrintStream out; - public final UniversalFile dir = new UniversalFile(new File(System.getProperty("user.dir"))); + public final File dir = new File(System.getProperty("user.dir")); public YAMLConfig config; public YAMLConfig servers; private YAMLConfig bungee; @@ -111,110 +112,110 @@ public final class SubProxy extends BungeeCommon implements Listener { this.isPatched = isPatched; Logger.get("SubServers").info("Loading SubServers.Bungee v" + version.toString() + " Libraries (for Minecraft " + api.getGameVersion()[api.getGameVersion().length - 1] + ")"); - Util.isException(() -> new RemotePlayer(null)); // runs + Try.all.run(() -> new RemotePlayer(null)); // runs this.out = out; - if (!(new UniversalFile(dir, "config.yml").exists())) { - Util.copyFromJar(SubProxy.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/bungee.yml", new UniversalFile(dir, "config.yml").getPath()); - YAMLConfig tmp = new YAMLConfig(new UniversalFile("config.yml")); + if (!(new File(dir, "config.yml").exists())) { + Util.copyFromJar(SubProxy.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/bungee.yml", new File(dir, "config.yml").getPath()); + YAMLConfig tmp = new YAMLConfig(new File("config.yml")); tmp.get().set("stats", UUID.randomUUID().toString()); tmp.save(); Logger.get("SubServers").info("Created ./config.yml"); } - bungee = new YAMLConfig(new UniversalFile(dir, "config.yml")); + bungee = new YAMLConfig(new File(dir, "config.yml")); - UniversalFile dir = new UniversalFile(this.dir, "SubServers"); + File dir = new File(this.dir, "SubServers"); dir.mkdir(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "config.yml")); - config = new YAMLConfig(new UniversalFile(dir, "config.yml")); + ConfigUpdater.updateConfig(new File(dir, "config.yml")); + config = new YAMLConfig(new File(dir, "config.yml")); - ConfigUpdater.updateServers(new UniversalFile(dir, "servers.yml")); - servers = new YAMLConfig(new UniversalFile(dir, "servers.yml")); + ConfigUpdater.updateServers(new File(dir, "servers.yml")); + servers = new YAMLConfig(new File(dir, "servers.yml")); - ConfigUpdater.updateLang(new UniversalFile(dir, "lang.yml")); - lang = new YAMLConfig(new UniversalFile(dir, "lang.yml")); + ConfigUpdater.updateLang(new File(dir, "lang.yml")); + lang = new YAMLConfig(new File(dir, "lang.yml")); - if (!(new UniversalFile(dir, "Templates").exists())) { - new UniversalFile(dir, "Templates").mkdirs(); + if (!(new File(dir, "Templates").exists())) { + new File(dir, "Templates").mkdirs(); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip"), new UniversalFile(dir, "Templates")); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Created ./SubServers/Templates/Vanilla"); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip"), new UniversalFile(dir, "Templates")); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Created ./SubServers/Templates/Spigot"); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip"), new UniversalFile(dir, "Templates")); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Created ./SubServers/Templates/Paper"); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/purpur.zip"), new UniversalFile(dir, "Templates")); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/purpur.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Created ./SubServers/Templates/Purpur"); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip"), new UniversalFile(dir, "Templates")); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Created ./SubServers/Templates/Forge"); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip"), new UniversalFile(dir, "Templates")); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Created ./SubServers/Templates/Sponge"); } else { long stamp = Math.round(Math.random() * 100000); Version version = new Version("2.16a+"); - if (new UniversalFile(dir, "Templates:Vanilla:template.yml").exists() && ((new YAMLConfig(new UniversalFile(dir, "Templates:Vanilla:template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { - Files.move(new UniversalFile(dir, "Templates:Vanilla").toPath(), new UniversalFile(dir, "Templates:Vanilla." + stamp + ".x").toPath()); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip"), new UniversalFile(dir, "Templates")); + if (new File(dir, "Templates/Vanilla/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Vanilla/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { + Files.move(new File(dir, "Templates/Vanilla").toPath(), new File(dir, "Templates/Vanilla." + stamp + ".x").toPath()); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Updated ./SubServers/Templates/Vanilla"); } - if (new UniversalFile(dir, "Templates:Spigot:template.yml").exists() && ((new YAMLConfig(new UniversalFile(dir, "Templates:Spigot:template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { - Files.move(new UniversalFile(dir, "Templates:Spigot").toPath(), new UniversalFile(dir, "Templates:Spigot." + stamp + ".x").toPath()); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip"), new UniversalFile(dir, "Templates")); + if (new File(dir, "Templates/Spigot/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Spigot/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { + Files.move(new File(dir, "Templates/Spigot").toPath(), new File(dir, "Templates/Spigot." + stamp + ".x").toPath()); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Updated ./SubServers/Templates/Spigot"); } - if (new UniversalFile(dir, "Templates:Paper:template.yml").exists() && ((new YAMLConfig(new UniversalFile(dir, "Templates:Paper:template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { - Files.move(new UniversalFile(dir, "Templates:Paper").toPath(), new UniversalFile(dir, "Templates:Paper." + stamp + ".x").toPath()); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip"), new UniversalFile(dir, "Templates")); + if (new File(dir, "Templates/Paper/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Paper/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { + Files.move(new File(dir, "Templates/Paper").toPath(), new File(dir, "Templates/Paper." + stamp + ".x").toPath()); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Updated ./SubServers/Templates/Paper"); } - if (new UniversalFile(dir, "Templates:Purpur:template.yml").exists() && ((new YAMLConfig(new UniversalFile(dir, "Templates:Purpur:template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { - Files.move(new UniversalFile(dir, "Templates:Purpur").toPath(), new UniversalFile(dir, "Templates:Purpur." + stamp + ".x").toPath()); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/purpur.zip"), new UniversalFile(dir, "Templates")); + if (new File(dir, "Templates/Purpur/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Purpur/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { + Files.move(new File(dir, "Templates/Purpur").toPath(), new File(dir, "Templates/Purpur." + stamp + ".x").toPath()); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/purpur.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Updated ./SubServers/Templates/Purpur"); } - if (new UniversalFile(dir, "Templates:Forge:template.yml").exists() && ((new YAMLConfig(new UniversalFile(dir, "Templates:Forge:template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { - Files.move(new UniversalFile(dir, "Templates:Forge").toPath(), new UniversalFile(dir, "Templates:Forge." + stamp + ".x").toPath()); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip"), new UniversalFile(dir, "Templates")); + if (new File(dir, "Templates/Forge/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Forge/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { + Files.move(new File(dir, "Templates/Forge").toPath(), new File(dir, "Templates/Forge." + stamp + ".x").toPath()); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Updated ./SubServers/Templates/Forge"); } - if (new UniversalFile(dir, "Templates:Sponge:template.yml").exists() && ((new YAMLConfig(new UniversalFile(dir, "Templates:Sponge:template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { - Files.move(new UniversalFile(dir, "Templates:Sponge").toPath(), new UniversalFile(dir, "Templates:Sponge." + stamp + ".x").toPath()); - Util.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip"), new UniversalFile(dir, "Templates")); + if (new File(dir, "Templates/Sponge/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Sponge/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) { + Files.move(new File(dir, "Templates/Sponge").toPath(), new File(dir, "Templates/Sponge." + stamp + ".x").toPath()); + Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip"), new File(dir, "Templates")); Logger.get("SubServers").info("Updated ./SubServers/Templates/Sponge"); } } Runnable clean = () -> { try { - if (new UniversalFile(dir, "Recently Deleted").exists()) { - int f = new UniversalFile(dir, "Recently Deleted").listFiles().length; - for (File file : new UniversalFile(dir, "Recently Deleted").listFiles()) { + if (new File(dir, "Recently Deleted").exists()) { + int f = new File(dir, "Recently Deleted").listFiles().length; + for (File file : new File(dir, "Recently Deleted").listFiles()) { try { if (file.isDirectory()) { - if (new UniversalFile(dir, "Recently Deleted:" + file.getName() + ":info.json").exists()) { - FileReader reader = new FileReader(new UniversalFile(dir, "Recently Deleted:" + file.getName() + ":info.json")); + if (new File(dir, "Recently Deleted/" + file.getName() + "/info.json").exists()) { + FileReader reader = new FileReader(new File(dir, "Recently Deleted/" + file.getName() + "/info.json")); YAMLSection info = new YAMLSection(new Gson().fromJson(Util.readAll(reader), Map.class)); reader.close(); if (info.contains("Timestamp")) { if (TimeUnit.MILLISECONDS.toDays(Calendar.getInstance().getTime().getTime() - info.getLong("Timestamp")) >= 7) { - Util.deleteDirectory(file); + Directories.delete(file); f--; Logger.get("SubServers").info("Removed ./SubServers/Recently Deleted/" + file.getName()); } } else { - Util.deleteDirectory(file); + Directories.delete(file); f--; Logger.get("SubServers").info("Removed ./SubServers/Recently Deleted/" + file.getName()); } } else { - Util.deleteDirectory(file); + Directories.delete(file); f--; Logger.get("SubServers").info("Removed ./SubServers/Recently Deleted/" + file.getName()); } @@ -230,7 +231,7 @@ public final class SubProxy extends BungeeCommon implements Listener { } } if (f <= 0) { - Files.delete(new UniversalFile(dir, "Recently Deleted").toPath()); + Files.delete(new File(dir, "Recently Deleted").toPath()); } } } catch (Exception e) { @@ -253,7 +254,7 @@ public final class SubProxy extends BungeeCommon implements Listener { PluginDescription description = new PluginDescription(); description.setName("SubServers-Bungee"); description.setMain(net.ME1312.SubServers.Bungee.Library.Compatibility.Plugin.class.getCanonicalName()); - description.setFile(Util.getDespiteException(() -> new File(SubProxy.class.getProtectionDomain().getCodeSource().getLocation().toURI()), null)); + description.setFile(Try.all.get(() -> new File(SubProxy.class.getProtectionDomain().getCodeSource().getLocation().toURI()))); description.setVersion(version.toString()); description.setAuthor("ME1312"); @@ -346,9 +347,9 @@ public final class SubProxy extends BungeeCommon implements Listener { if (!status) resetDate = begin; reloading = true; - ConfigUpdater.updateConfig(new UniversalFile(dir, "SubServers:config.yml")); - ConfigUpdater.updateServers(new UniversalFile(dir, "SubServers:servers.yml")); - ConfigUpdater.updateLang(new UniversalFile(dir, "SubServers:lang.yml")); + ConfigUpdater.updateConfig(new File(dir, "SubServers/config.yml")); + ConfigUpdater.updateServers(new File(dir, "SubServers/servers.yml")); + ConfigUpdater.updateLang(new File(dir, "SubServers/lang.yml")); YAMLSection prevconfig = config.get(); config.reload(); @@ -363,7 +364,7 @@ public final class SubProxy extends BungeeCommon implements Listener { )) { SubDataServer subdata = this.subdata; subdata.close(); - Util.isException(subdata::waitFor); + Try.all.run(subdata::waitFor); } PacketLinkServer.strict = config.get().getMap("Settings").getBoolean("Strict-Server-Linking", true); @@ -493,7 +494,7 @@ public final class SubProxy extends BungeeCommon implements Listener { edits.set("exec", this.servers.get().getMap("Servers").getMap(name).getRawString("Executable")); if (!this.servers.get().getMap("Servers").getMap(name).getRawString("Stop-Command").equals(server.getStopCommand())) edits.set("stop-cmd", this.servers.get().getMap("Servers").getMap(name).getRawString("Stop-Command")); - SubServer.StopAction action = Util.getDespiteException(() -> SubServer.StopAction.valueOf(this.servers.get().getMap("Servers").getMap(name).getRawString("Stop-Action", "NONE").toUpperCase().replace('-', '_').replace(' ', '_')), null); + SubServer.StopAction action = Try.all.get(() -> SubServer.StopAction.valueOf(this.servers.get().getMap("Servers").getMap(name).getRawString("Stop-Action", "NONE").toUpperCase().replace('-', '_').replace(' ', '_'))); if (action != null && action != server.getStopAction()) edits.set("stop-action", action.toString()); if (this.servers.get().getMap("Servers").getMap(name).getBoolean("Restricted") != server.isRestricted()) @@ -533,7 +534,7 @@ public final class SubProxy extends BungeeCommon implements Listener { if (this.servers.get().getMap("Servers").getMap(name).getBoolean("Hidden") != server.isHidden()) server.setHidden(this.servers.get().getMap("Servers").getMap(name).getBoolean("Hidden")); } // Apply these changes regardless of reset - SubServer.StopAction action = Util.getDespiteException(() -> SubServer.StopAction.valueOf(this.servers.get().getMap("Servers").getMap(name).getRawString("Stop-Action", "NONE").toUpperCase().replace('-', '_').replace(' ', '_')), null); + SubServer.StopAction action = Try.all.get(() -> SubServer.StopAction.valueOf(this.servers.get().getMap("Servers").getMap(name).getRawString("Stop-Action", "NONE").toUpperCase().replace('-', '_').replace(' ', '_'))); if (action != null && action != server.getStopAction()) server.setStopAction(action); if (!status && this.servers.get().getMap("Servers").getMap(name).getBoolean("Run-On-Launch")) @@ -629,8 +630,8 @@ public final class SubProxy extends BungeeCommon implements Listener { } else if (ciphers[0].equals("RSA") || ciphers[0].equals("RSA-2048") || ciphers[0].equals("RSA-3072") || ciphers[0].equals("RSA-4096")) { try { int length = (ciphers[0].contains("-"))?Integer.parseInt(ciphers[0].split("-")[1]):2048; - if (!(new UniversalFile("SubServers:Cache").exists())) new UniversalFile("SubServers:Cache").mkdirs(); - subprotocol.registerCipher("RSA", new RSA(length, new UniversalFile("SubServers:Cache:private.rsa.key"), new UniversalFile("SubServers:subdata.rsa.key"))); + if (!(new File("SubServers/Cache").exists())) new File("SubServers/Cache").mkdirs(); + subprotocol.registerCipher("RSA", new RSA(length, new File("SubServers/Cache/private.rsa.key"), new File("SubServers/subdata.rsa.key"))); cipher = "RSA" + cipher.substring(ciphers[0].length()); Logger.get("SubData").info("Encrypting SubData with RSA:"); @@ -873,7 +874,7 @@ public final class SubProxy extends BungeeCommon implements Listener { } Host constructHost(Class driver, String name, boolean enabled, Range ports, boolean log, InetAddress address, String directory, String gitBash) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { - if (Util.isNull(driver, name, enabled, ports, log, address, directory, gitBash)) throw new NullPointerException(); + Util.nullpo(driver, name, enabled, ports, log, address, directory, gitBash); return driver.getConstructor(SubProxy.class, String.class, boolean.class, Range.class, boolean.class, InetAddress.class, String.class, String.class).newInstance(this, name, enabled, ports, log, address, directory, gitBash); } @@ -960,7 +961,7 @@ public final class SubProxy extends BungeeCommon implements Listener { lock.value = false; if (mode) e.completeIntent(plugin); }, ((InitialHandler) e.getConnection()).getHandshake().getProtocolVersion()); - if (!mode) while (lock.value) Util.isException(() -> Thread.sleep(4)); + if (!mode) while (lock.value) Try.all.run(() -> Thread.sleep(4)); } } } else if (dynamic) { diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java index 8829508e..b986a61e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddHostEvent.java @@ -22,7 +22,7 @@ public class SubAddHostEvent extends Event implements SubEvent { * @param host Host to be added */ public SubAddHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java index 845f4465..64d7987a 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddProxyEvent.java @@ -18,7 +18,7 @@ public class SubAddProxyEvent extends Event implements SubEvent { * @param proxy Host Being Added */ public SubAddProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java index 0492caad..9826bde9 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubAddServerEvent.java @@ -23,7 +23,7 @@ public class SubAddServerEvent extends Event implements SubEvent { * @param server Server Starting */ public SubAddServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java index 3b4e8ca4..75c2a6b5 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Bukkit.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent; @@ -12,6 +11,7 @@ import org.bukkit.event.HandlerList; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Create Event @@ -36,7 +36,7 @@ public class SubCreateEvent extends Event implements SubEvent { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.update = update; this.host = host; @@ -69,10 +69,10 @@ public class SubCreateEvent extends Event implements SubEvent { * * @param callback Updating Server */ - public void getUpdatingServer(Callback callback) { + public void getUpdatingServer(Consumer callback) { if (!update) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java index 4c35eab1..46264b8e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Bukkit.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent; @@ -12,6 +11,7 @@ import org.bukkit.event.HandlerList; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Created Event @@ -37,7 +37,7 @@ public class SubCreatedEvent extends Event implements SubEvent { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.success = success; this.update = update; @@ -80,10 +80,10 @@ public class SubCreatedEvent extends Event implements SubEvent { * * @param callback Updating Server */ - public void getServer(Callback callback) { + public void getServer(Consumer callback) { if (!update && !success) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java index 40103413..1b684131 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java @@ -28,7 +28,7 @@ public class SubEditServerEvent extends Event implements SubEvent { * @param edit Edit to make */ public SubEditServerEvent(UUID player, String server, Pair edit) { - if (Util.isNull(server, edit)) throw new NullPointerException(); + Util.nullpo(server, edit); ObjectMap section = new ObjectMap(); section.set(".", edit.value()); this.player = player; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java index d1e84eaf..a347a971 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkConnectEvent.java @@ -17,7 +17,7 @@ public class SubNetworkConnectEvent extends Event implements SubEvent { * SubData Network Connect Event */ public SubNetworkConnectEvent(DataClient network) { - if (Util.isNull(network)) throw new NullPointerException(); + Util.nullpo(network); this.network = network; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java index 5c012694..e646329a 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubNetworkDisconnectEvent.java @@ -19,7 +19,7 @@ public class SubNetworkDisconnectEvent extends Event implements SubEvent { * SubData Network Disconnect Event */ public SubNetworkDisconnectEvent(DataClient network, DisconnectReason reason) { - if (Util.isNull(network, reason)) throw new NullPointerException(); + Util.nullpo(network, reason); this.network = network; this.reason = reason; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java index ffa08377..8df67b1a 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveHostEvent.java @@ -22,7 +22,7 @@ public class SubRemoveHostEvent extends Event implements SubEvent { * @param host Server Starting */ public SubRemoveHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java index 1b19a8b1..9e4fc5da 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveProxyEvent.java @@ -18,7 +18,7 @@ public class SubRemoveProxyEvent extends Event implements SubEvent { * @param proxy Host Being Added */ public SubRemoveProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java index ba55e4dc..8c87a537 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubRemoveServerEvent.java @@ -23,7 +23,7 @@ public class SubRemoveServerEvent extends Event implements SubEvent { * @param server Server Starting */ public SubRemoveServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java index 6ea10872..bcf4eb56 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubSendCommandEvent.java @@ -23,7 +23,7 @@ public class SubSendCommandEvent extends Event implements SubEvent { * @param server Server being Commanded */ public SubSendCommandEvent(UUID player, String server, String command) { - if (Util.isNull(server, command)) throw new NullPointerException(); + Util.nullpo(server, command); this.player = player; this.server = server; this.command = command; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java index a675ba1b..2450a397 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartEvent.java @@ -23,7 +23,7 @@ public class SubStartEvent extends Event implements SubEvent { * @param server Server Starting */ public SubStartEvent(UUID player, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.server = server; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java index fd8199a4..f76a021e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStartedEvent.java @@ -19,7 +19,7 @@ public class SubStartedEvent extends Event implements SubEvent { * @param server Server that Started */ public SubStartedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java index 703f55c9..72427639 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStopEvent.java @@ -25,7 +25,7 @@ public class SubStopEvent extends Event implements SubEvent { * @param force If it was a Forced Shutdown */ public SubStopEvent(UUID player, String server, boolean force) { - if (Util.isNull(server, force)) throw new NullPointerException(); + Util.nullpo(server, force); this.player = player; this.server = server; this.force = force; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java index 8cf36e57..f59235cb 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubStoppedEvent.java @@ -18,7 +18,7 @@ public class SubStoppedEvent extends Event implements SubEvent { * @param server Server that Stopped */ public SubStoppedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java index 1c32f07c..7a9c5e2f 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java @@ -1,10 +1,10 @@ package net.ME1312.SubServers.Client.Bukkit.Graphic; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -29,6 +29,7 @@ import org.bukkit.event.player.PlayerQuitEvent; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.permits; @@ -36,7 +37,7 @@ import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.permi * Default GUI Listener */ public class DefaultUIHandler implements UIHandler, Listener { - private HashMap> input = new HashMap>(); + private HashMap> input = new HashMap>(); private HashMap gui = new HashMap(); private boolean enabled = true; private SubPlugin plugin; @@ -47,7 +48,7 @@ public class DefaultUIHandler implements UIHandler, Listener { * @param plugin Event */ public DefaultUIHandler(SubPlugin plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; Bukkit.getPluginManager().registerEvents(this, plugin); } @@ -71,7 +72,7 @@ public class DefaultUIHandler implements UIHandler, Listener { if (gui.open && event.getClickedInventory() != null && title != null) { if (plugin.api.getSubDataNetwork()[0] == null) { new IllegalStateException("SubData is not connected").printStackTrace(); - } else if (Util.isException(() -> plugin.api.getLangChannels())) { + } else if (!Try.all.run(() -> plugin.api.getLangChannels())) { new IllegalStateException("There are no lang options available at this time").printStackTrace(); } else if (title.equals(plugin.api.getLang("SubServers", "Interface.Host-Menu.Title"))) { // Host Menu if (event.getCurrentItem() != null && event.getCurrentItem().getType() != Material.AIR && event.getCurrentItem().hasItemMeta()) { @@ -168,7 +169,7 @@ public class DefaultUIHandler implements UIHandler, Listener { if (m.getString("message").length() <= 0) { ((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]).setPort(null); gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); - } else if (Util.isException(() -> Integer.parseInt(m.getString("message"))) || Integer.parseInt(m.getString("message")) <= 0 || Integer.parseInt(m.getString("message")) > 65535) { + } else if (!Try.all.run(() -> Integer.parseInt(m.getString("message"))) || Integer.parseInt(m.getString("message")) <= 0 || Integer.parseInt(m.getString("message")) > 65535) { if (!gui.sendTitle(plugin.api.getLang("SubServers", "Interface.Host-Creator.Edit-Port.Invalid-Title"), 4 * 20)) player.sendMessage(plugin.api.getLang("SubServers", "Interface.Host-Creator.Edit-Port.Invalid")); Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]), 4 * 20); @@ -354,9 +355,9 @@ public class DefaultUIHandler implements UIHandler, Listener { if (permits((SubServer) gui.lastVisitedObjects[0], player, "subservers.subserver.%.*", "subservers.subserver.%.stop")) { gui.setDownloading(plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Response")); final Value listening = new Container(true); - PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() { + PacketInExRunEvent.callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap json) { + public void accept(ObjectMap json) { try { if (listening.value()) if (!json.getString("server").equalsIgnoreCase(((SubServer) gui.lastVisitedObjects[0]).getName())) { PacketInExRunEvent.callback("SubStoppedEvent", this); @@ -378,9 +379,9 @@ public class DefaultUIHandler implements UIHandler, Listener { if (permits((SubServer) gui.lastVisitedObjects[0], player, "subservers.subserver.%.*", "subservers.subserver.%.terminate")) { gui.setDownloading(plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Response")); final Value listening = new Container(true); - PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() { + PacketInExRunEvent.callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap json) { + public void accept(ObjectMap json) { try { if (listening.value()) if (!json.getString("server").equalsIgnoreCase(((SubServer) gui.lastVisitedObjects[0]).getName())) { PacketInExRunEvent.callback("SubStoppedEvent", this); @@ -466,7 +467,7 @@ public class DefaultUIHandler implements UIHandler, Listener { if (!event.isCancelled() && enabled && input.containsKey(event.getPlayer().getUniqueId())) { YAMLSection data = new YAMLSection(); data.set("message", event.getMessage()); - input.get(event.getPlayer().getUniqueId()).run(data); + input.get(event.getPlayer().getUniqueId()).accept(data); input.remove(event.getPlayer().getUniqueId()); event.setCancelled(true); } @@ -482,7 +483,7 @@ public class DefaultUIHandler implements UIHandler, Listener { if (!event.isCancelled() && enabled && input.containsKey(event.getPlayer().getUniqueId())) { YAMLSection data = new YAMLSection(); data.set("message", (event.getMessage().startsWith("/"))?event.getMessage().substring(1):event.getMessage()); - input.get(event.getPlayer().getUniqueId()).run(data); + input.get(event.getPlayer().getUniqueId()).accept(data); input.remove(event.getPlayer().getUniqueId()); event.setCancelled(true); } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java index 84837536..5de11e9d 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java @@ -43,7 +43,7 @@ public abstract class UIRenderer { * @param player Player */ public UIRenderer(SubPlugin plugin, UUID player) { - if (Util.isNull(plugin, player)) throw new NullPointerException(); + Util.nullpo(plugin, player); this.plugin = plugin; this.player = player; @@ -351,7 +351,7 @@ public abstract class UIRenderer { * @param renderer Renderer */ public static void addHostPlugin(String handle, PluginRenderer renderer) { - if (Util.isNull(handle, renderer)) throw new NullPointerException(); + Util.nullpo(handle, renderer); hostPlugins.put(handle, renderer); } @@ -370,7 +370,7 @@ public abstract class UIRenderer { * @param handle Handle */ public static void removeHostPlugin(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); hostPlugins.remove(handle); } @@ -381,7 +381,7 @@ public abstract class UIRenderer { * @param renderer Renderer */ public static void addSubServerPlugin(String handle, PluginRenderer renderer) { - if (Util.isNull(handle, renderer)) throw new NullPointerException(); + Util.nullpo(handle, renderer); subserverPlugins.put(handle, renderer); } @@ -400,7 +400,7 @@ public abstract class UIRenderer { * @param handle Handle */ public static void removeSubServerPlugin(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); subserverPlugins.remove(handle); } @@ -539,7 +539,7 @@ public abstract class UIRenderer { * @param value Value */ public void setName(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); final String name = this.name; history.add(() -> this.name = name); this.name = value; @@ -560,7 +560,7 @@ public abstract class UIRenderer { * @param value Value */ public void setTemplate(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); final String template = this.template; history.add(() -> this.template = template); this.template = value; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java index fcc04339..1deaa456 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Compatibility/PlaceholderImpl.java @@ -3,6 +3,7 @@ package net.ME1312.SubServers.Client.Bukkit.Library.Compatibility; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Client.Bukkit.Event.*; import net.ME1312.SubServers.Client.Bukkit.SubAPI; @@ -678,7 +679,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C public void start(SubStartEvent e) { Server server = getServer(e.getServer()); if (server != null) { - Util.isException(() -> Util.>reflect(Server.class.getDeclaredField("raw"), server).set("running", true)); + Try.all.run(() -> Util.>reflect(Server.class.getDeclaredField("raw"), server).set("running", true)); add(e.getServer()); } } @@ -687,7 +688,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C public void started(SubStartedEvent e) { Server server = getServer(e.getServer()); if (server != null) { - Util.isException(() -> Util.>reflect(Server.class.getDeclaredField("raw"), server).set("online", true)); + Try.all.run(() -> Util.>reflect(Server.class.getDeclaredField("raw"), server).set("online", true)); add(e.getServer()); } } @@ -695,7 +696,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C @EventHandler public void stopped(SubStoppedEvent e) { Server server = getServer(e.getServer()); - if (server != null) Util.isException(() -> { + if (server != null) Try.all.run(() -> { ObjectMap raw = Util.reflect(Server.class.getDeclaredField("raw"), server); raw.set("online", false); raw.set("running", false); @@ -709,7 +710,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C } public Proxy getProxy(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); Proxy proxy = getProxies().getOrDefault(name.toLowerCase(), null); if (proxy == null && master != null && master.getName().equalsIgnoreCase(name)) proxy = master; return proxy; @@ -724,7 +725,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C } private Host getHost(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); return getHosts().get(name.toLowerCase()); } @@ -757,7 +758,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C } public Pair> getGroup(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); for (Map.Entry> group : getLowercaseGroups().entrySet()) { if (group.getKey().equalsIgnoreCase(name)) return new ContainedPair<>(group.getKey(), group.getValue()); } @@ -769,7 +770,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C } public Server getServer(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); return getServers().get(name.toLowerCase()); } @@ -782,7 +783,7 @@ public class PlaceholderImpl extends PlaceholderExpansion implements Taskable, C } public SubServer getSubServer(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); return getSubServers().get(name.toLowerCase()); } } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java index cc876977..418ad18b 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Metrics.java @@ -1,21 +1,17 @@ package net.ME1312.SubServers.Client.Bukkit.Library; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; +import org.bukkit.Bukkit; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.java.JavaPlugin; + +import javax.net.ssl.HttpsURLConnection; +import java.io.*; import java.lang.reflect.Method; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; +import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -26,12 +22,6 @@ import java.util.function.Supplier; import java.util.logging.Level; import java.util.stream.Collectors; import java.util.zip.GZIPOutputStream; -import javax.net.ssl.HttpsURLConnection; -import org.bukkit.Bukkit; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.java.JavaPlugin; public class Metrics { diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ObjectPermission.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ObjectPermission.java index ff022792..34c1fb28 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ObjectPermission.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/ObjectPermission.java @@ -49,7 +49,7 @@ public class ObjectPermission { * @return Permission Check Result */ public static boolean permits(String string, Permissible object, String... permissions) { - if (Util.isNull(object)) throw new NullPointerException(); + Util.nullpo(object); boolean permitted = false; for (int p = 0; !permitted && p < permissions.length; ++p) { @@ -73,7 +73,7 @@ public class ObjectPermission { * @return Permission Check Result */ public static boolean permits(Server server, Permissible object, String... permissions) { - if (Util.isNull(object)) throw new NullPointerException(); + Util.nullpo(object); boolean permitted = false; for (int p = 0; !permitted && p < permissions.length; ++p) { diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermission.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermission.java index 068c8535..6f7884a5 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermission.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermission.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.Forwardable; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Check Permission Packet */ public class PacketCheckPermission implements Forwardable, PacketObjectIn, PacketObjectOut { - static HashMap[]> callbacks = new HashMap[]>(); + static HashMap[]> callbacks = new HashMap[]>(); private UUID player; private String permission; private UUID tracker; @@ -33,7 +33,7 @@ public class PacketCheckPermission implements Forwardable, PacketObjectIn... callback) { + public PacketCheckPermission(UUID player, String permission, Consumer... callback) { this.player = player; this.permission = permission; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java index 5e3a5083..16140253 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java @@ -1,8 +1,7 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.SubData.Client.Protocol.Forwardable; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; @@ -11,6 +10,7 @@ import net.ME1312.SubData.Client.SubDataSender; import org.bukkit.Bukkit; import java.util.UUID; +import java.util.function.Consumer; import static net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketCheckPermission.callbacks; @@ -35,7 +35,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI * @param tracker Receiver ID */ public PacketCheckPermissionResponse(UUID player, String permission, UUID tracker) { - this.result = Util.getDespiteException(() -> Bukkit.getServer().getPlayer(player).hasPermission(permission), false); + this.result = Try.all.get(() -> Bukkit.getServer().getPlayer(player).hasPermission(permission), false); this.tracker = tracker; } @@ -49,7 +49,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI @Override public void receive(SubDataSender client, ObjectMap data) throws Throwable { - for (Callback callback : callbacks.get(data.getUUID(0x0000))) callback.run(data.getBoolean(0x0001)); + for (Consumer callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data.getBoolean(0x0001)); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java index 6636eaef..be9de27c 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java @@ -24,7 +24,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut { * @param plugin SubServers.Client */ public PacketDownloadLang(SubPlugin plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java index a6939754..2d8df223 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Version.Version; @@ -15,47 +14,48 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; /** * Run Event Packet */ public class PacketInExRunEvent implements PacketObjectIn { - private static HashMap>>> callbacks = new HashMap>>>(); + private static HashMap>>> callbacks = new HashMap>>>(); /** * New PacketInRunEvent */ public PacketInExRunEvent(SubPlugin plugin) { - callback("SubAddHostEvent", new Callback>() { + callback("SubAddHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubAddHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"))); callback("SubAddHostEvent", this); } } }); - callback("SubAddProxyEvent", new Callback>() { + callback("SubAddProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubAddProxyEvent(data.getString("proxy"))); callback("SubAddProxyEvent", this); } } }); - callback("SubAddServerEvent", new Callback>() { + callback("SubAddServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubAddServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getString("server"))); callback("SubAddServerEvent", this); } } }); - callback("SubCreateEvent", new Callback>() { + callback("SubCreateEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubCreateEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"), data.getString("name"), data.getString("template"), (data.contains("version"))?new Version(data.getString("version")):null, data.getInt("port"), data.getBoolean("update"))); @@ -63,9 +63,9 @@ public class PacketInExRunEvent implements PacketObjectIn { } } }); - callback("SubCreatedEvent", new Callback>() { + callback("SubCreatedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubCreatedEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"), data.getString("name"), data.getString("template"), (data.contains("version"))?new Version(data.getString("version")):null, data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); @@ -73,81 +73,81 @@ public class PacketInExRunEvent implements PacketObjectIn { } } }); - callback("SubSendCommandEvent", new Callback>() { + callback("SubSendCommandEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubSendCommandEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("server"), data.getString("command"))); callback("SubSendCommandEvent", this); } } }); - callback("SubEditServerEvent", new Callback>() { + callback("SubEditServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubEditServerEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("server"), new ContainedPair(data.getString("edit"), data.get("value")))); callback("SubEditServerEvent", this); } } }); - callback("SubStartEvent", new Callback>() { + callback("SubStartEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubStartEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("server"))); callback("SubStartEvent", this); } } }); - callback("SubStartedEvent", new Callback>() { + callback("SubStartedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubStartedEvent(data.getString("server"))); callback("SubStartedEvent", this); } } }); - callback("SubStopEvent", new Callback>() { + callback("SubStopEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubStopEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("server"), data.getBoolean("force"))); callback("SubStopEvent", this); } } }); - callback("SubStoppedEvent", new Callback>() { + callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubStoppedEvent(data.getString("server"))); callback("SubStoppedEvent", this); } } }); - callback("SubRemoveServerEvent", new Callback>() { + callback("SubRemoveServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubRemoveServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getString("server"))); callback("SubRemoveServerEvent", this); } } }); - callback("SubRemoveProxyEvent", new Callback>() { + callback("SubRemoveProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubAddProxyEvent(data.getString("proxy"))); callback("SubRemoveProxyEvent", this); } } }); - callback("SubRemoveHostEvent", new Callback>() { + callback("SubRemoveHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubRemoveHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"))); callback("SubRemoveHostEvent", this); @@ -160,10 +160,10 @@ public class PacketInExRunEvent implements PacketObjectIn { @Override public void receive(SubDataSender client, ObjectMap data) { if (callbacks.keySet().contains(data.getString(0x0000))) { - List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); + List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); PacketInExRunEvent.callbacks.remove(data.getString(0x0000)); - for (Callback> callback : callbacks) { - callback.run(new ObjectMap<>((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks) { + callback.accept(new ObjectMap<>((Map) data.getObject(0x0001))); } } } @@ -173,8 +173,8 @@ public class PacketInExRunEvent implements PacketObjectIn { return 0x0001; } - public static void callback(String event, Callback> callback) { - List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); + public static void callback(String event, Consumer> callback) { + List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); callbacks.add(callback); PacketInExRunEvent.callbacks.put(event, callbacks); } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java index cf83be4f..09a4634f 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java @@ -24,7 +24,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, * @param plugin SubServers.Client */ public PacketLinkServer(SubPlugin plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } /** @@ -34,7 +34,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, * @param channel Channel ID */ public PacketLinkServer(SubPlugin plugin, int channel) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.channel = channel; } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java index 6e317190..c3d1c84e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubProtocol.java @@ -1,8 +1,8 @@ package net.ME1312.SubServers.Client.Bukkit.Network; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -20,6 +20,7 @@ import java.io.File; import java.io.IOException; import java.net.InetAddress; import java.util.HashMap; +import java.util.function.Consumer; import java.util.logging.Handler; import java.util.logging.LogRecord; import java.util.logging.Logger; @@ -147,9 +148,9 @@ public class SubProtocol extends SubDataProtocol { } @Override - protected SubDataClient sub(Callback scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { + protected SubDataClient sub(Consumer scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { SubPlugin plugin = SubAPI.getInstance().getInternals(); - HashMap map = Util.getDespiteException(() -> Util.reflect(SubPlugin.class.getDeclaredField("subdata"), plugin), null); + HashMap map = Try.all.get(() -> Util.reflect(SubPlugin.class.getDeclaredField("subdata"), plugin)); int channel = 1; while (map.keySet().contains(channel)) channel++; @@ -165,10 +166,10 @@ public class SubProtocol extends SubDataProtocol { @SuppressWarnings("deprecation") @Override - public SubDataClient open(Callback scheduler, Logger logger, InetAddress address, int port) throws IOException { + public SubDataClient open(Consumer scheduler, Logger logger, InetAddress address, int port) throws IOException { SubPlugin plugin = SubAPI.getInstance().getInternals(); SubDataClient subdata = super.open(scheduler, logger, address, port); - HashMap map = Util.getDespiteException(() -> Util.reflect(SubPlugin.class.getDeclaredField("subdata"), plugin), null); + HashMap map = Try.all.get(() -> Util.reflect(SubPlugin.class.getDeclaredField("subdata"), plugin)); subdata.sendPacket(new PacketLinkServer(plugin, 0)); subdata.sendPacket(new PacketDownloadLang()); @@ -178,7 +179,7 @@ public class SubProtocol extends SubDataProtocol { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(event); - Util.isException(() -> Util.reflect(SubPlugin.class.getDeclaredMethod("connect", Pair.class), plugin, client)); + Try.all.run(() -> Util.reflect(SubPlugin.class.getDeclaredMethod("connect", Pair.class), plugin, client)); } else map.put(0, null); }); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java index 40551091..cf536b86 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubAPI.java @@ -4,7 +4,6 @@ import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataProtocol; -import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Bukkit.Graphic.UIHandler; import net.ME1312.SubServers.Client.Bukkit.Library.AccessMode; import net.ME1312.SubServers.Client.Common.ClientAPI; @@ -106,7 +105,7 @@ public final class SubAPI extends ClientAPI { * @return Lang Value */ public Map getLang(String channel) { - if (Util.isNull(channel)) throw new NullPointerException(); + Util.nullpo(channel); return new LinkedHashMap<>(plugin.lang.value().get(channel.toLowerCase())); } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java index c58c3c0a..e3787c4e 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java @@ -1,7 +1,6 @@ package net.ME1312.SubServers.Client.Bukkit; import net.ME1312.Galaxi.Library.AsyncConsolidator; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; @@ -9,6 +8,7 @@ import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Platform; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -21,9 +21,9 @@ import net.ME1312.SubServers.Client.Common.Network.Packet.PacketUpdateServer; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.command.Command; import org.bukkit.entity.Player; import java.io.BufferedReader; @@ -32,6 +32,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.nio.charset.Charset; import java.util.*; +import java.util.function.Consumer; import static net.ME1312.SubServers.Client.Bukkit.Library.ObjectPermission.permits; @@ -93,7 +94,7 @@ public final class SubCommand extends Command { } catch (Exception e) {} }); } else if (args[0].equalsIgnoreCase("list")) { - if (Util.getDespiteException(() -> Class.forName("net.md_5.bungee.api.chat.BaseComponent") != null, false) && sender instanceof Player) { + if (Try.all.get(() -> Class.forName("net.md_5.bungee.api.chat.BaseComponent") != null, false) && sender instanceof Player) { new net.ME1312.SubServers.Client.Bukkit.Library.Compatibility.BungeeChat(plugin).listCommand(sender, label); } else { final String fLabel = label; @@ -394,7 +395,7 @@ public final class SubCommand extends Command { if (select.subservers.length > 0) { // Step 5: Start the stopped Servers once more final UUID player = (sender instanceof Player)?((Player) sender).getUniqueId():null; - Callback starter = server -> server.start(player, response -> { + Consumer starter = server -> server.start(player, response -> { switch (response) { case 3: case 4: @@ -424,16 +425,16 @@ public final class SubCommand extends Command { // Step 4: Listen for stopped Servers final HashMap listening = new HashMap(); - PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() { + PacketInExRunEvent.callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap json) { + public void accept(ObjectMap json) { try { if (listening.size() > 0) { PacketInExRunEvent.callback("SubStoppedEvent", this); String name = json.getString("server").toLowerCase(); if (listening.keySet().contains(name)) { Bukkit.getScheduler().runTaskLater(plugin, () -> { - starter.run(listening.get(name)); + starter.accept(listening.get(name)); listening.remove(name); }, 5); } @@ -447,7 +448,7 @@ public final class SubCommand extends Command { AsyncConsolidator merge = new AsyncConsolidator(() -> { if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Restart").replace("$int$", success.value.toString())); }); - Callback> stopper = data -> { + Consumer> stopper = data -> { if (data.key() != 0) listening.remove(data.value().getName().toLowerCase()); switch (data.key()) { case 3: @@ -455,7 +456,7 @@ public final class SubCommand extends Command { sender.sendMessage(plugin.api.getLang("SubServers", "Command.Restart.Disappeared").replace("$str$", data.value().getName())); break; case 5: - starter.run(data.value()); + starter.accept(data.value()); case 0: success.value++; break; @@ -477,14 +478,14 @@ public final class SubCommand extends Command { merge.reserve(); if (self == null) { listening.put(server.getName().toLowerCase(), server); - server.stop(player, response -> stopper.run(new ContainedPair<>(response, server))); + server.stop(player, response -> stopper.accept(new ContainedPair<>(response, server))); } else if (self != server) { - ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketRestartServer(player, server.getName(), data -> stopper.run(new ContainedPair<>(data.getInt(0x0001), server)))); + ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketRestartServer(player, server.getName(), data -> stopper.accept(new ContainedPair<>(data.getInt(0x0001), server)))); } } if (self != null) { final SubServer fself = self; - ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketRestartServer(player, self.getName(), data -> stopper.run(new ContainedPair<>(data.getInt(0x0001), fself)))); + ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketRestartServer(player, self.getName(), data -> stopper.accept(new ContainedPair<>(data.getInt(0x0001), fself)))); } } }); @@ -501,7 +502,7 @@ public final class SubCommand extends Command { if (running.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Stop.Not-Running").replace("$int$", running.value.toString())); if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Stop").replace("$int$", success.value.toString())); }); - Callback> stopper = data -> { + Consumer> stopper = data -> { switch (data.key()) { case 3: case 4: @@ -527,11 +528,11 @@ public final class SubCommand extends Command { for (SubServer server : select.subservers) { merge.reserve(); - if (self != server) server.stop((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.run(new ContainedPair<>(response, server))); + if (self != server) server.stop((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.accept(new ContainedPair<>(response, server))); } if (self != null) { final SubServer fself = self; - fself.stop((sender instanceof Player) ? ((Player) sender).getUniqueId() : null, response -> stopper.run(new ContainedPair<>(response, fself))); + fself.stop((sender instanceof Player) ? ((Player) sender).getUniqueId() : null, response -> stopper.accept(new ContainedPair<>(response, fself))); } } }); @@ -548,7 +549,7 @@ public final class SubCommand extends Command { if (running.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Terminate.Not-Running").replace("$int$", running.value.toString())); if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Terminate").replace("$int$", success.value.toString())); }); - Callback> stopper = data -> { + Consumer> stopper = data -> { switch (data.key()) { case 3: case 4: @@ -574,11 +575,11 @@ public final class SubCommand extends Command { for (SubServer server : select.subservers) { merge.reserve(); - if (self != server) server.terminate((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.run(new ContainedPair<>(response, server))); + if (self != server) server.terminate((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.accept(new ContainedPair<>(response, server))); } if (self != null) { final SubServer fself = self; - fself.terminate((sender instanceof Player) ? ((Player) sender).getUniqueId() : null, response -> stopper.run(new ContainedPair<>(response, fself))); + fself.terminate((sender instanceof Player) ? ((Player) sender).getUniqueId() : null, response -> stopper.accept(new ContainedPair<>(response, fself))); } } }); @@ -631,7 +632,7 @@ public final class SubCommand extends Command { } else if (args[0].equalsIgnoreCase("create")) { if (args.length > 3) { if (permits(args[2], sender, "subservers.host.%.*", "subservers.host.%.create")) { - if (args.length > 5 && Util.isException(() -> Integer.parseInt(args[5]))) { + if (args.length > 5 && !Try.all.run(() -> Integer.parseInt(args[5]))) { sender.sendMessage(plugin.api.getLang("SubServers", "Command.Creator.Invalid-Port")); } else { ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketCreateServer((sender instanceof Player)?((Player) sender).getUniqueId():null, args[1], args[2], args[3], (args.length > 4)?new Version(args[4]):null, (args.length > 5)?Integer.parseInt(args[5]):null, data -> { @@ -879,14 +880,14 @@ public final class SubCommand extends Command { sender.sendMessage(plugin.api.getLang("SubServers", "Command.Generic.Usage").replace("$str$", label.toLowerCase() + " " + args[0].toLowerCase() + " " + ((sender instanceof Player)?"[Player]":"") + " ")); } } - private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, String permissions, Callback callback) { + private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, String permissions, Consumer callback) { selectServers(sender, rargs, index, mode, new String[]{ permissions }, callback); } - private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, String[] permissions, Callback callback) { + private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, String[] permissions, Consumer callback) { selectServers(sender, rargs, index, mode, new String[][]{ permissions }, callback); } @SuppressWarnings("unchecked") - private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, String[][] permissions, Callback callback) { + private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, String[][] permissions, Consumer callback) { StackTraceElement[] origin = new Exception().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList args = new LinkedList(); @@ -949,7 +950,7 @@ public final class SubCommand extends Command { } try { - callback.run(new ServerSelection(msgs, selection, servers, subservers, args, last.value())); + callback.accept(new ServerSelection(msgs, selection, servers, subservers, args, last.value())); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index ba749328..8fad0c51 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -4,7 +4,7 @@ import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; @@ -34,7 +34,8 @@ import java.nio.file.StandardCopyOption; import java.util.*; import java.util.concurrent.TimeUnit; -import static net.ME1312.SubServers.Client.Bukkit.Library.AccessMode.*; +import static net.ME1312.SubServers.Client.Bukkit.Library.AccessMode.NO_COMMANDS; +import static net.ME1312.SubServers.Client.Bukkit.Library.AccessMode.NO_INTEGRATIONS; /** * SubServers Client Plugin Class @@ -42,7 +43,7 @@ import static net.ME1312.SubServers.Client.Bukkit.Library.AccessMode.*; public final class SubPlugin extends JavaPlugin { HashMap subdata = new HashMap(); Pair>> lang = null; - private UniversalFile dir; + private File dir; public YAMLConfig config; public SubProtocol subprotocol; @@ -68,22 +69,22 @@ public final class SubPlugin extends JavaPlugin { public void onEnable() { try { Bukkit.getLogger().info("SubServers > Loading SubServers.Client.Bukkit v" + version.toString() + " Libraries (for Minecraft " + api.getGameVersion() + ")"); - dir = new UniversalFile(getDataFolder().getParentFile(), "SubServers-Client"); + dir = new File(getDataFolder().getParentFile(), "SubServers-Client"); if (getDataFolder().exists()) { Files.move(getDataFolder().toPath(), dir.toPath(), StandardCopyOption.REPLACE_EXISTING); } else dir.mkdirs(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "config.yml")); - config = new YAMLConfig(new UniversalFile(dir, "config.yml")); - if (new UniversalFile(new File(System.getProperty("user.dir")), "subdata.json").exists()) { - FileReader reader = new FileReader(new UniversalFile(new File(System.getProperty("user.dir")), "subdata.json")); + ConfigUpdater.updateConfig(new File(dir, "config.yml")); + config = new YAMLConfig(new File(dir, "config.yml")); + if (new File(new File(System.getProperty("user.dir")), "subdata.json").exists()) { + FileReader reader = new FileReader(new File(new File(System.getProperty("user.dir")), "subdata.json")); config.get().getMap("Settings").set("SubData", new YAMLSection(parseJSON(Util.readAll(reader)))); config.save(); reader.close(); - new UniversalFile(new File(System.getProperty("user.dir")), "subdata.json").delete(); + new File(new File(System.getProperty("user.dir")), "subdata.json").delete(); } - if (new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").exists()) { - if (new UniversalFile(dir, "subdata.rsa.key").exists()) new UniversalFile(dir, "subdata.rsa.key").delete(); - Files.move(new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").toPath(), new UniversalFile(dir, "subdata.rsa.key").toPath()); + if (new File(new File(System.getProperty("user.dir")), "subdata.rsa.key").exists()) { + if (new File(dir, "subdata.rsa.key").exists()) new File(dir, "subdata.rsa.key").delete(); + Files.move(new File(new File(System.getProperty("user.dir")), "subdata.rsa.key").toPath(), new File(dir, "subdata.rsa.key").toPath()); } getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); @@ -105,9 +106,9 @@ public final class SubPlugin extends JavaPlugin { Bukkit.getLogger().info("SubData > AES Encryption Available"); } - if (new UniversalFile(dir, "subdata.rsa.key").exists()) { + if (new File(dir, "subdata.rsa.key").exists()) { try { - subprotocol.registerCipher("RSA", new RSA(new UniversalFile(dir, "subdata.rsa.key"))); + subprotocol.registerCipher("RSA", new RSA(new File(dir, "subdata.rsa.key"))); Bukkit.getLogger().info("SubData > RSA Encryption Available"); } catch (Exception e) { e.printStackTrace(); @@ -159,7 +160,7 @@ public final class SubPlugin extends JavaPlugin { public void reload(boolean notifyPlugins) throws IOException { resetDate = Calendar.getInstance().getTime().getTime(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "config.yml")); + ConfigUpdater.updateConfig(new File(dir, "config.yml")); config.reload(); if (notifyPlugins) { @@ -237,7 +238,7 @@ public final class SubPlugin extends JavaPlugin { */ @SuppressWarnings("unchecked") public Map parseJSON(String json) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException, ClassNotFoundException { - Class gson = Class.forName(((Util.getDespiteException(() -> Class.forName("com.google.gson.Gson") != null, false)?"":"org.bukkit.craftbukkit.libs.")) + "com.google.gson.Gson"); + Class gson = Class.forName(((Try.all.get(() -> Class.forName("com.google.gson.Gson") != null, false)?"":"org.bukkit.craftbukkit.libs.")) + "com.google.gson.Gson"); //Class gson = com.google.gson.Gson.class; return (Map) gson.getMethod("fromJson", String.class, Class.class).invoke(gson.newInstance(), json, Map.class); } diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml index 4facfaf7..9c970522 100644 --- a/SubServers.Client/Common/pom.xml +++ b/SubServers.Client/Common/pom.xml @@ -18,13 +18,13 @@ net.ME1312.Galaxi GalaxiUtil - 21w27b + 21w43f compile net.ME1312.SubData Client - 21w33a + 21w43a compile diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java index 58984c55..43857bb5 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/ClientAPI.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; @@ -16,6 +15,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.function.Consumer; +import java.util.function.IntConsumer; import static net.ME1312.SubServers.Client.Common.Network.API.SimplifiedData.*; @@ -47,7 +48,7 @@ public abstract class ClientAPI { * * @param callback Host Map */ - public void getHosts(Callback> callback) { + public void getHosts(Consumer> callback) { requestHosts(null, callback); } @@ -57,7 +58,7 @@ public abstract class ClientAPI { * @param name Host name * @param callback a Host */ - public void getHost(String name, Callback callback) { + public void getHost(String name, Consumer callback) { requestHost(null, name, callback); } @@ -66,7 +67,7 @@ public abstract class ClientAPI { * * @param callback Group Map */ - public void getGroups(Callback>> callback) { + public void getGroups(Consumer>> callback) { requestGroups(null, callback); } @@ -75,7 +76,7 @@ public abstract class ClientAPI { * * @param callback Group Map */ - public void getLowercaseGroups(Callback>> callback) { + public void getLowercaseGroups(Consumer>> callback) { requestLowercaseGroups(null, callback); } @@ -85,7 +86,7 @@ public abstract class ClientAPI { * @param name Group name * @param callback a Server Group */ - public void getGroup(String name, Callback>> callback) { + public void getGroup(String name, Consumer>> callback) { requestGroup(null, name, callback); } @@ -94,7 +95,7 @@ public abstract class ClientAPI { * * @param callback Server Map */ - public void getServers(Callback> callback) { + public void getServers(Consumer> callback) { requestServers(null, callback); } @@ -104,7 +105,7 @@ public abstract class ClientAPI { * @param name Server name * @param callback a Server */ - public void getServer(String name, Callback callback) { + public void getServer(String name, Consumer callback) { requestServer(null, name, callback); } @@ -119,7 +120,7 @@ public abstract class ClientAPI { * @param restricted Players will need a permission to join if true * @param response Response Code */ - public void addServer(String name, InetAddress ip, int port, String motd, boolean hidden, boolean restricted, Callback response) { + public void addServer(String name, InetAddress ip, int port, String motd, boolean hidden, boolean restricted, IntConsumer response) { addServer(null, name, ip, port, motd, hidden, restricted, response); } @@ -135,12 +136,12 @@ public abstract class ClientAPI { * @param restricted Players will need a permission to join if true * @param response Response Code */ - public void addServer(UUID player, String name, InetAddress ip, int port, String motd, boolean hidden, boolean restricted, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + public void addServer(UUID player, String name, InetAddress ip, int port, String motd, boolean hidden, boolean restricted, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); ((SubDataClient) getSubDataNetwork()[0]).sendPacket(new PacketAddServer(player, name, ip, port, motd, hidden, restricted, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -184,7 +185,7 @@ public abstract class ClientAPI { * @param name Name of the Server * @param response Response Code */ - public void removeServer(String name, Callback response) { + public void removeServer(String name, IntConsumer response) { removeServer(null, name, response); } @@ -195,8 +196,8 @@ public abstract class ClientAPI { * @param name Name of the Server * @param response Response Code */ - public void removeServer(UUID player, String name, Callback response) { - if (Util.isNull(name)) throw new NullPointerException(); + public void removeServer(UUID player, String name, IntConsumer response) { + Util.nullpo(name); removeServer(player, name, false, response); } @@ -216,7 +217,7 @@ public abstract class ClientAPI { * @param name Name of the Server */ public void removeServer(UUID player, String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); removeServer(player, name, i -> {}); } @@ -226,7 +227,7 @@ public abstract class ClientAPI { * @param name Name of the Server * @param response Response Code */ - public void forceRemoveServer(String name, Callback response) { + public void forceRemoveServer(String name, IntConsumer response) { forceRemoveServer(null, name, response); } @@ -237,8 +238,8 @@ public abstract class ClientAPI { * @param name Name of the Server * @param response Response Code */ - public void forceRemoveServer(UUID player, String name, Callback response) { - if (Util.isNull(name)) throw new NullPointerException(); + public void forceRemoveServer(UUID player, String name, IntConsumer response) { + Util.nullpo(name); removeServer(player, name, true, response); } @@ -258,16 +259,16 @@ public abstract class ClientAPI { * @param name Name of the Server */ public void forceRemoveServer(UUID player, String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); forceRemoveServer(player, name, i -> {}); } - private void removeServer(UUID player, String name, boolean force, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + private void removeServer(UUID player, String name, boolean force, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); ((SubDataClient) getSubDataNetwork()[0]).sendPacket(new PacketRemoveServer(player, name, force, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -281,7 +282,7 @@ public abstract class ClientAPI { * * @param callback SubServer Map */ - public void getSubServers(Callback> callback) { + public void getSubServers(Consumer> callback) { requestSubServers(null, callback); } @@ -291,7 +292,7 @@ public abstract class ClientAPI { * @param name SubServer name * @param callback a SubServer */ - public void getSubServer(String name, Callback callback) { + public void getSubServer(String name, Consumer callback) { requestSubServer(null, name, callback); } @@ -300,7 +301,7 @@ public abstract class ClientAPI { * * @param callback Proxy Map */ - public void getProxies(Callback> callback) { + public void getProxies(Consumer> callback) { requestProxies(null, callback); } @@ -310,7 +311,7 @@ public abstract class ClientAPI { * @param name Proxy name * @param callback a Proxy */ - public void getProxy(String name, Callback callback) { + public void getProxy(String name, Consumer callback) { requestProxy(null, name, callback); } @@ -319,7 +320,7 @@ public abstract class ClientAPI { * * @param callback Master Proxy */ - public void getMasterProxy(Callback callback) { + public void getMasterProxy(Consumer callback) { requestMasterProxy(null, callback); } @@ -328,7 +329,7 @@ public abstract class ClientAPI { * * @param callback Remote Player Collection */ - public void getRemotePlayers(Callback> callback) { + public void getRemotePlayers(Consumer> callback) { requestRemotePlayers(null, callback); } @@ -338,7 +339,7 @@ public abstract class ClientAPI { * @param name Player name * @param callback Remote Player */ - public void getRemotePlayer(String name, Callback callback) { + public void getRemotePlayer(String name, Consumer callback) { requestRemotePlayer(null, name, callback); } @@ -348,7 +349,7 @@ public abstract class ClientAPI { * @param id Player UUID * @param callback Remote Player */ - public void getRemotePlayer(UUID id, Callback callback) { + public void getRemotePlayer(UUID id, Consumer callback) { requestRemotePlayer(null, id, callback); } @@ -389,7 +390,7 @@ public abstract class ClientAPI { * @return Lang Values */ public String getLang(String channel, String key) { - if (Util.isNull(channel, key)) throw new NullPointerException(); + Util.nullpo(channel, key); return getLang(channel).get(key); } } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java index 62edfc55..7ff70f30 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Host.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.API; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; @@ -17,6 +16,8 @@ import java.lang.reflect.InvocationTargetException; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; +import java.util.function.Consumer; +import java.util.function.IntConsumer; /** * Simplified Host Data Class @@ -173,12 +174,12 @@ public class Host { * * @param callback Remote Player Collection */ - public void getRemotePlayers(Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public void getRemotePlayers(Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); Runnable run = () -> { try { - callback.run(players); + callback.accept(players); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -319,7 +320,7 @@ public class Host { * @return a SubServer */ public SubServer getSubServer(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); return getSubServers().get(name.toLowerCase()); } @@ -339,7 +340,7 @@ public class Host { * @param response Response Code * @return The SubServer */ - public void addSubServer(String name, boolean enabled, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted, Callback response) { + public void addSubServer(String name, boolean enabled, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted, IntConsumer response) { addSubServer(null, name, enabled, port, motd, log, directory, executable, stopcmd, hidden, restricted, response); } @@ -360,12 +361,12 @@ public class Host { * @param response Response Code * @return The SubServer */ - public void addSubServer(UUID player, String name, boolean enabled, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + public void addSubServer(UUID player, String name, boolean enabled, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); client().sendPacket(new PacketAddServer(player, name, enabled, getName(), port, motd, log, directory, executable, stopcmd, hidden, restricted, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -429,7 +430,7 @@ public class Host { * @param name SubServer Name */ public void removeSubServer(UUID player, String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); removeSubServer(player, name, false, i -> {}); } @@ -449,7 +450,7 @@ public class Host { * @param name SubServer Name */ public void forceRemoveSubServer(UUID player, String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); removeSubServer(player, name, true, i -> {}); } @@ -459,7 +460,7 @@ public class Host { * @param name SubServer Name * @param response Response Code */ - public void removeSubServer(String name, Callback response) { + public void removeSubServer(String name, IntConsumer response) { removeSubServer(null, name, response); } @@ -470,8 +471,8 @@ public class Host { * @param name SubServer Name * @param response Response Code */ - public void removeSubServer(UUID player, String name, Callback response) { - if (Util.isNull(name)) throw new NullPointerException(); + public void removeSubServer(UUID player, String name, IntConsumer response) { + Util.nullpo(name); removeSubServer(player, name, false, response); } @@ -481,7 +482,7 @@ public class Host { * @param name SubServer Name * @param response Response Code */ - public void forceRemoveSubServer(String name, Callback response) { + public void forceRemoveSubServer(String name, IntConsumer response) { forceRemoveSubServer(null, name, response); } @@ -492,17 +493,17 @@ public class Host { * @param name SubServer Name * @param response Response Code */ - public void forceRemoveSubServer(UUID player, String name, Callback response) { - if (Util.isNull(name)) throw new NullPointerException(); + public void forceRemoveSubServer(UUID player, String name, IntConsumer response) { + Util.nullpo(name); removeSubServer(player, name, true, response); } - private void removeSubServer(UUID player, String name, boolean force, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + private void removeSubServer(UUID player, String name, boolean force, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); client().sendPacket(new PacketRemoveServer(player, name, force, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -527,7 +528,7 @@ public class Host { * @param name SubServer Name */ public void recycleSubServer(UUID player, String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); deleteSubServer(player, name, true, false, i -> {}); } @@ -547,7 +548,7 @@ public class Host { * @param name SubServer Name */ public void forceRecycleSubServer(UUID player, String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); deleteSubServer(player, name, true, true, i -> {}); } @@ -557,7 +558,7 @@ public class Host { * @param name SubServer Name * @param response Response Code */ - public void recycleSubServer(String name, Callback response) { + public void recycleSubServer(String name, IntConsumer response) { recycleSubServer(null, name, response); } @@ -568,8 +569,8 @@ public class Host { * @param name SubServer Name * @param response Response Code */ - public void recycleSubServer(UUID player, String name, Callback response) { - if (Util.isNull(name)) throw new NullPointerException(); + public void recycleSubServer(UUID player, String name, IntConsumer response) { + Util.nullpo(name); deleteSubServer(player, name, true, false, response); } @@ -579,7 +580,7 @@ public class Host { * @param name SubServer Name * @param response Response Code */ - public void forceRecycleSubServer(String name, Callback response) { + public void forceRecycleSubServer(String name, IntConsumer response) { forceRecycleSubServer(null, name, response); } @@ -590,8 +591,8 @@ public class Host { * @param name SubServer Name * @param response Response Code */ - public void forceRecycleSubServer(UUID player, String name, Callback response) { - if (Util.isNull(name)) throw new NullPointerException(); + public void forceRecycleSubServer(UUID player, String name, IntConsumer response) { + Util.nullpo(name); deleteSubServer(player, name, true, true, response); } @@ -613,7 +614,7 @@ public class Host { * @return Success Status */ public void deleteSubServer(UUID player, String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); deleteSubServer(player, name, false, false, i -> {}); } @@ -635,7 +636,7 @@ public class Host { * @return Success Status */ public void forceDeleteSubServer(UUID player, String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); deleteSubServer(player, name, false, true, i -> {}); } @@ -645,7 +646,7 @@ public class Host { * @param name SubServer Name * @return Success Status */ - public void deleteSubServer(String name, Callback response) { + public void deleteSubServer(String name, IntConsumer response) { deleteSubServer(null, name, response); } @@ -656,8 +657,8 @@ public class Host { * @param name SubServer Name * @return Success Status */ - public void deleteSubServer(UUID player, String name, Callback response) { - if (Util.isNull(name)) throw new NullPointerException(); + public void deleteSubServer(UUID player, String name, IntConsumer response) { + Util.nullpo(name); deleteSubServer(player, name, false, false, response); } @@ -667,7 +668,7 @@ public class Host { * @param name SubServer Name * @return Success Status */ - public void forceDeleteSubServer(String name, Callback response) { + public void forceDeleteSubServer(String name, IntConsumer response) { forceDeleteSubServer(null, name, response); } @@ -678,17 +679,17 @@ public class Host { * @param name SubServer Name * @return Success Status */ - public void forceDeleteSubServer(UUID player, String name, Callback response) { - if (Util.isNull(name)) throw new NullPointerException(); + public void forceDeleteSubServer(UUID player, String name, IntConsumer response) { + Util.nullpo(name); deleteSubServer(player, name, false, true, response); } - private void deleteSubServer(UUID player, String name, boolean recycle, boolean force, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + private void deleteSubServer(UUID player, String name, boolean recycle, boolean force, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); client().sendPacket(new PacketDeleteServer(player, name, recycle, force, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -722,7 +723,7 @@ public class Host { * @return Value Status */ public boolean hasExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return raw.getMap("extra").getKeys().contains(handle); } @@ -733,7 +734,7 @@ public class Host { * @return Value */ public ObjectMapValue getExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return raw.getMap("extra").get(handle); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java index 469b50ed..c46bdc8e 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Proxy.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.API; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; @@ -16,6 +15,7 @@ import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadProxyInf import java.lang.reflect.InvocationTargetException; import java.util.*; +import java.util.function.Consumer; /** * Simplified Proxy Data Class @@ -129,12 +129,12 @@ public class Proxy { * * @param callback Remote Player Collection */ - public void getPlayers(Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public void getPlayers(Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); Runnable run = () -> { try { - callback.run(players); + callback.accept(players); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -184,7 +184,7 @@ public class Proxy { * @return Value Status */ public boolean hasExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return raw.getMap("extra").getKeys().contains(handle); } @@ -195,7 +195,7 @@ public class Proxy { * @return Value */ public ObjectMapValue getExtra(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); return raw.getMap("extra").get(handle); } 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 5767cf9c..c0f52081 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 @@ -1,16 +1,22 @@ package net.ME1312.SubServers.Client.Common.Network.API; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.ClientAPI; -import net.ME1312.SubServers.Client.Common.Network.Packet.*; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDisconnectPlayer; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadPlayerInfo; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketMessagePlayer; +import net.ME1312.SubServers.Client.Common.Network.Packet.PacketTransferPlayer; import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; -import java.util.*; +import java.util.Calendar; +import java.util.Collections; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.function.IntConsumer; /** * Simplified RemotePlayer Data Class @@ -108,12 +114,12 @@ public class RemotePlayer { * * @param callback the proxy this player is connected to */ - public void getProxy(Callback callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public void getProxy(Consumer callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); Runnable run = () -> { try { - callback.run(proxy); + callback.accept(proxy); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -145,12 +151,12 @@ public class RemotePlayer { * * @param callback the server this player is connected to */ - public void getServer(Callback callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public void getServer(Consumer callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); Runnable run = () -> { try { - callback.run(server); + callback.accept(server); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -183,7 +189,7 @@ public class RemotePlayer { * @param message Message to send * @param response Success Status */ - public static void broadcastMessage(String message, Callback response) { + public static void broadcastMessage(String message, IntConsumer response) { broadcastMessage(new String[]{ message }, response); } @@ -193,7 +199,7 @@ public class RemotePlayer { * @param messages Messages to send * @param response Success Status */ - public static void broadcastMessage(String[] messages, Callback response) { + public static void broadcastMessage(String[] messages, IntConsumer response) { sendMessage(null, messages, response); } @@ -212,7 +218,7 @@ public class RemotePlayer { * @param message Message to send * @param response Success Status */ - public void sendMessage(String message, Callback response) { + public void sendMessage(String message, IntConsumer response) { sendMessage(new String[]{ message }, response); } @@ -222,7 +228,7 @@ public class RemotePlayer { * @param messages Messages to send * @param response Success Status */ - public void sendMessage(String[] messages, Callback response) { + public void sendMessage(String[] messages, IntConsumer response) { instance.sendMessage(client(), new UUID[]{ getUniqueId() }, messages, response); } @@ -243,7 +249,7 @@ public class RemotePlayer { * @param message Message to send * @param response Success Status */ - public static void sendMessage(UUID[] players, String message, Callback response) { + public static void sendMessage(UUID[] players, String message, IntConsumer response) { sendMessage(players, new String[]{ message }, response); } @@ -254,7 +260,7 @@ public class RemotePlayer { * @param messages Messages to send * @param response Success Status */ - public static void sendMessage(UUID[] players, String[] messages, Callback response) { + public static void sendMessage(UUID[] players, String[] messages, IntConsumer response) { instance.sendMessage(SimplifiedData.client(ClientAPI.getInstance().getSubDataNetwork()[0]), players, messages, response); } @@ -273,7 +279,7 @@ public class RemotePlayer { * @param message Message to send * @param response Success Status */ - public static void broadcastRawMessage(String message, Callback response) { + public static void broadcastRawMessage(String message, IntConsumer response) { broadcastRawMessage(new String[]{ message }, response); } @@ -283,7 +289,7 @@ public class RemotePlayer { * @param messages Messages to send * @param response Success Status */ - public static void broadcastRawMessage(String[] messages, Callback response) { + public static void broadcastRawMessage(String[] messages, IntConsumer response) { sendRawMessage(null, messages, response); } @@ -302,7 +308,7 @@ public class RemotePlayer { * @param message Message to send * @param response Success Status */ - public void sendRawMessage(String message, Callback response) { + public void sendRawMessage(String message, IntConsumer response) { sendRawMessage(new String[]{ message }, response); } @@ -312,7 +318,7 @@ public class RemotePlayer { * @param message Message to send * @param response Success Status */ - public void sendRawMessage(String[] message, Callback response) { + public void sendRawMessage(String[] message, IntConsumer response) { instance.sendRawMessage(client(), new UUID[]{ getUniqueId() }, message, response); } @@ -333,7 +339,7 @@ public class RemotePlayer { * @param message Message to send * @param response Success Status */ - public static void sendRawMessage(UUID[] players, String message, Callback response) { + public static void sendRawMessage(UUID[] players, String message, IntConsumer response) { sendRawMessage(players, new String[]{ message }, response); } @@ -344,7 +350,7 @@ public class RemotePlayer { * @param messages Messages to send * @param response Success Status */ - public static void sendRawMessage(UUID[] players, String[] messages, Callback response) { + public static void sendRawMessage(UUID[] players, String[] messages, IntConsumer response) { instance.sendRawMessage(SimplifiedData.client(ClientAPI.getInstance().getSubDataNetwork()[0]), players, messages, response); } @@ -363,7 +369,7 @@ public class RemotePlayer { * @param server Target server * @param response Success status */ - public void transfer(String server, Callback response) { + public void transfer(String server, IntConsumer response) { instance.transfer(client(), new UUID[]{ getUniqueId() }, server, response); } @@ -384,7 +390,7 @@ public class RemotePlayer { * @param server Target server * @param response Success status */ - public static void transfer(UUID[] players, String server, Callback response) { + public static void transfer(UUID[] players, String server, IntConsumer response) { instance.transfer(SimplifiedData.client(ClientAPI.getInstance().getSubDataNetwork()[0]), players, server, response); } @@ -400,7 +406,7 @@ public class RemotePlayer { * * @param response Success status */ - public void disconnect(Callback response) { + public void disconnect(IntConsumer response) { disconnect((String) null, response); } @@ -419,7 +425,7 @@ public class RemotePlayer { * @param reason Disconnect Reason * @param response Success status */ - public void disconnect(String reason, Callback response) { + public void disconnect(String reason, IntConsumer response) { instance.disconnect(client(), new UUID[]{ getUniqueId() }, reason, response); } @@ -438,7 +444,7 @@ public class RemotePlayer { * @param players Players to select * @param response Success status */ - public static void disconnect(UUID[] players, Callback response) { + public static void disconnect(UUID[] players, IntConsumer response) { disconnect(players, null, response); } @@ -459,7 +465,7 @@ public class RemotePlayer { * @param reason Disconnect Reason * @param response Success status */ - public static void disconnect(UUID[] players, String reason, Callback response) { + public static void disconnect(UUID[] players, String reason, IntConsumer response) { instance.disconnect(SimplifiedData.client(ClientAPI.getInstance().getSubDataNetwork()[0]), players, reason, response); } @@ -536,11 +542,11 @@ public class RemotePlayer { * @param messages Messages to send * @param response Success Status */ - protected void sendMessage(SubDataClient client, UUID[] players, String[] messages, Callback response) { + protected void sendMessage(SubDataClient client, UUID[] players, String[] messages, IntConsumer response) { StackTraceElement[] origin = new Exception().getStackTrace(); client.sendPacket(new PacketMessagePlayer(players, messages, null, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -557,11 +563,11 @@ public class RemotePlayer { * @param messages Messages to send * @param response Success Status */ - protected void sendRawMessage(SubDataClient client, UUID[] players, String[] messages, Callback response) { + protected void sendRawMessage(SubDataClient client, UUID[] players, String[] messages, IntConsumer response) { StackTraceElement[] origin = new Exception().getStackTrace(); client.sendPacket(new PacketMessagePlayer(players, null, messages, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -578,11 +584,11 @@ public class RemotePlayer { * @param server Target server * @param response Success Status */ - protected void transfer(SubDataClient client, UUID[] players, String server, Callback response) { + protected void transfer(SubDataClient client, UUID[] players, String server, IntConsumer response) { StackTraceElement[] origin = new Exception().getStackTrace(); client.sendPacket(new PacketTransferPlayer(players, server, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -599,11 +605,11 @@ public class RemotePlayer { * @param reason Disconnect Reason * @param response Success status */ - protected void disconnect(SubDataClient client, UUID[] players, String reason, Callback response) { + protected void disconnect(SubDataClient client, UUID[] players, String reason, IntConsumer response) { StackTraceElement[] origin = new Exception().getStackTrace(); client.sendPacket(new PacketDisconnectPlayer(players, reason, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java index 7addcdb3..bc2281ee 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/Server.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.API; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; @@ -16,6 +15,7 @@ import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDownloadServerIn import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; import java.util.*; +import java.util.function.Consumer; /** * Simplified Server Data Class @@ -137,12 +137,12 @@ public class Server { * * @param callback Remote Player Collection */ - public void getRemotePlayers(Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public void getRemotePlayers(Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); Runnable run = () -> { try { - callback.run(players); + callback.accept(players); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java index 68de7e20..a423ba68 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SimplifiedData.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.API; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Util; @@ -11,6 +10,7 @@ import net.ME1312.SubServers.Client.Common.Network.Packet.*; import java.lang.reflect.InvocationTargetException; import java.util.*; +import java.util.function.Consumer; /** * Simplified Data Requesting Class @@ -27,8 +27,8 @@ public final class SimplifiedData { * @param client SubData connection * @param callback Host Map */ - public static void requestHosts(DataClient client, Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestHosts(DataClient client, Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadHostInfo(null, data -> { TreeMap hosts = new TreeMap(); @@ -37,7 +37,7 @@ public final class SimplifiedData { } try { - callback.run(hosts); + callback.accept(hosts); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -53,8 +53,8 @@ public final class SimplifiedData { * @param name Host name * @param callback a Host */ - public static void requestHost(DataClient client, String name, Callback callback) { - if (Util.isNull(name, callback)) throw new NullPointerException(); + public static void requestHost(DataClient client, String name, Consumer callback) { + Util.nullpo(name, callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadHostInfo(Collections.singletonList(name), data -> { Host host = null; @@ -63,7 +63,7 @@ public final class SimplifiedData { } try { - callback.run(host); + callback.accept(host); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -78,8 +78,8 @@ public final class SimplifiedData { * @param client SubData connection * @param callback Group Map */ - public static void requestGroups(DataClient client, Callback>> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestGroups(DataClient client, Consumer>> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadGroupInfo(null, data -> { TreeMap> groups = new TreeMap>(); @@ -96,7 +96,7 @@ public final class SimplifiedData { } try { - callback.run(groups); + callback.accept(groups); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -111,14 +111,14 @@ public final class SimplifiedData { * @param client SubData connection * @param callback Group Map */ - public static void requestLowercaseGroups(DataClient client, Callback>> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestLowercaseGroups(DataClient client, Consumer>> callback) { + Util.nullpo(callback); requestGroups(client, groups -> { TreeMap> lowercaseGroups = new TreeMap>(); for (String key : groups.keySet()) { lowercaseGroups.put(key.toLowerCase(), groups.get(key)); } - callback.run(lowercaseGroups); + callback.accept(lowercaseGroups); }); } @@ -129,8 +129,8 @@ public final class SimplifiedData { * @param name Group name * @param callback a Server Group */ - public static void requestGroup(DataClient client, String name, Callback>> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestGroup(DataClient client, String name, Consumer>> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadGroupInfo((name == null)?Collections.emptyList():Collections.singletonList(name), data -> { Pair> group = null; @@ -148,7 +148,7 @@ public final class SimplifiedData { } try { - callback.run(group); + callback.accept(group); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -163,8 +163,8 @@ public final class SimplifiedData { * @param client SubData connection * @param callback Server Map */ - public static void requestServers(DataClient client, Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestServers(DataClient client, Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadServerInfo(null, data -> { TreeMap servers = new TreeMap(); @@ -177,7 +177,7 @@ public final class SimplifiedData { } try { - callback.run(servers); + callback.accept(servers); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -193,8 +193,8 @@ public final class SimplifiedData { * @param name Server name * @param callback a Server */ - public static void requestServer(DataClient client, String name, Callback callback) { - if (Util.isNull(name, callback)) throw new NullPointerException(); + public static void requestServer(DataClient client, String name, Consumer callback) { + Util.nullpo(name, callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadServerInfo(Collections.singletonList(name), data -> { Server server = null; @@ -208,7 +208,7 @@ public final class SimplifiedData { } try { - callback.run(server); + callback.accept(server); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -223,14 +223,14 @@ public final class SimplifiedData { * @param client SubData connection * @param callback SubServer Map */ - public static void requestSubServers(DataClient client, Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestSubServers(DataClient client, Consumer> callback) { + Util.nullpo(callback); requestServers(client, servers -> { TreeMap subservers = new TreeMap(); for (String server : servers.keySet()) { if (servers.get(server) instanceof SubServer) subservers.put(server, (SubServer) servers.get(server)); } - callback.run(subservers); + callback.accept(subservers); }); } @@ -241,9 +241,9 @@ public final class SimplifiedData { * @param name SubServer name * @param callback a SubServer */ - public static void requestSubServer(DataClient client, String name, Callback callback) { - if (Util.isNull(name, callback)) throw new NullPointerException(); - requestServer(client, name, server -> callback.run((server instanceof SubServer)?(SubServer) server:null)); + public static void requestSubServer(DataClient client, String name, Consumer callback) { + Util.nullpo(name, callback); + requestServer(client, name, server -> callback.accept((server instanceof SubServer)?(SubServer) server:null)); } /** @@ -252,8 +252,8 @@ public final class SimplifiedData { * @param client SubData connection * @param callback Proxy Map */ - public static void requestProxies(DataClient client, Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestProxies(DataClient client, Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadProxyInfo(null, data -> { TreeMap proxies = new TreeMap(); @@ -262,7 +262,7 @@ public final class SimplifiedData { } try { - callback.run(proxies); + callback.accept(proxies); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -278,8 +278,8 @@ public final class SimplifiedData { * @param name Proxy name * @param callback a Proxy */ - public static void requestProxy(DataClient client, String name, Callback callback) { - if (Util.isNull(name, callback)) throw new NullPointerException(); + public static void requestProxy(DataClient client, String name, Consumer callback) { + Util.nullpo(name, callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadProxyInfo(Collections.singletonList(name), data -> { Proxy proxy = null; @@ -288,7 +288,7 @@ public final class SimplifiedData { } try { - callback.run(proxy); + callback.accept(proxy); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -303,8 +303,8 @@ public final class SimplifiedData { * @param client SubData connection * @param callback Master Proxy */ - public static void requestMasterProxy(DataClient client, Callback callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestMasterProxy(DataClient client, Consumer callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadProxyInfo(Collections.emptyList(), data -> { Proxy proxy = null; @@ -313,7 +313,7 @@ public final class SimplifiedData { } try { - callback.run(proxy); + callback.accept(proxy); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -328,8 +328,8 @@ public final class SimplifiedData { * @param client SubData connection * @param callback Remote Player Collection */ - public static void requestRemotePlayers(DataClient client, Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public static void requestRemotePlayers(DataClient client, Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadPlayerInfo((List) null, data -> { TreeMap players = new TreeMap(); @@ -338,7 +338,7 @@ public final class SimplifiedData { } try { - callback.run(players); + callback.accept(players); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -354,8 +354,8 @@ public final class SimplifiedData { * @param name Player name * @param callback Remote Player */ - public static void requestRemotePlayer(DataClient client, String name, Callback callback) { - if (Util.isNull(name, callback)) throw new NullPointerException(); + public static void requestRemotePlayer(DataClient client, String name, Consumer callback) { + Util.nullpo(name, callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadPlayerInfo(Collections.singletonList(name), data -> { RemotePlayer player = null; @@ -364,7 +364,7 @@ public final class SimplifiedData { } try { - callback.run(player); + callback.accept(player); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -380,8 +380,8 @@ public final class SimplifiedData { * @param id Player UUID * @param callback Remote Player */ - public static void requestRemotePlayer(DataClient client, UUID id, Callback callback) { - if (Util.isNull(id, callback)) throw new NullPointerException(); + public static void requestRemotePlayer(DataClient client, UUID id, Consumer callback) { + Util.nullpo(id, callback); StackTraceElement[] origin = new Exception().getStackTrace(); client(client).sendPacket(new PacketDownloadPlayerInfo(Collections.singletonList(id), data -> { RemotePlayer player = null; @@ -390,7 +390,7 @@ public final class SimplifiedData { } try { - callback.run(player); + callback.accept(player); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java index 0da72900..9a7ff2d2 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubCreator.java @@ -1,7 +1,7 @@ package net.ME1312.SubServers.Client.Common.Network.API; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -14,6 +14,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TreeMap; import java.util.UUID; +import java.util.function.IntConsumer; /** * Simplified SubCreator Data Class @@ -43,7 +44,7 @@ public class SubCreator { public ServerTemplate(ObjectMap raw) { this.raw = raw; - this.type = Util.getDespiteException(() -> ServerType.valueOf(raw.getRawString("type").toUpperCase().replace('-', '_').replace(' ', '_')), ServerType.CUSTOM); + this.type = Try.all.get(() -> ServerType.valueOf(raw.getRawString("type").toUpperCase().replace('-', '_').replace(' ', '_')), ServerType.CUSTOM); } /** @@ -132,12 +133,12 @@ public class SubCreator { * @param port Server Port Number (null to auto-select) * @param response Response Code */ - public void create(UUID player, String name, ServerTemplate template, Version version, Integer port, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + public void create(UUID player, String name, ServerTemplate template, Version version, Integer port, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); ((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCreateServer(player, name, host.getName(), template.getName(), version, port, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -155,7 +156,7 @@ public class SubCreator { * @param port Server Port Number (null to auto-select) * @param response Response Code */ - public void create(String name, ServerTemplate template, Version version, Integer port, Callback response) { + public void create(String name, ServerTemplate template, Version version, Integer port, IntConsumer response) { create(null, name, template, version, port, response); } @@ -193,12 +194,12 @@ public class SubCreator { * @param version Server Version (may be null) * @param response Response Code */ - public void update(UUID player, SubServer server, ServerTemplate template, Version version, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + public void update(UUID player, SubServer server, ServerTemplate template, Version version, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); ((SubDataClient) ClientAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketUpdateServer(player, server.getName(), template.getName(), version, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -227,7 +228,7 @@ public class SubCreator { * @param version Server Version (may be null) * @param response Response Code */ - public void update(SubServer server, ServerTemplate template, Version version, Callback response) { + public void update(SubServer server, ServerTemplate template, Version version, IntConsumer response) { update(null, server, template, version, response); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java index c2c37ec0..564f208e 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/API/SubServer.java @@ -1,7 +1,7 @@ package net.ME1312.SubServers.Client.Common.Network.API; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubServers.Client.Common.ClientAPI; @@ -12,6 +12,8 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.UUID; +import java.util.function.Consumer; +import java.util.function.IntConsumer; /** * Simplified SubServer Data Class @@ -87,12 +89,12 @@ public class SubServer extends Server { * @param player Player who Started * @param response Response Code */ - public void start(UUID player, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + public void start(UUID player, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); client().sendPacket(new PacketStartServer(player, getName(), data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -106,7 +108,7 @@ public class SubServer extends Server { * * @param response Response Code */ - public void start(Callback response) { + public void start(IntConsumer response) { start(null, response); } @@ -132,12 +134,12 @@ public class SubServer extends Server { * @param player Player who Stopped * @param response Response Code */ - public void stop(UUID player, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + public void stop(UUID player, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); client().sendPacket(new PacketStopServer(player, getName(), false, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -151,7 +153,7 @@ public class SubServer extends Server { * * @param response Response Code */ - public void stop(Callback response) { + public void stop(IntConsumer response) { stop(null, response); } @@ -177,12 +179,12 @@ public class SubServer extends Server { * @param player Player who Terminated * @param response Response Code */ - public void terminate(UUID player, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + public void terminate(UUID player, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); client().sendPacket(new PacketStopServer(player, getName(), true, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -196,7 +198,7 @@ public class SubServer extends Server { * * @param response Response Code */ - public void terminate(Callback response) { + public void terminate(IntConsumer response) { terminate(null, response); } @@ -223,12 +225,12 @@ public class SubServer extends Server { * @param command Commmand to Send * @param response Response Code */ - public void command(UUID player, String command, Callback response) { - if (Util.isNull(command, response)) throw new NullPointerException(); + public void command(UUID player, String command, IntConsumer response) { + Util.nullpo(command, response); StackTraceElement[] origin = new Exception().getStackTrace(); client().sendPacket(new PacketCommandServer(player, getName(), command, data -> { try { - response.run(data.getInt(0x0001)); + response.accept(data.getInt(0x0001)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -243,7 +245,7 @@ public class SubServer extends Server { * @param command Commmand to Send * @param response Response Code */ - public void command(String command, Callback response) { + public void command(String command, IntConsumer response) { command(null, command, response); } @@ -273,7 +275,7 @@ public class SubServer extends Server { * @param edit Edits * @param response Negative Response Code -or- Positive Success Status */ - public void edit(UUID player, ObjectMap edit, Callback response) { + public void edit(UUID player, ObjectMap edit, IntConsumer response) { edit(player, edit, false, response); } @@ -283,7 +285,7 @@ public class SubServer extends Server { * @param edit Edits * @param response Negative Response Code -or- Positive Success Status */ - public void edit(ObjectMap edit, Callback response) { + public void edit(ObjectMap edit, IntConsumer response) { edit(null, edit, response); } @@ -313,7 +315,7 @@ public class SubServer extends Server { * @param edit Edits * @param response Negative Response Code -or- Positive Success Status */ - public void permaEdit(UUID player, ObjectMap edit, Callback response) { + public void permaEdit(UUID player, ObjectMap edit, IntConsumer response) { edit(player, edit, true, response); } @@ -323,7 +325,7 @@ public class SubServer extends Server { * @param edit Edits * @param response Negative Response Code -or- Positive Success Status */ - public void permaEdit(ObjectMap edit, Callback response) { + public void permaEdit(ObjectMap edit, IntConsumer response) { permaEdit(null, edit, response); } @@ -346,15 +348,15 @@ public class SubServer extends Server { permaEdit(null, edit); } - private void edit(UUID player, ObjectMap edit, boolean perma, Callback response) { - if (Util.isNull(response)) throw new NullPointerException(); + private void edit(UUID player, ObjectMap edit, boolean perma, IntConsumer response) { + Util.nullpo(response); StackTraceElement[] origin = new Exception().getStackTrace(); client().sendPacket(new PacketEditServer(player, getName(), edit, perma, data -> { try { if (data.getInt(0x0001) != 0) { - response.run(data.getInt(0x0001) * -1); + response.accept(data.getInt(0x0001) * -1); } else { - response.run(data.getInt(0x0002)); + response.accept(data.getInt(0x0002)); } } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); @@ -397,12 +399,12 @@ public class SubServer extends Server { * * @param callback The Host */ - public void getHost(Callback callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public void getHost(Consumer callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); Runnable run = () -> { try { - callback.run(host); + callback.accept(host); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -462,13 +464,13 @@ public class SubServer extends Server { * @param value Value * @param response Success Status */ - public void setEnabled(boolean value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void setEnabled(boolean value, Consumer response) { + Util.nullpo(value, response); ObjectMap edit = new ObjectMap(); edit.set("enabled", value); edit(edit, r -> { if (r > 0) raw.set("enabled", value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -505,13 +507,13 @@ public class SubServer extends Server { * @param value Value * @param response Success Status */ - public void setLogging(boolean value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void setLogging(boolean value, Consumer response) { + Util.nullpo(value, response); ObjectMap edit = new ObjectMap(); edit.set("log", value); edit(edit, r -> { if (r > 0) raw.set("log", value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -557,13 +559,13 @@ public class SubServer extends Server { * @param value Value * @param response Success Status */ - public void setStopCommand(String value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void setStopCommand(String value, Consumer response) { + Util.nullpo(value, response); ObjectMap edit = new ObjectMap(); edit.set("stop-cmd", value); edit(edit, r -> { if (r > 0) raw.set("stop-cmd", value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -573,7 +575,7 @@ public class SubServer extends Server { * @return Stop Action */ public StopAction getStopAction() { - return Util.getDespiteException(() -> StopAction.valueOf(raw.getRawString("stop-action").toUpperCase().replace('-', '_').replace(' ', '_')), StopAction.NONE); + return Try.all.get(() -> StopAction.valueOf(raw.getRawString("stop-action").toUpperCase().replace('-', '_').replace(' ', '_')), StopAction.NONE); } /** @@ -591,13 +593,13 @@ public class SubServer extends Server { * @param action Stop Action * @param response Success Status */ - public void setStopAction(StopAction action, Callback response) { - if (Util.isNull(action, response)) throw new NullPointerException(); + public void setStopAction(StopAction action, Consumer response) { + Util.nullpo(action, response); ObjectMap edit = new ObjectMap(); edit.set("stop-action", action.toString()); edit(edit, r -> { if (r > 0) raw.set("stop-action", action.toString()); - response.run(r > 0); + response.accept(r > 0); }); } @@ -615,8 +617,8 @@ public class SubServer extends Server { * * @param server SubServer to toggle */ - public void toggleCompatibility(String server, Callback response) { - if (Util.isNull(server, response)) throw new NullPointerException(); + public void toggleCompatibility(String server, Consumer response) { + Util.nullpo(server, response); ArrayList value = new ArrayList(); value.addAll(getIncompatibilities()); if (!value.contains(server)) value.add(server); @@ -626,7 +628,7 @@ public class SubServer extends Server { edit.set("incompatible", value); edit(edit, r -> { if (r > 0) raw.set("incompatible", value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -658,12 +660,12 @@ public class SubServer extends Server { * * @param callback Incompatibility List */ - public void getIncompatibilities(Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public void getIncompatibilities(Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); Runnable run = () -> { try { - callback.run(incompatibilities); + callback.accept(incompatibilities); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -702,12 +704,12 @@ public class SubServer extends Server { * * @param callback Current Incompatibility List */ - public void getCurrentIncompatibilities(Callback> callback) { - if (Util.isNull(callback)) throw new NullPointerException(); + public void getCurrentIncompatibilities(Consumer> callback) { + Util.nullpo(callback); StackTraceElement[] origin = new Exception().getStackTrace(); Runnable run = () -> { try { - callback.run(currentIncompatibilities); + callback.accept(currentIncompatibilities); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -747,13 +749,13 @@ public class SubServer extends Server { * @param value Value (or null to reset) * @param response Success Status */ - public void setDisplayName(String value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void setDisplayName(String value, Consumer response) { + Util.nullpo(value, response); ObjectMap edit = new ObjectMap(); edit.set("display", (value == null)?"":value); edit(edit, r -> { if (r > 0) raw.set("display", (value == null)?getName():value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -772,8 +774,8 @@ public class SubServer extends Server { * @param value Group name * @param response Success Status */ - public void addGroup(String value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void addGroup(String value, Consumer response) { + Util.nullpo(value, response); ArrayList v = new ArrayList(); v.addAll(getGroups()); if (!v.contains(value)) v.add(value); @@ -782,7 +784,7 @@ public class SubServer extends Server { edit.set("group", v); edit(edit, r -> { if (r > 0) raw.set("group", v); - response.run(r > 0); + response.accept(r > 0); }); } @@ -801,8 +803,8 @@ public class SubServer extends Server { * @param value value Group name * @param response Success Status */ - public void removeGroup(String value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void removeGroup(String value, Consumer response) { + Util.nullpo(value, response); ArrayList v = new ArrayList(); v.addAll(getWhitelist()); v.remove(value); @@ -811,7 +813,7 @@ public class SubServer extends Server { edit.set("group", v); edit(edit, r -> { if (r > 0) raw.set("group", v); - response.run(r > 0); + response.accept(r > 0); }); } @@ -830,13 +832,13 @@ public class SubServer extends Server { * @param value Value * @param response Success Status */ - public void setHidden(boolean value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void setHidden(boolean value, Consumer response) { + Util.nullpo(value, response); ObjectMap edit = new ObjectMap(); edit.set("restricted", value); edit(edit, r -> { if (r > 0) raw.set("restricted", value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -855,13 +857,13 @@ public class SubServer extends Server { * @param value Value * @param response Success Status */ - public void setMotd(String value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void setMotd(String value, Consumer response) { + Util.nullpo(value, response); ObjectMap edit = new ObjectMap(); edit.set("motd", value); edit(edit, r -> { if (r > 0) raw.set("motd", value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -880,13 +882,13 @@ public class SubServer extends Server { * @param value Value * @param response Success Status */ - public void setRestricted(boolean value, Callback response) { - if (Util.isNull(value, response)) throw new NullPointerException(); + public void setRestricted(boolean value, Consumer response) { + Util.nullpo(value, response); ObjectMap edit = new ObjectMap(); edit.set("restricted", value); edit(edit, r -> { if (r > 0) raw.set("restricted", value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -905,8 +907,8 @@ public class SubServer extends Server { * @param player Player to add * @param response Success Status */ - public void whitelist(UUID player, Callback response) { - if (Util.isNull(player, response)) throw new NullPointerException(); + public void whitelist(UUID player, Consumer response) { + Util.nullpo(player, response); ArrayList value = new ArrayList(); value.addAll(getWhitelist()); if (!value.contains(player)) value.add(player); @@ -915,7 +917,7 @@ public class SubServer extends Server { edit.set("whitelist", value); edit(edit, r -> { if (r > 0) raw.set("whitelist", value); - response.run(r > 0); + response.accept(r > 0); }); } @@ -934,8 +936,8 @@ public class SubServer extends Server { * @param player Player to remove * @param response Success Status */ - public void unwhitelist(UUID player, Callback response) { - if (Util.isNull(player, response)) throw new NullPointerException(); + public void unwhitelist(UUID player, Consumer response) { + Util.nullpo(player, response); ArrayList value = new ArrayList(); value.addAll(getWhitelist()); value.remove(player); @@ -944,7 +946,7 @@ public class SubServer extends Server { edit.set("whitelist", value); edit(edit, r -> { if (r > 0) raw.set("whitelist", value); - response.run(r > 0); + response.accept(r > 0); }); } } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketAddServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketAddServer.java index b07be264..350a8c3f 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketAddServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketAddServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.net.InetAddress; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Add Server Packet */ public class PacketAddServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String name; private ObjectMap opt; @@ -40,8 +40,8 @@ public class PacketAddServer implements PacketObjectIn, PacketObjectOut * @param callback Callbacks */ @SafeVarargs - public PacketAddServer(UUID player, String name, InetAddress ip, int port, String motd, boolean hidden, boolean restricted, Callback>... callback) { - if (Util.isNull(name, ip, port, motd, hidden, restricted)) throw new NullPointerException(); + public PacketAddServer(UUID player, String name, InetAddress ip, int port, String motd, boolean hidden, boolean restricted, Consumer>... callback) { + Util.nullpo(name, ip, port, motd, hidden, restricted); this.player = player; this.name = name; this.subserver = false; @@ -75,8 +75,8 @@ public class PacketAddServer implements PacketObjectIn, PacketObjectOut * @param callback Callbacks */ @SafeVarargs - public PacketAddServer(UUID player, String name, boolean enabled, String host, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted, Callback>... callback) { - if (Util.isNull(host, name, enabled, port, motd, log, directory, executable, stopcmd, hidden, restricted)) throw new NullPointerException(); + public PacketAddServer(UUID player, String name, boolean enabled, String host, int port, String motd, boolean log, String directory, String executable, String stopcmd, boolean hidden, boolean restricted, Consumer>... callback) { + Util.nullpo(host, name, enabled, port, motd, log, directory, executable, stopcmd, hidden, restricted); this.player = player; this.name = name; this.subserver = true; @@ -112,7 +112,7 @@ public class PacketAddServer implements PacketObjectIn, PacketObjectOut @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCommandServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCommandServer.java index 844dad1c..2441399d 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCommandServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCommandServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Command Server Packet */ public class PacketCommandServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String server; private String command; @@ -34,8 +34,8 @@ public class PacketCommandServer implements PacketObjectIn, PacketObjec * @param callback Callbacks */ @SafeVarargs - public PacketCommandServer(UUID player, String server, String command, Callback>... callback) { - if (Util.isNull(server, command, callback)) throw new NullPointerException(); + public PacketCommandServer(UUID player, String server, String command, Consumer>... callback) { + Util.nullpo(server, command, callback); this.player = player; this.server = server; this.command = command; @@ -55,7 +55,7 @@ public class PacketCommandServer implements PacketObjectIn, PacketObjec @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCreateServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCreateServer.java index a0160e9f..ccee9fe1 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCreateServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketCreateServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Create Server Packet */ public class PacketCreateServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String name; private String host; @@ -42,7 +42,7 @@ public class PacketCreateServer implements PacketObjectIn, PacketObject * @param callback Callbacks */ @SafeVarargs - public PacketCreateServer(UUID player, String name, String host, String template, Version version, Integer port, Callback>... callback) { + public PacketCreateServer(UUID player, String name, String host, String template, Version version, Integer port, Consumer>... callback) { this(player, name, host, template, version, port, false, callback); } @@ -59,8 +59,8 @@ public class PacketCreateServer implements PacketObjectIn, PacketObject * @param callback Callbacks */ @SafeVarargs - public PacketCreateServer(UUID player, String name, String host, String template, Version version, Integer port, boolean waitfor, Callback>... callback) { - if (Util.isNull(name, host, template, callback)) throw new NullPointerException(); + public PacketCreateServer(UUID player, String name, String host, String template, Version version, Integer port, boolean waitfor, Consumer>... callback) { + Util.nullpo(name, host, template, callback); this.player = player; this.name = name; this.host = host; @@ -88,7 +88,7 @@ public class PacketCreateServer implements PacketObjectIn, PacketObject @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDeleteServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDeleteServer.java index 305fb542..76cf3ffe 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDeleteServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDeleteServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Delete Server Packet */ public class PacketDeleteServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String server; private boolean recycle; @@ -34,8 +34,8 @@ public class PacketDeleteServer implements PacketObjectIn, PacketObject * @param callback Callbacks */ @SafeVarargs - public PacketDeleteServer(UUID player, String server, boolean recycle, boolean force, Callback>... callback) { - if (Util.isNull(server, callback)) throw new NullPointerException(); + public PacketDeleteServer(UUID player, String server, boolean recycle, boolean force, Consumer>... callback) { + Util.nullpo(server, callback); this.player = player; this.server = server; this.recycle = recycle; @@ -57,7 +57,7 @@ public class PacketDeleteServer implements PacketObjectIn, PacketObject @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDisconnectPlayer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDisconnectPlayer.java index 7ff5d7dc..21bd2269 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDisconnectPlayer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDisconnectPlayer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Disconnect Player Packet */ public class PacketDisconnectPlayer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID[] players; private String reason; private UUID id; @@ -32,8 +32,8 @@ public class PacketDisconnectPlayer implements PacketObjectIn, PacketOb * @param callback Callbacks */ @SafeVarargs - public PacketDisconnectPlayer(UUID[] players, String reason, Callback>... callback) { - if (Util.isNull(players, callback)) throw new NullPointerException(); + public PacketDisconnectPlayer(UUID[] players, String reason, Consumer>... callback) { + Util.nullpo(players, callback); this.players = players; this.reason = reason; this.id = Util.getNew(callbacks.keySet(), UUID::randomUUID); @@ -51,7 +51,7 @@ public class PacketDisconnectPlayer implements PacketObjectIn, PacketOb @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadGroupInfo.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadGroupInfo.java index 48f8426c..436f33a8 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadGroupInfo.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadGroupInfo.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -11,12 +10,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.function.Consumer; /** * Download Group Info Packet */ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private List groups; private UUID tracker; @@ -32,8 +32,8 @@ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketO * @param callback Callbacks */ @SafeVarargs - public PacketDownloadGroupInfo(List groups, Callback>... callback) { - if (Util.isNull((Object) callback)) throw new NullPointerException(); + public PacketDownloadGroupInfo(List groups, Consumer>... callback) { + Util.nullpo((Object) callback); this.groups = groups; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); callbacks.put(tracker, callback); @@ -50,12 +50,12 @@ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketO @SuppressWarnings("unchecked") @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) { + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) { ObjectMap map = new ObjectMap((Map) data.getObject(0x0001)); ObjectMap ungrouped = (data.contains(0x0002))?new ObjectMap((Map) data.getObject(0x0002)):null; if (ungrouped != null) map.set("", ungrouped); - callback.run(map); + callback.accept(map); } callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadHostInfo.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadHostInfo.java index fd6e3c83..ad313370 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadHostInfo.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadHostInfo.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -11,12 +10,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.function.Consumer; /** * Download Host Info Packet */ public class PacketDownloadHostInfo implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private List hosts; private UUID tracker; @@ -32,8 +32,8 @@ public class PacketDownloadHostInfo implements PacketObjectIn, PacketOb * @param callback Callbacks */ @SafeVarargs - public PacketDownloadHostInfo(List hosts, Callback>... callback) { - if (Util.isNull((Object) callback)) throw new NullPointerException(); + public PacketDownloadHostInfo(List hosts, Consumer>... callback) { + Util.nullpo((Object) callback); this.hosts = hosts; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); callbacks.put(tracker, callback); @@ -50,7 +50,7 @@ public class PacketDownloadHostInfo implements PacketObjectIn, PacketOb @SuppressWarnings("unchecked") @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(new ObjectMap((Map) data.getObject(0x0001))); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlatformInfo.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlatformInfo.java index 438498ff..916787f4 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlatformInfo.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlatformInfo.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import java.util.function.Consumer; /** * Download Proxy Info Packet */ public class PacketDownloadPlatformInfo implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID tracker; /** * New PacketDownloadPlatformInfo @@ -23,8 +23,8 @@ public class PacketDownloadPlatformInfo implements PacketObjectIn, Pack * @param callback Callbacks */ @SafeVarargs - public PacketDownloadPlatformInfo(Callback>... callback) { - if (Util.isNull((Object) callback)) throw new NullPointerException(); + public PacketDownloadPlatformInfo(Consumer>... callback) { + Util.nullpo((Object) callback); this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); callbacks.put(tracker, callback); } @@ -39,7 +39,7 @@ public class PacketDownloadPlatformInfo implements PacketObjectIn, Pack @SuppressWarnings("unchecked") @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(new ObjectMap((Map) data.getObject(0x0001))); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlayerInfo.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlayerInfo.java index f2018ceb..015ac910 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlayerInfo.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadPlayerInfo.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -8,12 +7,13 @@ import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; import java.util.*; +import java.util.function.Consumer; /** * Download Player Info Packet */ public class PacketDownloadPlayerInfo implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private Collection names; private Collection ids; private UUID tracker; @@ -30,8 +30,8 @@ public class PacketDownloadPlayerInfo implements PacketObjectIn, Packet * @param callback Callbacks */ @SafeVarargs - public PacketDownloadPlayerInfo(Collection players, Callback>... callback) { - if (Util.isNull((Object) callback)) throw new NullPointerException(); + public PacketDownloadPlayerInfo(Collection players, Consumer>... callback) { + Util.nullpo((Object) callback); this.names = players; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); callbacks.put(tracker, callback); @@ -44,8 +44,8 @@ public class PacketDownloadPlayerInfo implements PacketObjectIn, Packet * @param callback Callbacks */ @SafeVarargs - public PacketDownloadPlayerInfo(List players, Callback>... callback) { - if (Util.isNull((Object) callback)) throw new NullPointerException(); + public PacketDownloadPlayerInfo(List players, Consumer>... callback) { + Util.nullpo((Object) callback); this.ids = players; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); callbacks.put(tracker, callback); @@ -63,7 +63,7 @@ public class PacketDownloadPlayerInfo implements PacketObjectIn, Packet @SuppressWarnings("unchecked") @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(new ObjectMap((Map) data.getObject(0x0001))); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadProxyInfo.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadProxyInfo.java index 391e303b..7a57022e 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadProxyInfo.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadProxyInfo.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -11,12 +10,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.function.Consumer; /** * Download Proxy Info Packet */ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private List proxies; private UUID tracker; @@ -32,8 +32,8 @@ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketO * @param callback Callbacks */ @SafeVarargs - public PacketDownloadProxyInfo(List proxies, Callback>... callback) { - if (Util.isNull((Object) callback)) throw new NullPointerException(); + public PacketDownloadProxyInfo(List proxies, Consumer>... callback) { + Util.nullpo((Object) callback); this.proxies = proxies; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); callbacks.put(tracker, callback); @@ -50,12 +50,12 @@ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketO @SuppressWarnings("unchecked") @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) { + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) { ObjectMap map = new ObjectMap((Map) data.getObject(0x0001)); ObjectMap master = (data.contains(0x0002))?new ObjectMap((Map) data.getObject(0x0002)):null; if (master != null) map.set(master.getString("name"), master); - callback.run(map); + callback.accept(map); } callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadServerInfo.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadServerInfo.java index de020bff..2387ea18 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadServerInfo.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketDownloadServerInfo.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -11,12 +10,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.function.Consumer; /** * Download Server Info Packet */ public class PacketDownloadServerInfo implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private List servers; private UUID tracker; @@ -32,8 +32,8 @@ public class PacketDownloadServerInfo implements PacketObjectIn, Packet * @param callback Callbacks */ @SafeVarargs - public PacketDownloadServerInfo(List servers, Callback>... callback) { - if (Util.isNull((Object) callback)) throw new NullPointerException(); + public PacketDownloadServerInfo(List servers, Consumer>... callback) { + Util.nullpo((Object) callback); this.servers = servers; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); callbacks.put(tracker, callback); @@ -50,7 +50,7 @@ public class PacketDownloadServerInfo implements PacketObjectIn, Packet @SuppressWarnings("unchecked") @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(new ObjectMap((Map) data.getObject(0x0001))); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketEditServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketEditServer.java index 06128ab6..fa8f988b 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketEditServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketEditServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Edit Server Packet */ public class PacketEditServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String server; private ObjectMap edit; @@ -36,8 +36,8 @@ public class PacketEditServer implements PacketObjectIn, PacketObjectOu * @param callback Callbacks */ @SafeVarargs - public PacketEditServer(UUID player, String server, ObjectMap edit, boolean perma, Callback>... callback) { - if (Util.isNull(server, callback)) throw new NullPointerException(); + public PacketEditServer(UUID player, String server, ObjectMap edit, boolean perma, Consumer>... callback) { + Util.nullpo(server, callback); this.player = player; this.server = server; this.edit = edit; @@ -59,7 +59,7 @@ public class PacketEditServer implements PacketObjectIn, PacketObjectOu @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketMessagePlayer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketMessagePlayer.java index 1ededdc9..e53a68fb 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketMessagePlayer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketMessagePlayer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Message Player Packet */ public class PacketMessagePlayer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID[] players; private String[] legacy, raw; private UUID id; @@ -33,7 +33,7 @@ public class PacketMessagePlayer implements PacketObjectIn, PacketObjec * @param callback Callbacks */ @SafeVarargs - public PacketMessagePlayer(UUID[] players, String[] legacy, String[] raw, Callback>... callback) { + public PacketMessagePlayer(UUID[] players, String[] legacy, String[] raw, Consumer>... callback) { this.players = players; this.legacy = legacy; this.raw = raw; @@ -53,7 +53,7 @@ public class PacketMessagePlayer implements PacketObjectIn, PacketObjec @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketRemoveServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketRemoveServer.java index 8543ce99..b606862a 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketRemoveServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketRemoveServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Remove Server Packet */ public class PacketRemoveServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String server; private boolean force; @@ -33,8 +33,8 @@ public class PacketRemoveServer implements PacketObjectIn, PacketObject * @param callback Callbacks */ @SafeVarargs - public PacketRemoveServer(UUID player, String server, boolean force, Callback>... callback) { - if (Util.isNull(server, callback)) throw new NullPointerException(); + public PacketRemoveServer(UUID player, String server, boolean force, Consumer>... callback) { + Util.nullpo(server, callback); this.player = player; this.server = server; this.force = force; @@ -54,7 +54,7 @@ public class PacketRemoveServer implements PacketObjectIn, PacketObject @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketRestartServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketRestartServer.java index 93a1b58d..dd348301 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketRestartServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketRestartServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Restart Server Packet */ public class PacketRestartServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String server; private UUID tracker; @@ -32,8 +32,8 @@ public class PacketRestartServer implements PacketObjectIn, PacketObjec * @param callback Callbacks */ @SafeVarargs - public PacketRestartServer(UUID player, String server, Callback>... callback) { - if (Util.isNull(server, callback)) throw new NullPointerException(); + public PacketRestartServer(UUID player, String server, Consumer>... callback) { + Util.nullpo(server, callback); this.player = player; this.server = server; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); @@ -51,7 +51,7 @@ public class PacketRestartServer implements PacketObjectIn, PacketObjec @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStartServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStartServer.java index 788f5ff0..87ed2f15 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStartServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStartServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Start Server Packet */ public class PacketStartServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String server; private UUID tracker; @@ -32,8 +32,8 @@ public class PacketStartServer implements PacketObjectIn, PacketObjectO * @param callback Callbacks */ @SafeVarargs - public PacketStartServer(UUID player, String server, Callback>... callback) { - if (Util.isNull(server, callback)) throw new NullPointerException(); + public PacketStartServer(UUID player, String server, Consumer>... callback) { + Util.nullpo(server, callback); this.player = player; this.server = server; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); @@ -51,7 +51,7 @@ public class PacketStartServer implements PacketObjectIn, PacketObjectO @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStopServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStopServer.java index 372dbd72..fce224a9 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStopServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketStopServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Stop Server Packet */ public class PacketStopServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private boolean force; private String server; @@ -34,8 +34,8 @@ public class PacketStopServer implements PacketObjectIn, PacketObjectOu * @param callback Callbacks */ @SafeVarargs - public PacketStopServer(UUID player, String server, boolean force, Callback>... callback) { - if (Util.isNull(server, force, callback)) throw new NullPointerException(); + public PacketStopServer(UUID player, String server, boolean force, Consumer>... callback) { + Util.nullpo(server, force, callback); this.player = player; this.server = server; this.force = force; @@ -55,7 +55,7 @@ public class PacketStopServer implements PacketObjectIn, PacketObjectOu @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketTransferPlayer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketTransferPlayer.java index e3fd7dda..c8929f71 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketTransferPlayer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketTransferPlayer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -9,12 +8,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Transfer Player Packet */ public class PacketTransferPlayer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID[] players; private String server; private UUID id; @@ -32,8 +32,8 @@ public class PacketTransferPlayer implements PacketObjectIn, PacketObje * @param callback Callbacks */ @SafeVarargs - public PacketTransferPlayer(UUID[] players, String server, Callback>... callback) { - if (Util.isNull(players, server)) throw new NullPointerException(); + public PacketTransferPlayer(UUID[] players, String server, Consumer>... callback) { + Util.nullpo(players, server); this.players = players; this.server = server; this.id = Util.getNew(callbacks.keySet(), UUID::randomUUID); @@ -51,7 +51,7 @@ public class PacketTransferPlayer implements PacketObjectIn, PacketObje @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketUpdateServer.java b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketUpdateServer.java index d6b63667..3777f96c 100644 --- a/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketUpdateServer.java +++ b/SubServers.Client/Common/src/net/ME1312/SubServers/Client/Common/Network/Packet/PacketUpdateServer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Common.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Create Server Packet */ public class PacketUpdateServer implements PacketObjectIn, PacketObjectOut { - private static HashMap>[]> callbacks = new HashMap>[]>(); + private static HashMap>[]> callbacks = new HashMap>[]>(); private UUID player; private String name; private String template; @@ -38,7 +38,7 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject * @param callback Callbacks */ @SafeVarargs - public PacketUpdateServer(UUID player, String name, String template, Version version, Callback>... callback) { + public PacketUpdateServer(UUID player, String name, String template, Version version, Consumer>... callback) { this(player, name, template, version, false, callback); } @@ -53,8 +53,8 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject * @param callback Callbacks */ @SafeVarargs - public PacketUpdateServer(UUID player, String name, String template, Version version, boolean waitfor, Callback>... callback) { - if (Util.isNull(name, callback)) throw new NullPointerException(); + public PacketUpdateServer(UUID player, String name, String template, Version version, boolean waitfor, Consumer>... callback) { + Util.nullpo(name, callback); this.player = player; this.name = name; this.template = template; @@ -78,7 +78,7 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject @Override public void receive(SubDataSender client, ObjectMap data) { - for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data); + for (Consumer> callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java index c0a1df9f..b4db1bce 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddHostEvent.java @@ -22,7 +22,7 @@ public class SubAddHostEvent extends AbstractEvent implements SubEvent { * @param host Host to be added */ public SubAddHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddProxyEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddProxyEvent.java index 418671bc..e030a0b4 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddProxyEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddProxyEvent.java @@ -18,7 +18,7 @@ public class SubAddProxyEvent extends AbstractEvent implements SubEvent { * @param proxy Host Being Added */ public SubAddProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java index 17ee4288..b0992ac3 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubAddServerEvent.java @@ -23,7 +23,7 @@ public class SubAddServerEvent extends AbstractEvent implements SubEvent { * @param server Server Starting */ public SubAddServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java index 3e29edb6..7b4f9eab 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; @@ -12,6 +11,7 @@ import org.spongepowered.api.event.impl.AbstractEvent; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Create Event @@ -36,7 +36,7 @@ public class SubCreateEvent extends AbstractEvent implements SubEvent { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.update = update; this.host = host; @@ -69,10 +69,10 @@ public class SubCreateEvent extends AbstractEvent implements SubEvent { * * @param callback Updating Server */ - public void getUpdatingServer(Callback callback) { + public void getUpdatingServer(Consumer callback) { if (!update) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java index 61ac4bbf..6e358ddf 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Sponge.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; @@ -12,6 +11,7 @@ import org.spongepowered.api.event.impl.AbstractEvent; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Created Event @@ -37,7 +37,7 @@ public class SubCreatedEvent extends AbstractEvent implements SubEvent { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.success = success; this.update = update; @@ -80,10 +80,10 @@ public class SubCreatedEvent extends AbstractEvent implements SubEvent { * * @param callback Updating Server */ - public void getServer(Callback callback) { + public void getServer(Consumer callback) { if (!update && !success) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java index ffba1ba7..97d7a35e 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubEditServerEvent.java @@ -28,7 +28,7 @@ public class SubEditServerEvent extends AbstractEvent implements SubEvent { * @param edit Edit to make */ public SubEditServerEvent(UUID player, String server, Pair edit) { - if (Util.isNull(server, edit)) throw new NullPointerException(); + Util.nullpo(server, edit); ObjectMap section = new ObjectMap(); section.set(".", edit.value()); this.player = player; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java index 65df55ef..d1be789b 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkConnectEvent.java @@ -17,7 +17,7 @@ public class SubNetworkConnectEvent extends AbstractEvent implements SubEvent { * SubData Network Connect Event */ public SubNetworkConnectEvent(DataClient network) { - if (Util.isNull(network)) throw new NullPointerException(); + Util.nullpo(network); this.network = network; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java index 33d24985..ac2f49cc 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubNetworkDisconnectEvent.java @@ -19,7 +19,7 @@ public class SubNetworkDisconnectEvent extends AbstractEvent implements SubEvent * SubData Network Disconnect Event */ public SubNetworkDisconnectEvent(DataClient network, DisconnectReason reason) { - if (Util.isNull(network, reason)) throw new NullPointerException(); + Util.nullpo(network, reason); this.network = network; this.reason = reason; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java index 30206cee..005d8d22 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveHostEvent.java @@ -22,7 +22,7 @@ public class SubRemoveHostEvent extends AbstractEvent implements SubEvent { * @param host Server Starting */ public SubRemoveHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveProxyEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveProxyEvent.java index 182f5174..af091cfd 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveProxyEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveProxyEvent.java @@ -18,7 +18,7 @@ public class SubRemoveProxyEvent extends AbstractEvent implements SubEvent { * @param proxy Host Being Added */ public SubRemoveProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java index 399fe85c..47f8c3bb 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubRemoveServerEvent.java @@ -23,7 +23,7 @@ public class SubRemoveServerEvent extends AbstractEvent implements SubEvent { * @param server Server Starting */ public SubRemoveServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java index 55c79832..1b683f88 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubSendCommandEvent.java @@ -23,7 +23,7 @@ public class SubSendCommandEvent extends AbstractEvent implements SubEvent { * @param server Server being Commanded */ public SubSendCommandEvent(UUID player, String server, String command) { - if (Util.isNull(server, command)) throw new NullPointerException(); + Util.nullpo(server, command); this.player = player; this.server = server; this.command = command; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java index 58be0a9b..30ec9598 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartEvent.java @@ -23,7 +23,7 @@ public class SubStartEvent extends AbstractEvent implements SubEvent { * @param server Server Starting */ public SubStartEvent(UUID player, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.server = server; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartedEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartedEvent.java index 38963118..ddca99aa 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartedEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStartedEvent.java @@ -19,7 +19,7 @@ public class SubStartedEvent extends AbstractEvent implements SubEvent { * @param server Server that Started */ public SubStartedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java index 11db4982..17729e06 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStopEvent.java @@ -24,7 +24,7 @@ public class SubStopEvent extends AbstractEvent implements SubEvent { * @param force If it was a Forced Shutdown */ public SubStopEvent(UUID player, String server, boolean force) { - if (Util.isNull(server, force)) throw new NullPointerException(); + Util.nullpo(server, force); this.player = player; this.server = server; this.force = force; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java index af450810..0acaf285 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubStoppedEvent.java @@ -18,7 +18,7 @@ public class SubStoppedEvent extends AbstractEvent implements SubEvent { * @param server Server that Stopped */ public SubStoppedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Graphic/UIRenderer.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Graphic/UIRenderer.java index 7f7210f4..ab11845e 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Graphic/UIRenderer.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Graphic/UIRenderer.java @@ -38,7 +38,7 @@ public abstract class UIRenderer { * @param player Player */ public UIRenderer(SubPlugin plugin, UUID player) { - if (Util.isNull(plugin, player)) throw new NullPointerException(); + Util.nullpo(plugin, player); this.plugin = plugin; this.player = player; } @@ -101,7 +101,7 @@ public abstract class UIRenderer { * @return Success Status */ public boolean sendTitle(String str, int fadein, int stay, int fadeout) { - if (Util.isNull(str, fadein, stay, fadeout)) throw new NullPointerException(); + Util.nullpo(str, fadein, stay, fadeout); if (plugin.config.get().getMap("Settings").getBoolean("Use-Title-Messages", true)) { String line1, line2; if (!str.startsWith("\n") && str.contains("\n")) { @@ -205,19 +205,20 @@ public abstract class UIRenderer { // minecraft:name if (item.value().toLowerCase().startsWith("minecraft:")) { item.value(item.value().substring(10)); - } else + } else { // bukkit:name (ignored on sponge) if (item.value().toLowerCase().startsWith("bukkit:")) { item.value(item.value().substring(7)); } - - // material name - if (!Util.isException(() -> ItemTypes.class.getDeclaredField(item.value().toUpperCase()).get(null))) { - return ItemStack.builder().itemType((ItemType) Util.getDespiteException(() -> ItemTypes.class.getDeclaredField(item.value().toUpperCase()).get(null), null)).quantity(1).build(); } - return def; + // material name + try { + return ItemStack.builder().itemType((ItemType) ItemTypes.class.getDeclaredField(item.value().toUpperCase()).get(null)).quantity(1).build(); + } catch (NoSuchFieldException | NoSuchFieldError | IllegalAccessException | IllegalAccessError e) { + return def; + } } /** @@ -227,7 +228,7 @@ public abstract class UIRenderer { * @param renderer Renderer */ public static void addHostPlugin(String handle, PluginRenderer renderer) { - if (Util.isNull(handle, renderer)) throw new NullPointerException(); + Util.nullpo(handle, renderer); hostPlugins.put(handle, renderer); } @@ -246,7 +247,7 @@ public abstract class UIRenderer { * @param handle Handle */ public static void removeHostPlugin(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); hostPlugins.remove(handle); } @@ -257,7 +258,7 @@ public abstract class UIRenderer { * @param renderer Renderer */ public static void addSubServerPlugin(String handle, PluginRenderer renderer) { - if (Util.isNull(handle, renderer)) throw new NullPointerException(); + Util.nullpo(handle, renderer); subserverPlugins.put(handle, renderer); } @@ -276,7 +277,7 @@ public abstract class UIRenderer { * @param handle Handle */ public static void removeSubServerPlugin(String handle) { - if (Util.isNull(handle)) throw new NullPointerException(); + Util.nullpo(handle); subserverPlugins.remove(handle); } @@ -415,7 +416,7 @@ public abstract class UIRenderer { * @param value Value */ public void setName(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); final String name = this.name; history.add(() -> this.name = name); this.name = value; @@ -436,7 +437,7 @@ public abstract class UIRenderer { * @param value Value */ public void setTemplate(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); final String template = this.template; history.add(() -> this.template = template); this.template = value; @@ -457,7 +458,7 @@ public abstract class UIRenderer { * @param value Value */ public void setVersion(Version value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); final Version version = this.version; history.add(() -> this.version = version); this.version = value; @@ -478,7 +479,7 @@ public abstract class UIRenderer { * @param value Value (null for auto-select) */ public void setPort(Integer value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); final int port = this.port; history.add(() -> this.port = port); this.port = value; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/ObjectPermission.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/ObjectPermission.java index e636da7b..9762182d 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/ObjectPermission.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Library/ObjectPermission.java @@ -49,7 +49,7 @@ public class ObjectPermission { * @return Permission Check Result */ public static boolean permits(String string, Subject object, String... permissions) { - if (Util.isNull(object)) throw new NullPointerException(); + Util.nullpo(object); boolean permitted = false; for (int p = 0; !permitted && p < permissions.length; ++p) { @@ -73,7 +73,7 @@ public class ObjectPermission { * @return Permission Check Result */ public static boolean permits(Server server, Subject object, String... permissions) { - if (Util.isNull(object)) throw new NullPointerException(); + Util.nullpo(object); boolean permitted = false; for (int p = 0; !permitted && p < permissions.length; ++p) { diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermission.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermission.java index e95233ef..41c975b3 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermission.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermission.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.Forwardable; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Check Permission Packet */ public class PacketCheckPermission implements Forwardable, PacketObjectIn, PacketObjectOut { - static HashMap[]> callbacks = new HashMap[]>(); + static HashMap[]> callbacks = new HashMap[]>(); private UUID player; private String permission; private UUID tracker; @@ -33,7 +33,7 @@ public class PacketCheckPermission implements Forwardable, PacketObjectIn... callback) { + public PacketCheckPermission(UUID player, String permission, Consumer... callback) { this.player = player; this.permission = permission; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermissionResponse.java index facb76db..dc199ef6 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketCheckPermissionResponse.java @@ -1,8 +1,7 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.SubData.Client.Protocol.Forwardable; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; @@ -11,6 +10,7 @@ import net.ME1312.SubData.Client.SubDataSender; import org.spongepowered.api.Sponge; import java.util.UUID; +import java.util.function.Consumer; import static net.ME1312.SubServers.Client.Sponge.Network.Packet.PacketCheckPermission.callbacks; @@ -35,7 +35,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI * @param tracker Receiver ID */ public PacketCheckPermissionResponse(UUID player, String permission, UUID tracker) { - this.result = Util.getDespiteException(() -> Sponge.getServer().getPlayer(player).get().hasPermission(permission), false); + this.result = Try.all.get(() -> Sponge.getServer().getPlayer(player).get().hasPermission(permission), false); this.tracker = tracker; } @@ -49,7 +49,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI @Override public void receive(SubDataSender client, ObjectMap data) throws Throwable { - for (Callback callback : callbacks.get(data.getUUID(0x0000))) callback.run(data.getBoolean(0x0001)); + for (Consumer callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data.getBoolean(0x0001)); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java index 80f69980..65b97b83 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketDownloadLang.java @@ -2,6 +2,7 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketOut; @@ -24,7 +25,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut { * @param plugin SubServers.Client */ public PacketDownloadLang(SubPlugin plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } @@ -35,7 +36,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut { @Override public void receive(SubDataSender client, ObjectMap data) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection())); try { Util.reflect(SubPlugin.class.getDeclaredField("lang"), plugin, new ContainedPair<>(Calendar.getInstance().getTime().getTime(), data.getObject(0x0001))); log.info("Lang Settings Downloaded"); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReload.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReload.java index e018de53..87aaeb48 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReload.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReload.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataClient; @@ -28,7 +29,7 @@ public class PacketInExReload implements PacketObjectIn { @Override public void receive(SubDataSender client, ObjectMap data) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection())); if (data != null && data.contains(0x0000)) log.warning("Received request for a plugin reload: " + data.getString(0x0000)); // else log.warning("Received request for a plugin reload"); Sponge.getScheduler().createTaskBuilder().async().execute(() -> { diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReset.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReset.java index ffa887b1..aaa59c09 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReset.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExReset.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataClient; @@ -17,7 +18,7 @@ public class PacketInExReset implements PacketObjectIn { @Override public void receive(SubDataSender client, ObjectMap data) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection())); if (data != null && data.contains(0x0000)) log.warning("Received shutdown signal: " + data.getString(0x0000)); else log.warning("Received shutdown signal"); Sponge.getServer().shutdown(); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java index 2769b653..15939bdf 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Version.Version; @@ -15,113 +14,114 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; /** * Run Event Packet */ public class PacketInExRunEvent implements PacketObjectIn { - private static HashMap>>> callbacks = new HashMap>>>(); + private static HashMap>>> callbacks = new HashMap>>>(); /** * New PacketInRunEvent */ public PacketInExRunEvent(SubPlugin plugin) { - callback("SubAddHostEvent", new Callback>() { + callback("SubAddHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubAddHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"))); callback("SubAddHostEvent", this); } }); - callback("SubAddProxyEvent", new Callback>() { + callback("SubAddProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubAddProxyEvent(data.getString("proxy"))); callback("SubAddProxyEvent", this); } }); - callback("SubAddServerEvent", new Callback>() { + callback("SubAddServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubAddServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getString("server"))); callback("SubAddServerEvent", this); } }); - callback("SubCreateEvent", new Callback>() { + callback("SubCreateEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubCreateEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"), data.getString("name"), data.getString("template"), new Version(data.getString("version")), data.getInt("port"), data.getBoolean("update"))); callback("SubCreateEvent", this); } }); - callback("SubCreatedEvent", new Callback>() { + callback("SubCreatedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubCreatedEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"), data.getString("name"), data.getString("template"), new Version(data.getString("version")), data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); callback("SubCreatedEvent", this); } }); - callback("SubSendCommandEvent", new Callback>() { + callback("SubSendCommandEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubSendCommandEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("server"), data.getString("command"))); callback("SubSendCommandEvent", this); } }); - callback("SubEditServerEvent", new Callback>() { + callback("SubEditServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubEditServerEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("server"), new ContainedPair(data.getString("edit"), data.get("value")))); callback("SubEditServerEvent", this); } }); - callback("SubStartEvent", new Callback>() { + callback("SubStartEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubStartEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("server"))); callback("SubStartEvent", this); } }); - callback("SubStartedEvent", new Callback>() { + callback("SubStartedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubStartedEvent(data.getString("server"))); callback("SubStartedEvent", this); } }); - callback("SubStopEvent", new Callback>() { + callback("SubStopEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubStopEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("server"), data.getBoolean("force"))); callback("SubStopEvent", this); } }); - callback("SubStoppedEvent", new Callback>() { + callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubStoppedEvent(data.getString("server"))); callback("SubStoppedEvent", this); } }); - callback("SubRemoveServerEvent", new Callback>() { + callback("SubRemoveServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubRemoveServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getString("server"))); callback("SubRemoveServerEvent", this); } }); - callback("SubRemoveProxyEvent", new Callback>() { + callback("SubRemoveProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubRemoveProxyEvent(data.getString("proxy"))); callback("SubRemoveProxyEvent", this); } }); - callback("SubRemoveHostEvent", new Callback>() { + callback("SubRemoveHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubRemoveHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"))); callback("SubRemoveHostEvent", this); } @@ -132,10 +132,10 @@ public class PacketInExRunEvent implements PacketObjectIn { @Override public void receive(SubDataSender client, ObjectMap data) { if (callbacks.keySet().contains(data.getString(0x0000))) { - List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); + List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); PacketInExRunEvent.callbacks.remove(data.getString(0x0000)); - for (Callback> callback : callbacks) { - callback.run(new ObjectMap<>((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks) { + callback.accept(new ObjectMap<>((Map) data.getObject(0x0001))); } } } @@ -145,8 +145,8 @@ public class PacketInExRunEvent implements PacketObjectIn { return 0x0001; } - public static void callback(String event, Callback> callback) { - List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); + public static void callback(String event, Consumer> callback) { + List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); callbacks.add(callback); PacketInExRunEvent.callbacks.put(event, callbacks); } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java index ae2a86c8..ad766ceb 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Client.Sponge.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.Initial.InitialPacket; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -25,7 +26,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, * @param plugin SubServers.Client */ public PacketLinkServer(SubPlugin plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } /** @@ -35,7 +36,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, * @param channel Channel ID */ public PacketLinkServer(SubPlugin plugin, int channel) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.channel = channel; } @@ -60,7 +61,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn, @Override public void receive(SubDataSender client, ObjectMap data) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client)); if (data.getInt(0x0001) == 0) { try { if (data.contains(0x0000)) Util.reflect(SubAPI.class.getDeclaredField("name"), plugin.api, data.getRawString(0x0000)); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java index dbbdbcc8..8862258d 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/SubProtocol.java @@ -1,11 +1,10 @@ package net.ME1312.SubServers.Client.Sponge.Network; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; -import net.ME1312.SubData.Client.Library.DataSize; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubData.Client.SubDataProtocol; import net.ME1312.SubServers.Client.Common.Network.Packet.*; @@ -22,6 +21,7 @@ import java.io.File; import java.io.IOException; import java.net.InetAddress; import java.util.HashMap; +import java.util.function.Consumer; import java.util.logging.Handler; import java.util.logging.LogRecord; import java.util.logging.Logger; @@ -155,9 +155,9 @@ public class SubProtocol extends SubDataProtocol { } @Override - protected SubDataClient sub(Callback scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { + protected SubDataClient sub(Consumer scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { SubPlugin plugin = SubAPI.getInstance().getInternals(); - HashMap map = Util.getDespiteException(() -> Util.reflect(SubPlugin.class.getDeclaredField("subdata"), plugin), null); + HashMap map = Try.all.get(() -> Util.reflect(SubPlugin.class.getDeclaredField("subdata"), plugin)); int channel = 1; while (map.keySet().contains(channel)) channel++; @@ -173,9 +173,9 @@ public class SubProtocol extends SubDataProtocol { @SuppressWarnings("deprecation") @Override - public SubDataClient open(Callback scheduler, Logger logger, InetAddress address, int port) throws IOException { + public SubDataClient open(Consumer scheduler, Logger logger, InetAddress address, int port) throws IOException { SubPlugin plugin = SubAPI.getInstance().getInternals(); - HashMap map = Util.getDespiteException(() -> Util.reflect(SubPlugin.class.getDeclaredField("subdata"), plugin), null); + HashMap map = Try.all.get(() -> Util.reflect(SubPlugin.class.getDeclaredField("subdata"), plugin)); SubDataClient subdata = super.open(scheduler, logger, address, port); subdata.sendPacket(new PacketLinkServer(plugin, 0)); @@ -185,8 +185,8 @@ public class SubProtocol extends SubDataProtocol { SubNetworkDisconnectEvent event = new SubNetworkDisconnectEvent(client.value(), client.key()); Sponge.getEventManager().post(event); - if (Util.getDespiteException(() -> Util.reflect(SubPlugin.class.getDeclaredField("running"), plugin), true)) { - Util.isException(() -> Util.reflect(SubPlugin.class.getDeclaredMethod("connect", Pair.class), plugin, client)); + if (Try.all.get(() -> Util.reflect(SubPlugin.class.getDeclaredField("running"), plugin), true)) { + Try.all.run(() -> Util.reflect(SubPlugin.class.getDeclaredMethod("connect", Pair.class), plugin, client)); } else map.put(0, null); }); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java index b7c6ad3e..51d5a5c2 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubAPI.java @@ -1,10 +1,10 @@ package net.ME1312.SubServers.Client.Sponge; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataProtocol; -import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.ClientAPI; import net.ME1312.SubServers.Client.Sponge.Graphic.UIHandler; import net.ME1312.SubServers.Client.Sponge.Library.AccessMode; @@ -108,7 +108,7 @@ public final class SubAPI extends ClientAPI { * @return Lang Value */ public Map getLang(String channel) { - if (Util.isNull(channel)) throw new NullPointerException(); + Util.nullpo(channel); return new LinkedHashMap<>(plugin.lang.value().get(channel.toLowerCase())); } @@ -175,9 +175,8 @@ public final class SubAPI extends ClientAPI { * @return Server Version */ public Version getServerVersion() { - PluginContainer container = null; - if (container == null) container = Util.getDespiteException(() -> (PluginContainer) Platform.class.getMethod("getValue", Class.forName("org.spongepowered.api.Platform$Component")).invoke(Sponge.getPlatform(), Enum.valueOf((Class) Class.forName("org.spongepowered.api.Platform$Component"), "IMPLEMENTATION")), null); - if (container == null) container = Util.getDespiteException(() -> (PluginContainer) Platform.class.getMethod("getImplementation").invoke(Sponge.getPlatform()), null); + PluginContainer container = Try.all.get(() -> (PluginContainer) Platform.class.getMethod("getValue", Class.forName("org.spongepowered.api.Platform$Component")).invoke(Sponge.getPlatform(), Enum.valueOf((Class) Class.forName("org.spongepowered.api.Platform$Component"), "IMPLEMENTATION"))); + if (container == null) container = Try.all.get(() -> (PluginContainer) Platform.class.getMethod("getImplementation").invoke(Sponge.getPlatform())); return (container == null || !container.getVersion().isPresent())?null:new Version(container.getVersion().get()); } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java index e943cedf..b33c1196 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java @@ -1,13 +1,13 @@ package net.ME1312.SubServers.Client.Sponge; import net.ME1312.Galaxi.Library.AsyncConsolidator; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Platform; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -45,6 +45,7 @@ import java.nio.charset.Charset; import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; import static net.ME1312.SubServers.Client.Sponge.Library.ObjectPermission.permits; @@ -195,8 +196,8 @@ public final class SubCommand implements CommandExecutor { @SuppressWarnings("unchecked") public CommandResult execute(CommandSource sender, CommandContext args) throws CommandException { if (canRun(sender)) { - PluginContainer container = Util.getDespiteException(() -> (PluginContainer) org.spongepowered.api.Platform.class.getMethod("getValue", Class.forName("org.spongepowered.api.Platform$Component")).invoke(Sponge.getPlatform(), Enum.valueOf((Class) Class.forName("org.spongepowered.api.Platform$Component"), "IMPLEMENTATION")), null); - if (container == null) container = Util.getDespiteException(() -> (PluginContainer) org.spongepowered.api.Platform.class.getMethod("getImplementation").invoke(Sponge.getPlatform()), null); + PluginContainer container = Try.all.get(() -> (PluginContainer) org.spongepowered.api.Platform.class.getMethod("getValue", Class.forName("org.spongepowered.api.Platform$Component")).invoke(Sponge.getPlatform(), Enum.valueOf((Class) Class.forName("org.spongepowered.api.Platform$Component"), "IMPLEMENTATION"))); + if (container == null) container = Try.all.get(() -> (PluginContainer) org.spongepowered.api.Platform.class.getMethod("getImplementation").invoke(Sponge.getPlatform())); sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers","Command.Version").replace("$str$", "SubServers.Client.Sponge"))); sender.sendMessage(Text.builder(" " + Platform.getSystemName() + ' ' + Platform.getSystemVersion() + ((Platform.getSystemBuild() != null)?" (" + Platform.getSystemBuild() + ')':"") + ((!Platform.getSystemArchitecture().equals("unknown"))?" [" + Platform.getSystemArchitecture() + ']':"")).color(TextColors.WHITE).append(Text.of(",")).build()); @@ -724,7 +725,7 @@ public final class SubCommand implements CommandExecutor { if (select.subservers.length > 0) { // Step 5: Start the stopped Servers once more final UUID player = (sender instanceof Player)?((Player) sender).getUniqueId():null; - Callback starter = server -> server.start(player, response -> { + Consumer starter = server -> server.start(player, response -> { switch (response) { case 3: case 4: @@ -754,16 +755,16 @@ public final class SubCommand implements CommandExecutor { // Step 4: Listen for stopped Servers final HashMap listening = new HashMap(); - PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() { + PacketInExRunEvent.callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap json) { + public void accept(ObjectMap json) { try { if (listening.size() > 0) { PacketInExRunEvent.callback("SubStoppedEvent", this); String name = json.getString("server").toLowerCase(); if (listening.keySet().contains(name)) { plugin.game.getScheduler().createTaskBuilder().execute(() -> { - starter.run(listening.get(name)); + starter.accept(listening.get(name)); listening.remove(name); }).delay(100, TimeUnit.MILLISECONDS).submit(plugin); } @@ -777,7 +778,7 @@ public final class SubCommand implements CommandExecutor { AsyncConsolidator merge = new AsyncConsolidator(() -> { if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Restart").replace("$int$", success.value.toString()))); }); - Callback> stopper = data -> { + Consumer> stopper = data -> { if (data.key() != 0) listening.remove(data.value().getName().toLowerCase()); switch (data.key()) { case 3: @@ -785,7 +786,7 @@ public final class SubCommand implements CommandExecutor { sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Restart.Disappeared").replace("$str$", data.value().getName()))); break; case 5: - starter.run(data.value()); + starter.accept(data.value()); case 0: success.value++; break; @@ -807,14 +808,14 @@ public final class SubCommand implements CommandExecutor { merge.reserve(); if (self == null) { listening.put(server.getName().toLowerCase(), server); - server.stop(player, response -> stopper.run(new ContainedPair<>(response, server))); + server.stop(player, response -> stopper.accept(new ContainedPair<>(response, server))); } else if (self != server) { - ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketRestartServer(player, server.getName(), data -> stopper.run(new ContainedPair<>(data.getInt(0x0001), server)))); + ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketRestartServer(player, server.getName(), data -> stopper.accept(new ContainedPair<>(data.getInt(0x0001), server)))); } } if (self != null) { final SubServer fself = self; - ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketRestartServer(player, self.getName(), data -> stopper.run(new ContainedPair<>(data.getInt(0x0001), fself)))); + ((SubDataClient) plugin.api.getSubDataNetwork()[0]).sendPacket(new PacketRestartServer(player, self.getName(), data -> stopper.accept(new ContainedPair<>(data.getInt(0x0001), fself)))); } } }); @@ -843,7 +844,7 @@ public final class SubCommand implements CommandExecutor { if (running.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Stop.Not-Running").replace("$int$", running.value.toString()))); if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Stop").replace("$int$", success.value.toString()))); }); - Callback> stopper = data -> { + Consumer> stopper = data -> { switch (data.key()) { case 3: case 4: @@ -869,11 +870,11 @@ public final class SubCommand implements CommandExecutor { for (SubServer server : select.subservers) { merge.reserve(); - if (self != server) server.stop((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.run(new ContainedPair<>(response, server))); + if (self != server) server.stop((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.accept(new ContainedPair<>(response, server))); } if (self != null) { final SubServer fself = self; - self.stop((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.run(new ContainedPair<>(response, fself))); + self.stop((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.accept(new ContainedPair<>(response, fself))); } } }); @@ -902,7 +903,7 @@ public final class SubCommand implements CommandExecutor { if (running.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Terminate.Not-Running").replace("$int$", running.value.toString()))); if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Terminate").replace("$int$", success.value.toString()))); }); - Callback> stopper = data -> { + Consumer> stopper = data -> { switch (data.key()) { case 3: case 4: @@ -928,11 +929,11 @@ public final class SubCommand implements CommandExecutor { for (SubServer server : select.subservers) { merge.reserve(); - if (self != server) server.terminate((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.run(new ContainedPair<>(response, server))); + if (self != server) server.terminate((sender instanceof Player)?((Player) sender).getUniqueId():null, response -> stopper.accept(new ContainedPair<>(response, server))); } if (self != null) { final SubServer fself = self; - fself.terminate((sender instanceof Player) ? ((Player) sender).getUniqueId() : null, response -> stopper.run(new ContainedPair<>(response, fself))); + fself.terminate((sender instanceof Player) ? ((Player) sender).getUniqueId() : null, response -> stopper.accept(new ContainedPair<>(response, fself))); } } }); @@ -1008,7 +1009,7 @@ public final class SubCommand implements CommandExecutor { Optional port = args.getOne(Text.of("Port")); if (name.isPresent() && host.isPresent() && template.isPresent()) { if (permits(host.get(), sender, "subservers.host.%.*", "subservers.host.%.create")) { - if (port.isPresent() && Util.isException(() -> Integer.parseInt(port.get()))) { + if (port.isPresent() && !Try.all.run(() -> Integer.parseInt(port.get()))) { sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers","Command.Creator.Invalid-Port"))); return CommandResult.builder().successCount(0).build(); } else { @@ -1220,7 +1221,7 @@ public final class SubCommand implements CommandExecutor { if (server != null) { if (!(server instanceof SubServer) || ((SubServer) server).isRunning()) { Value msg = new Container<>(false); - Callback action = target -> { + Consumer action = target -> { if (target == sender || sender.hasPermission("subservers.teleport-others")) { sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Teleport").replace("$str$", target.getName()))); plugin.pmc(target, "Connect", server.getName()); @@ -1233,13 +1234,13 @@ public final class SubCommand implements CommandExecutor { Optional player; Container> entities = new Container<>(null); if (name == null) { - action.run((Player) sender); + action.accept((Player) sender); } else if ((player = plugin.game.getServer().getPlayer(name)).isPresent()) { - action.run(player.get()); - } else if (Util.getDespiteException(() -> (entities.value = Selector.parse(name).resolve(sender)).size() > 0, false)) { + action.accept(player.get()); + } else if (Try.all.get(() -> (entities.value = Selector.parse(name).resolve(sender)).size() > 0, false)) { for (Entity entity : entities.value) { if (entity instanceof Player) { - action.run((Player) entity); + action.accept((Player) entity); } else { sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Generic.Unknown-Player").replace("$str$", entity.getUniqueId().toString()))); } @@ -1334,14 +1335,14 @@ public final class SubCommand implements CommandExecutor { } } } - private void selectServers(CommandSource sender, String[] selection, boolean mode, String permissions, Callback callback) { + private void selectServers(CommandSource sender, String[] selection, boolean mode, String permissions, Consumer callback) { selectServers(sender, selection, mode, new String[]{ permissions }, callback); } - private void selectServers(CommandSource sender, String[] selection, boolean mode, String[] permissions, Callback callback) { + private void selectServers(CommandSource sender, String[] selection, boolean mode, String[] permissions, Consumer callback) { selectServers(sender, selection, mode, new String[][]{ permissions }, callback); } @SuppressWarnings("unchecked") - private void selectServers(CommandSource sender, String[] selection, boolean mode, String[][] permissions, Callback callback) { + private void selectServers(CommandSource sender, String[] selection, boolean mode, String[][] permissions, Consumer callback) { StackTraceElement[] origin = new Exception().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList select = new LinkedList(); @@ -1384,7 +1385,7 @@ public final class SubCommand implements CommandExecutor { } try { - callback.run(new ServerSelection(msgs, selection, servers, subservers)); + callback.accept(new ServerSelection(msgs, selection, servers, subservers)); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java index f9830c7d..b74d6b4f 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java @@ -3,14 +3,12 @@ package net.ME1312.SubServers.Client.Sponge; import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.Encryption.AES; import net.ME1312.SubData.Client.Encryption.DHE; import net.ME1312.SubData.Client.Encryption.RSA; -import net.ME1312.SubData.Client.Library.DataSize; import net.ME1312.SubData.Client.Library.DisconnectReason; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Sponge.Graphic.UIHandler; @@ -58,7 +56,7 @@ public final class SubPlugin { @ConfigDir(sharedRoot = false) @Inject public File xdir; - public UniversalFile dir; + public File dir; public Logger log = LoggerFactory.getLogger("SubServers"); public UIHandler gui = null; public Version version; @@ -88,22 +86,22 @@ public final class SubPlugin { api = new SubAPI(this); try { log.info("Loading SubServers.Client.Sponge v" + version.toString() + " Libraries (for Minecraft " + api.getGameVersion() + ")"); - dir = new UniversalFile(xdir.getParentFile(), "subservers-client"); + dir = new File(xdir.getParentFile(), "subservers-client"); if (xdir.exists()) { Files.move(xdir.toPath(), dir.toPath(), StandardCopyOption.REPLACE_EXISTING); } else dir.mkdirs(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "config.yml")); - config = new YAMLConfig(new UniversalFile(dir, "config.yml")); - if (new UniversalFile(new File(System.getProperty("user.dir")), "subdata.json").exists()) { - FileReader reader = new FileReader(new UniversalFile(new File(System.getProperty("user.dir")), "subdata.json")); + ConfigUpdater.updateConfig(new File(dir, "config.yml")); + config = new YAMLConfig(new File(dir, "config.yml")); + if (new File(new File(System.getProperty("user.dir")), "subdata.json").exists()) { + FileReader reader = new FileReader(new File(new File(System.getProperty("user.dir")), "subdata.json")); config.get().getMap("Settings").set("SubData", new ObjectMap(new Gson().fromJson(Util.readAll(reader), Map.class))); config.save(); reader.close(); - new UniversalFile(new File(System.getProperty("user.dir")), "subdata.json").delete(); + new File(new File(System.getProperty("user.dir")), "subdata.json").delete(); } - if (new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").exists()) { - if (new UniversalFile(dir, "subdata.rsa.key").exists()) new UniversalFile(dir, "subdata.rsa.key").delete(); - Files.move(new UniversalFile(new File(System.getProperty("user.dir")), "subdata.rsa.key").toPath(), new UniversalFile(dir, "subdata.rsa.key").toPath()); + if (new File(new File(System.getProperty("user.dir")), "subdata.rsa.key").exists()) { + if (new File(dir, "subdata.rsa.key").exists()) new File(dir, "subdata.rsa.key").delete(); + Files.move(new File(new File(System.getProperty("user.dir")), "subdata.rsa.key").toPath(), new File(dir, "subdata.rsa.key").toPath()); } running = true; @@ -126,9 +124,9 @@ public final class SubPlugin { log.info("AES Encryption Available"); } - if (new UniversalFile(dir, "subdata.rsa.key").exists()) { + if (new File(dir, "subdata.rsa.key").exists()) { try { - subprotocol.registerCipher("RSA", new RSA(new UniversalFile(dir, "subdata.rsa.key"))); + subprotocol.registerCipher("RSA", new RSA(new File(dir, "subdata.rsa.key"))); log.info("RSA Encryption Available"); } catch (Exception e) { e.printStackTrace(); @@ -174,7 +172,7 @@ public final class SubPlugin { public void reload(boolean notifyPlugins) throws IOException { resetDate = Calendar.getInstance().getTime().getTime(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "config.yml")); + ConfigUpdater.updateConfig(new File(dir, "config.yml")); config.reload(); if (notifyPlugins) { diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleCommand.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleCommand.java index ab6daef6..0b46ce6d 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleCommand.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleCommand.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Console; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.SubServers.Bungee.Host.Host; import net.ME1312.SubServers.Bungee.Host.SubServer; import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; @@ -11,6 +10,7 @@ import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.command.ConsoleCommandSender; import java.util.List; +import java.util.function.Consumer; @SuppressWarnings("unchecked") public final class ConsoleCommand { @@ -158,9 +158,9 @@ public final class ConsoleCommand { } } }; - final Callback forCreator = new Callback() { + final Consumer forCreator = new Consumer() { @Override - public void run(Boolean force) { + public void accept(Boolean force) { Host host = plugin.getProxy().api.getHost(name); if (force || host != null) { List list = plugin.config.get().getStringList("Enabled-Creators"); @@ -186,7 +186,7 @@ public final class ConsoleCommand { }; if (type == null) { - forCreator.run(false); + forCreator.accept(false); } else { switch (type.toLowerCase()) { case "h": @@ -194,7 +194,7 @@ public final class ConsoleCommand { case "c": case "creator": case "subcreator": - forCreator.run(true); + forCreator.accept(true); break; case "s": case "server": diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java index 1a06c7a3..b64d9db3 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java @@ -1,8 +1,6 @@ package net.ME1312.SubServers.Console; -import net.ME1312.Galaxi.Library.Callback.ExceptionReturnRunnable; -import net.ME1312.Galaxi.Library.Callback.ExceptionRunnable; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.SubServers.Bungee.Host.SubCreator; import net.ME1312.SubServers.Bungee.Host.SubLogFilter; import net.ME1312.SubServers.Bungee.Host.SubLogger; @@ -370,7 +368,7 @@ public final class ConsoleWindow implements SubLogFilter { window.setJMenuBar(jMenu); window.setContentPane(panel); window.pack(); - Util.isException(new ExceptionRunnable() { + Try.all.run(new Try.Runnable() { @Override public void run() throws Throwable { window.setIconImage(ImageIO.read(ConsolePlugin.class.getResourceAsStream("/net/ME1312/SubServers/Console/ConsoleIcon.png"))); diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java b/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java index 3d383411..5d61f39e 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/Library/HTMLogger.java @@ -4,7 +4,6 @@ import net.ME1312.Galaxi.Library.Container.Container; import org.fusesource.jansi.AnsiOutputStream; -import java.awt.*; import java.io.IOException; import java.io.OutputStream; import java.util.LinkedList; diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 3827f615..74c34d72 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -30,13 +30,13 @@ net.ME1312.Galaxi GalaxiEngine - 21w27b + 21w43f compile net.ME1312.Galaxi GalaxiUI - 21w27b + 21w43f runtime diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddHostEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddHostEvent.java index a1952be0..63e8337e 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddHostEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddHostEvent.java @@ -19,7 +19,7 @@ public class SubAddHostEvent extends Event { * @param host Host to be added */ public SubAddHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddProxyEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddProxyEvent.java index 2ab7a813..32b602b5 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddProxyEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddProxyEvent.java @@ -15,7 +15,7 @@ public class SubAddProxyEvent extends Event { * @param proxy Host Being Added */ public SubAddProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddServerEvent.java index 015c0dfd..a29b637f 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddServerEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubAddServerEvent.java @@ -20,7 +20,7 @@ public class SubAddServerEvent extends Event { * @param server Server Starting */ public SubAddServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java index 31f1cdc9..b6ada700 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; @@ -9,6 +8,7 @@ import net.ME1312.SubServers.Host.SubAPI; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Create Event @@ -33,7 +33,7 @@ public class SubCreateEvent extends Event { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.update = update; this.host = host; @@ -66,10 +66,10 @@ public class SubCreateEvent extends Event { * * @param callback Updating Server */ - public void getUpdatingServer(Callback callback) { + public void getUpdatingServer(Consumer callback) { if (!update) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java index 54243369..58adbb5a 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Host.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; @@ -9,6 +8,7 @@ import net.ME1312.SubServers.Host.SubAPI; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Created Event @@ -34,7 +34,7 @@ public class SubCreatedEvent extends Event { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.success = success; this.update = update; @@ -77,10 +77,10 @@ public class SubCreatedEvent extends Event { * * @param callback Updating Server */ - public void getServer(Callback callback) { + public void getServer(Consumer callback) { if (!update && !success) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java index e52c8bb9..92ddd612 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubEditServerEvent.java @@ -1,8 +1,8 @@ package net.ME1312.SubServers.Host.Event; +import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; -import net.ME1312.Galaxi.Event.Event; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; import net.ME1312.Galaxi.Library.Util; @@ -25,7 +25,7 @@ public class SubEditServerEvent extends Event { * @param edit Edit to make */ public SubEditServerEvent(UUID player, String server, Pair edit) { - if (Util.isNull(server, edit)) throw new NullPointerException(); + Util.nullpo(server, edit); ObjectMap section = new ObjectMap(); section.set(".", edit.value()); this.player = player; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkConnectEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkConnectEvent.java index 51cf391d..6a8f6f32 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkConnectEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkConnectEvent.java @@ -14,7 +14,7 @@ public class SubNetworkConnectEvent extends Event { * SubData Network Connect Event */ public SubNetworkConnectEvent(DataClient network) { - if (Util.isNull(network)) throw new NullPointerException(); + Util.nullpo(network); this.network = network; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkDisconnectEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkDisconnectEvent.java index 7c18c33d..ca83ecd6 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubNetworkDisconnectEvent.java @@ -16,7 +16,7 @@ public class SubNetworkDisconnectEvent extends Event { * SubData Network Disconnect Event */ public SubNetworkDisconnectEvent(DataClient network, DisconnectReason reason) { - if (Util.isNull(network, reason)) throw new NullPointerException(); + Util.nullpo(network, reason); this.network = network; this.reason = reason; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveHostEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveHostEvent.java index 367f3046..ac677bb4 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveHostEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveHostEvent.java @@ -19,7 +19,7 @@ public class SubRemoveHostEvent extends Event { * @param host Server Starting */ public SubRemoveHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveProxyEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveProxyEvent.java index b7ecefbe..50844b6a 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveProxyEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveProxyEvent.java @@ -15,7 +15,7 @@ public class SubRemoveProxyEvent extends Event { * @param proxy Host Being Added */ public SubRemoveProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveServerEvent.java index acc1536e..5bd09be3 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveServerEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubRemoveServerEvent.java @@ -20,7 +20,7 @@ public class SubRemoveServerEvent extends Event { * @param server Server Starting */ public SubRemoveServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubSendCommandEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubSendCommandEvent.java index 5827095f..80a38e3e 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubSendCommandEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubSendCommandEvent.java @@ -20,7 +20,7 @@ public class SubSendCommandEvent extends Event { * @param server Server being Commanded */ public SubSendCommandEvent(UUID player, String server, String command) { - if (Util.isNull(server, command)) throw new NullPointerException(); + Util.nullpo(server, command); this.player = player; this.server = server; this.command = command; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartEvent.java index bf9a10ea..95222f6c 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartEvent.java @@ -20,7 +20,7 @@ public class SubStartEvent extends Event { * @param server Server Starting */ public SubStartEvent(UUID player, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.server = server; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartedEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartedEvent.java index 6fc31641..d401bbd2 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartedEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStartedEvent.java @@ -16,7 +16,7 @@ public class SubStartedEvent extends Event { * @param server Server that Started */ public SubStartedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStopEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStopEvent.java index 3fbfaefa..c18a94d6 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStopEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStopEvent.java @@ -21,7 +21,7 @@ public class SubStopEvent extends Event { * @param force If it was a Forced Shutdown */ public SubStopEvent(UUID player, String server, boolean force) { - if (Util.isNull(server, force)) throw new NullPointerException(); + Util.nullpo(server, force); this.player = player; this.server = server; this.force = force; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStoppedEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStoppedEvent.java index 0af86b06..14ad592e 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStoppedEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubStoppedEvent.java @@ -15,7 +15,7 @@ public class SubStoppedEvent extends Event { * @param server Server that Stopped */ public SubStoppedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index b5fa81d4..62a912ff 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -5,13 +5,13 @@ import net.ME1312.Galaxi.Event.Engine.GalaxiReloadEvent; import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Container.Pair; -import net.ME1312.Galaxi.Log.Logger; +import net.ME1312.Galaxi.Library.Directories; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Platform; -import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.Galaxi.Library.Version.VersionType; +import net.ME1312.Galaxi.Log.Logger; import net.ME1312.Galaxi.Plugin.App; import net.ME1312.Galaxi.Plugin.PluginInfo; import net.ME1312.SubData.Client.DataClient; @@ -31,7 +31,6 @@ import com.dosse.upnp.UPnP; import org.json.JSONObject; import java.io.*; -import java.lang.reflect.InvocationTargetException; import java.net.InetAddress; import java.net.URL; import java.nio.charset.Charset; @@ -120,36 +119,36 @@ public final class ExHost { engine = GalaxiEngine.init(info); log.info.println("Loading SubServers.Host v" + info.getVersion().toString() + " Libraries"); - ConfigUpdater.updateConfig(new UniversalFile(engine.getRuntimeDirectory(), "config.yml")); - config = new YAMLConfig(new UniversalFile(engine.getRuntimeDirectory(), "config.yml")); + ConfigUpdater.updateConfig(new File(engine.getRuntimeDirectory(), "config.yml")); + config = new YAMLConfig(new File(engine.getRuntimeDirectory(), "config.yml")); - if (!(new UniversalFile(engine.getRuntimeDirectory(), "Templates").exists())) { - new UniversalFile(engine.getRuntimeDirectory(), "Templates").mkdirs(); + if (!(new File(engine.getRuntimeDirectory(), "Templates").exists())) { + new File(engine.getRuntimeDirectory(), "Templates").mkdirs(); log.info.println("Created ./Templates/"); } - if (new UniversalFile(engine.getRuntimeDirectory(), "Recently Deleted").exists()) { - int f = new UniversalFile(engine.getRuntimeDirectory(), "Recently Deleted").listFiles().length; - for (File file : new UniversalFile(engine.getRuntimeDirectory(), "Recently Deleted").listFiles()) { + if (new File(engine.getRuntimeDirectory(), "Recently Deleted").exists()) { + int f = new File(engine.getRuntimeDirectory(), "Recently Deleted").listFiles().length; + for (File file : new File(engine.getRuntimeDirectory(), "Recently Deleted").listFiles()) { try { if (file.isDirectory()) { - if (new UniversalFile(engine.getRuntimeDirectory(), "Recently Deleted:" + file.getName() + ":info.json").exists()) { - FileReader reader = new FileReader(new UniversalFile(engine.getRuntimeDirectory(), "Recently Deleted:" + file.getName() + ":info.json")); + if (new File(engine.getRuntimeDirectory(), "Recently Deleted/" + file.getName() + "/info.json").exists()) { + FileReader reader = new FileReader(new File(engine.getRuntimeDirectory(), "Recently Deleted/" + file.getName() + "/info.json")); JSONObject json = new JSONObject(Util.readAll(reader)); reader.close(); if (json.keySet().contains("Timestamp")) { if (TimeUnit.MILLISECONDS.toDays(Calendar.getInstance().getTime().getTime() - json.getLong("Timestamp")) >= 7) { - Util.deleteDirectory(file); + Directories.delete(file); f--; log.info.println("Removed ./Recently Deleted/" + file.getName()); } } else { - Util.deleteDirectory(file); + Directories.delete(file); f--; log.info.println("Removed ./Recently Deleted/" + file.getName()); } } else { - Util.deleteDirectory(file); + Directories.delete(file); f--; log.info.println("Removed ./Recently Deleted/" + file.getName()); } @@ -163,7 +162,7 @@ public final class ExHost { } } if (f <= 0) { - Files.delete(new UniversalFile(engine.getRuntimeDirectory(), "Recently Deleted").toPath()); + Files.delete(new File(engine.getRuntimeDirectory(), "Recently Deleted").toPath()); } } @@ -171,7 +170,7 @@ public final class ExHost { Util.reflect(SubLoggerImpl.class.getDeclaredField("logc"), null, config.get().getMap("Settings").getBoolean("Console-Log", true)); loadDefaults(); - engine.getPluginManager().loadPlugins(new UniversalFile(engine.getRuntimeDirectory(), "Plugins")); + engine.getPluginManager().loadPlugins(new File(engine.getRuntimeDirectory(), "Plugins")); running = true; creator = new SubCreatorImpl(this); @@ -194,9 +193,9 @@ public final class ExHost { log.info.println("AES Encryption Available"); } - if (new UniversalFile(engine.getRuntimeDirectory(), "subdata.rsa.key").exists()) { + if (new File(engine.getRuntimeDirectory(), "subdata.rsa.key").exists()) { try { - subprotocol.registerCipher("RSA", new RSA(new UniversalFile(engine.getRuntimeDirectory(), "subdata.rsa.key"))); + subprotocol.registerCipher("RSA", new RSA(new File(engine.getRuntimeDirectory(), "subdata.rsa.key"))); log.info.println("RSA Encryption Available"); } catch (Exception e) { log.error.println(e); @@ -255,7 +254,7 @@ public final class ExHost { public void reload(boolean notifyPlugins) throws IOException { resetDate = Calendar.getInstance().getTime().getTime(); - ConfigUpdater.updateConfig(new UniversalFile(engine.getRuntimeDirectory(), "config.yml")); + ConfigUpdater.updateConfig(new File(engine.getRuntimeDirectory(), "config.yml")); config.reload(); creator.load(false); @@ -341,7 +340,7 @@ public final class ExHost { log.error.println(e); } - if (new UniversalFile(engine.getRuntimeDirectory(), "Cache:Remote").exists()) Util.deleteDirectory(new UniversalFile(engine.getRuntimeDirectory(), "Cache:Remote")); + if (new File(engine.getRuntimeDirectory(), "Cache/Remote").exists()) Directories.delete(new File(engine.getRuntimeDirectory(), "Cache/Remote")); } } } \ No newline at end of file diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java index 4bb5b31c..9be2eb08 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/Executable.java @@ -1,11 +1,11 @@ package net.ME1312.SubServers.Host.Executable; import net.ME1312.Galaxi.Library.Platform; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Host.Library.Compatibility.JNA; import java.io.File; -import java.io.IOException; import java.util.stream.Stream; /** @@ -41,7 +41,7 @@ public class Executable { } static { - USE_SESSION_TRACKING = Platform.getSystem() != Platform.WINDOWS && Util.getDespiteException(() -> { + USE_SESSION_TRACKING = Platform.getSystem() != Platform.WINDOWS && Try.all.get(() -> { Process test = Runtime.getRuntime().exec(new String[]{"setsid", "bash", "-c", "exit 0"}); test.waitFor(); // The purpose of this block is to test for the 'setsid' command return test.exitValue() == 0; @@ -96,9 +96,9 @@ public class Executable { if (process.isAlive()) { Long pid; if (Platform.getSystem() == Platform.WINDOWS) { - if ((pid = pid(process)) != null) Util.isException(() -> Runtime.getRuntime().exec(new String[]{"taskkill.exe", "/T", "/F", "/PID", pid.toString()}).waitFor()); + if ((pid = pid(process)) != null) Try.all.run(() -> Runtime.getRuntime().exec(new String[]{"taskkill.exe", "/T", "/F", "/PID", pid.toString()}).waitFor()); } else if (USE_SESSION_TRACKING) { - if ((pid = pid(process)) != null) Util.isException(() -> Runtime.getRuntime().exec(new String[]{"bash", "-c", "kill -9 $(ps -s " + pid + " -o pid=)"}).waitFor()); + if ((pid = pid(process)) != null) Try.all.run(() -> Runtime.getRuntime().exec(new String[]{"bash", "-c", "kill -9 $(ps -s " + pid + " -o pid=)"}).waitFor()); } if (process.isAlive() && terminate9(process)) { diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java index ac378c8e..e31f3b87 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreatorImpl.java @@ -6,9 +6,9 @@ import net.ME1312.Galaxi.Library.Config.YAMLSection; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; +import net.ME1312.Galaxi.Library.Directories; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Map.ObjectMapValue; -import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -20,7 +20,6 @@ import net.ME1312.SubServers.Host.Library.Exception.InvalidTemplateException; import net.ME1312.SubServers.Host.Library.Exception.SubCreatorException; import net.ME1312.SubServers.Host.Library.ReplacementScanner; import net.ME1312.SubServers.Host.Network.Packet.PacketExCreateServer; -import net.ME1312.SubServers.Host.Network.Packet.PacketOutExLogMessage; import net.ME1312.SubServers.Host.SubAPI; import org.json.JSONObject; @@ -222,7 +221,7 @@ public class SubCreatorImpl { } private static ObjectMap toRaw(String name, boolean enabled, String icon, File directory, ObjectMap build, ObjectMap options) { - if (Util.isNull(name, enabled, directory, build, options)) throw new NullPointerException(); + Util.nullpo(name, enabled, directory, build, options); ObjectMap tinfo = new ObjectMap(); tinfo.set("enabled", enabled); tinfo.set("name", name); @@ -242,12 +241,12 @@ public class SubCreatorImpl { */ public void load(boolean remote) { HashMap templates = (remote)?host.templatesR:host.templates; - UniversalFile dir = new UniversalFile(GalaxiEngine.getInstance().getRuntimeDirectory(), ((remote)?"Cache:Remote:":"") + "Templates"); + File dir = new File(GalaxiEngine.getInstance().getRuntimeDirectory(), ((remote)?"Cache/Remote/":"") + "Templates"); templates.clear(); if (dir.exists()) for (File file : dir.listFiles()) { try { if (file.isDirectory() && !file.getName().endsWith(".x")) { - ObjectMap config = (new UniversalFile(file, "template.yml").exists())?new YAMLConfig(new UniversalFile(file, "template.yml")).get().getMap("Template", new ObjectMap()):new ObjectMap(); + ObjectMap config = (new File(file, "template.yml").exists())?new YAMLConfig(new File(file, "template.yml")).get().getMap("Template", new ObjectMap()):new ObjectMap(); ServerTemplate template = new ServerTemplate(file.getName(), config.getBoolean("Enabled", true), config.getBoolean("Internal", false), config.getRawString("Icon", "::NULL::"), file, config.getMap("Build", new ObjectMap()), config.getMap("Settings", new ObjectMap()), false); templates.put(file.getName().toLowerCase(), template); if (config.getKeys().contains("Display")) template.setDisplayName(config.getString("Display")); @@ -383,7 +382,7 @@ public class SubCreatorImpl { if (template.getBuildOptions().contains("Executable")) { File cache = null; if (template.getBuildOptions().getBoolean("Use-Cache", true)) { - cache = new UniversalFile(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache:Templates:" + template.getName()); + cache = new File(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache/Templates/" + template.getName()); cache.mkdirs(); var.put("cache", cache.getAbsolutePath()); } @@ -411,14 +410,14 @@ public class SubCreatorImpl { if (cache != null) { if (cache.isDirectory() && cache.listFiles().length == 0) cache.delete(); - cache = new UniversalFile(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache:Templates"); + cache = new File(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache/Templates"); if (cache.isDirectory() && cache.listFiles().length == 0) cache.delete(); - cache = new UniversalFile(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache"); + cache = new File(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache"); if (cache.isDirectory() && cache.listFiles().length == 0) cache.delete(); } } - new UniversalFile(dir, "template.yml").delete(); + new File(dir, "template.yml").delete(); if (error) throw new SubCreatorException(); return server; } @@ -484,13 +483,13 @@ public class SubCreatorImpl { * @param host SubServers.Host */ public SubCreatorImpl(ExHost host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.host = host; this.thread = new TreeMap<>(); } public boolean create(UUID player, String name, ServerTemplate template, Version version, int port, Boolean mode, UUID address, UUID tracker) { - if (Util.isNull(name, template, port, address)) throw new NullPointerException(); + Util.nullpo(name, template, port, address); CreatorTask task = new CreatorTask(player, name, template, version, port, mode, address, tracker); this.thread.put(name.toLowerCase(), task); task.start(); @@ -567,32 +566,32 @@ public class SubCreatorImpl { boolean installed = false; if (type == ServerType.SPIGOT) { installed = true; - if (!new UniversalFile(dir, "plugins").exists()) new UniversalFile(dir, "plugins").mkdirs(); - if (!new UniversalFile(dir, "plugins:SubServers.Client.jar").exists()) - Util.copyFromJar(ExHost.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/client.jar", new UniversalFile(dir, "plugins:SubServers.Client.jar").getPath()); + if (!new File(dir, "plugins").exists()) new File(dir, "plugins").mkdirs(); + if (!new File(dir, "plugins/SubServers.Client.jar").exists()) + Util.copyFromJar(ExHost.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/client.jar", new File(dir, "plugins/SubServers.Client.jar").getPath()); } else if (type == ServerType.FORGE || type == ServerType.SPONGE) { installed = true; - if (!new UniversalFile(dir, "mods").exists()) new UniversalFile(dir, "mods").mkdirs(); - if (!new UniversalFile(dir, "mods:SubServers.Client.jar").exists()) - Util.copyFromJar(ExHost.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/client.jar", new UniversalFile(dir, "mods:SubServers.Client.jar").getPath()); + if (!new File(dir, "mods").exists()) new File(dir, "mods").mkdirs(); + if (!new File(dir, "mods/SubServers.Client.jar").exists()) + Util.copyFromJar(ExHost.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/client.jar", new File(dir, "mods/SubServers.Client.jar").getPath()); } if (installed) { YAMLSection config = new YAMLSection(); - FileWriter writer = new FileWriter(new UniversalFile(dir, "subdata.json"), false); + FileWriter writer = new FileWriter(new File(dir, "subdata.json"), false); config.setAll(getSubData()); writer.write(config.toJSON().toString()); writer.close(); - if (!new UniversalFile(dir, "subdata.rsa.key").exists() && new UniversalFile("subdata.rsa.key").exists()) { - Files.copy(new UniversalFile("subdata.rsa.key").toPath(), new UniversalFile(dir, "subdata.rsa.key").toPath()); + if (!new File(dir, "subdata.rsa.key").exists() && new File("subdata.rsa.key").exists()) { + Files.copy(new File("subdata.rsa.key").toPath(), new File(dir, "subdata.rsa.key").toPath()); } } } private void updateDirectory(File from, File to, boolean overwrite) { if (!to.exists()) { - Util.copyDirectory(from, to); + Directories.copy(from, to); } else if (from.isDirectory() && !Files.isSymbolicLink(from.toPath())) { String files[] = from.list(); @@ -606,7 +605,7 @@ public class SubCreatorImpl { try { if (overwrite && (from.length() != to.length() || !Arrays.equals(generateSHA256(to), generateSHA256(from)))) { if (to.exists()) { - if (to.isDirectory()) Util.deleteDirectory(to); + if (to.isDirectory()) Directories.delete(to); else to.delete(); } Files.copy(from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS, StandardCopyOption.REPLACE_EXISTING); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java index 2dded0b4..684b95f5 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLoggerImpl.java @@ -1,13 +1,12 @@ package net.ME1312.SubServers.Host.Executable; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; -import net.ME1312.Galaxi.Log.LogFilter; +import net.ME1312.Galaxi.Library.Try; +import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Log.LogStream; import net.ME1312.Galaxi.Log.Logger; -import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataSender; import net.ME1312.SubData.Client.Library.DisconnectReason; @@ -24,6 +23,7 @@ import java.util.Timer; import java.util.TimerTask; import java.util.UUID; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -94,19 +94,19 @@ public class SubLoggerImpl { @SuppressWarnings("deprecation") void init() { - if (logn) Util.isException(() -> { + if (logn) Try.all.run(() -> { Process process = this.process; ExHost host = SubAPI.getInstance().getInternals(); channel = (SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0].newChannel(); - channel.on.closed(new Callback>() { + channel.on.closed(new Consumer>() { @Override - public void run(Pair client) { + public void accept(Pair client) { if (started && SubLoggerImpl.this.process != null && process == SubLoggerImpl.this.process && process.isAlive()) { int reconnect = host.config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60); - if (Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("reconnect"), host), false) && reconnect > 0 + if (Try.all.get(() -> Util.reflect(ExHost.class.getDeclaredField("reconnect"), host), false) && reconnect > 0 && client.key() != DisconnectReason.PROTOCOL_MISMATCH && client.key() != DisconnectReason.ENCRYPTION_MISMATCH) { Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::Log_Reconnect_Handler"); - Callback> run = this; + Consumer> run = this; reconnect++; timer.scheduleAtFixedRate(new TimerTask() { @Override diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java index f905b4bb..14e9e011 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServerImpl.java @@ -2,7 +2,6 @@ package net.ME1312.SubServers.Host.Executable; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Value; -import net.ME1312.Galaxi.Library.UniversalFile; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -54,7 +53,7 @@ public class SubServerImpl { * @throws InvalidServerException */ public SubServerImpl(ExHost host, String name, boolean enabled, int port, boolean log, String directory, String executable, String stopcmd) throws InvalidServerException { - if (Util.isNull(host, name, enabled, log, directory, executable)) throw new NullPointerException(); + Util.nullpo(host, name, enabled, log, directory, executable); this.host = host; this.name = name; this.enabled = enabled; @@ -69,12 +68,12 @@ public class SubServerImpl { this.command = null; this.queue = new LinkedList(); this.stopcmd = stopcmd; - final UniversalFile[] locations = new UniversalFile[] { - new UniversalFile(this.directory, "plugins:SubServers.Client.jar"), - new UniversalFile(this.directory, "mods:SubServers.Client.jar") + final File[] locations = new File[] { + new File(this.directory, "plugins/SubServers.Client.jar"), + new File(this.directory, "mods/SubServers.Client.jar") }; - for (UniversalFile location : locations) { + for (File location : locations) { if (location.exists()) { try { JarInputStream updated = new JarInputStream(ExHost.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/client.jar")); @@ -180,7 +179,7 @@ public class SubServerImpl { * @param command Command to Send */ public void command(String command) { - if (Util.isNull(command)) throw new NullPointerException(); + Util.nullpo(command); if (thread != null && thread.isAlive()) { try { if (command.equalsIgnoreCase(stopcmd)) allowrestart = false; @@ -239,7 +238,7 @@ public class SubServerImpl { * @param value Value */ public void setEnabled(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); enabled = value; } @@ -267,7 +266,7 @@ public class SubServerImpl { * @param value Value */ public void setLogging(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); log.value(value); } @@ -320,7 +319,7 @@ public class SubServerImpl { * @param value Value */ public void setStopCommand(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); stopcmd = value; } } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java index 8d7e8147..472f2238 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Compatibility/JNA.java @@ -2,8 +2,8 @@ package net.ME1312.SubServers.Host.Library.Compatibility; import net.ME1312.Galaxi.Galaxi; import net.ME1312.Galaxi.Log.Logger; -import net.ME1312.Galaxi.Library.UniversalFile; +import java.io.File; import java.io.FileNotFoundException; import java.io.InputStream; import java.net.URL; @@ -30,8 +30,8 @@ public class JNA { if (JNA == null) { boolean announced = false; Logger log = new Logger("JNA"); - UniversalFile library = new UniversalFile(Galaxi.getInstance().getRuntimeDirectory(), "Cache:Libraries"); - UniversalFile jna = new UniversalFile(library, "jna-" + JNA_VERSION + ".jar"); + File library = new File(Galaxi.getInstance().getRuntimeDirectory(), "Cache/Libraries"); + File jna = new File(library, "jna-" + JNA_VERSION + ".jar"); jna.getParentFile().mkdirs(); if (!jna.exists()) { log.info.println("Downloading JNA Library v" + JNA_VERSION); @@ -43,7 +43,7 @@ public class JNA { log.error.println(e); } } - UniversalFile platform = new UniversalFile(library, "jna-platform-" + JNA_VERSION + ".jar"); + File platform = new File(library, "jna-platform-" + JNA_VERSION + ".jar"); platform.getParentFile().mkdirs(); if (!platform.exists()) { if (!announced) log.info.println("Downloading JNA Library v" + JNA_VERSION); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/FileScanner.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/FileScanner.java index babf08ba..a2e2ab4f 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/FileScanner.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/FileScanner.java @@ -1,10 +1,9 @@ package net.ME1312.SubServers.Host.Library; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Directories; import java.io.File; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -23,7 +22,7 @@ public abstract class FileScanner { * @param whitelist File Whitelist */ protected void scan(File dir, String... whitelist) throws IOException { - List files = Util.searchDirectory(dir); + List files = Directories.search(dir); if (files.size() <= 0 || whitelist.length <= 0) return; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java index 5055b761..e26ec845 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Metrics.java @@ -2,8 +2,8 @@ package net.ME1312.SubServers.Host.Library; import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Library.Config.YAMLConfig; -import net.ME1312.Galaxi.Log.Logger; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Log.Logger; import net.ME1312.SubServers.Host.ExHost; import net.ME1312.SubServers.Host.SubAPI; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCheckPermission.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCheckPermission.java index 5a5803d2..c8e05f07 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCheckPermission.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCheckPermission.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Host.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.Forwardable; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Check Permission Packet */ public class PacketCheckPermission implements Forwardable, PacketObjectIn, PacketObjectOut { - static HashMap[]> callbacks = new HashMap[]>(); + static HashMap[]> callbacks = new HashMap[]>(); private UUID player; private String permission; private UUID tracker; @@ -33,7 +33,7 @@ public class PacketCheckPermission implements Forwardable, PacketObjectIn... callback) { + public PacketCheckPermission(UUID player, String permission, Consumer... callback) { this.player = player; this.permission = permission; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCheckPermissionResponse.java index 338e584a..14a7bd06 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCheckPermissionResponse.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Host.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubData.Client.Protocol.Forwardable; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -8,6 +7,7 @@ import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; import java.util.UUID; +import java.util.function.Consumer; import static net.ME1312.SubServers.Host.Network.Packet.PacketCheckPermission.callbacks; @@ -46,7 +46,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI @Override public void receive(SubDataSender client, ObjectMap data) throws Throwable { - for (Callback callback : callbacks.get(data.getUUID(0x0000))) callback.run(data.getBoolean(0x0001)); + for (Consumer callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data.getBoolean(0x0001)); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadLang.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadLang.java index d3d8d9a0..87b3af06 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadLang.java @@ -2,6 +2,7 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketOut; @@ -24,7 +25,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut { * @param host ExHost */ public PacketDownloadLang(ExHost host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.host = host; } @@ -35,7 +36,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut { @Override public void receive(SubDataSender client, ObjectMap data) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection())); try { Util.reflect(ExHost.class.getDeclaredField("lang"), host, new ContainedPair<>(Calendar.getInstance().getTime().getTime(), data.getObject(0x0001))); log.info("Lang Settings Downloaded"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java index 95f4e6f0..5e086f8d 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; @@ -29,7 +30,7 @@ public class PacketExAddServer implements PacketObjectIn, PacketObjectO * @param host ExHost */ public PacketExAddServer(ExHost host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.host = host; } @@ -50,7 +51,7 @@ public class PacketExAddServer implements PacketObjectIn, PacketObjectO * @param tracker Receiver ID */ public PacketExAddServer(int response, UUID running, UUID tracker) { - if (Util.isNull(response)) throw new NullPointerException(); + Util.nullpo(response); this.response = response; this.tracker = tracker; this.running = running; @@ -67,7 +68,7 @@ public class PacketExAddServer implements PacketObjectIn, PacketObjectO @Override public void receive(SubDataSender client, ObjectMap data) { - Logger logger = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger logger = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); UUID tracker = (data.contains(0x0000)?data.getUUID(0x0000):null); try { String name = data.getRawString(0x0001); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java index ef5f0cdf..e7c45cf7 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java @@ -31,7 +31,7 @@ public class PacketExCreateServer implements PacketObjectIn, PacketObje * @param host ExHost */ public PacketExCreateServer(ExHost host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.host = host; } @@ -43,7 +43,7 @@ public class PacketExCreateServer implements PacketObjectIn, PacketObje * @param tracker Receiver ID */ public PacketExCreateServer(int response, String message, UUID tracker) { - if (Util.isNull(response)) throw new NullPointerException(); + Util.nullpo(response); this.response = response; this.message = message; this.tracker = tracker; @@ -58,7 +58,7 @@ public class PacketExCreateServer implements PacketObjectIn, PacketObje * @param tracker Receiver ID */ public PacketExCreateServer(int response, String message, Map info, UUID tracker) { - if (Util.isNull(response)) throw new NullPointerException(); + Util.nullpo(response); this.response = response; this.message = message; this.info = info; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java index b19930e3..4adbb5a2 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDeleteServer.java @@ -2,8 +2,9 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Library.Config.YAMLSection; +import net.ME1312.Galaxi.Library.Directories; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; @@ -35,7 +36,7 @@ public class PacketExDeleteServer implements PacketObjectIn, PacketObje * @param host ExHost */ public PacketExDeleteServer(ExHost host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.host = host; } @@ -46,7 +47,7 @@ public class PacketExDeleteServer implements PacketObjectIn, PacketObje * @param tracker Receiver ID */ public PacketExDeleteServer(int response, UUID tracker) { - if (Util.isNull(response)) throw new NullPointerException(); + Util.nullpo(response); this.response = response; this.tracker = tracker; } @@ -62,7 +63,7 @@ public class PacketExDeleteServer implements PacketObjectIn, PacketObje @SuppressWarnings("unchecked") @Override public void receive(SubDataSender client, ObjectMap data) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); UUID tracker = (data.contains(0x0000)?data.getUUID(0x0000):null); try { String name = data.getRawString(0x0001); @@ -77,20 +78,20 @@ public class PacketExDeleteServer implements PacketObjectIn, PacketObje SubServerImpl server = host.servers.get(name.toLowerCase()); host.servers.remove(name.toLowerCase()); new Thread(() -> { - UniversalFile to = new UniversalFile(GalaxiEngine.getInstance().getRuntimeDirectory(), "Recently Deleted:" + server.getName().toLowerCase()); + File to = new File(GalaxiEngine.getInstance().getRuntimeDirectory(), "Recently Deleted/" + server.getName().toLowerCase()); try { File from = new File(host.host.getRawString("Directory"), server.getPath()); if (from.exists()) { log.info("Removing Files..."); if (recycle) { if (to.exists()) { - if (to.isDirectory()) Util.deleteDirectory(to); + if (to.isDirectory()) Directories.delete(to); else to.delete(); } to.mkdirs(); - Util.copyDirectory(from, to); + Directories.copy(from, to); } - Util.deleteDirectory(from); + Directories.delete(from); } } catch (Exception e) { SubAPI.getInstance().getAppInfo().getLogger().error.println(e); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDownloadTemplates.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDownloadTemplates.java index 49d692f4..82da85d2 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDownloadTemplates.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExDownloadTemplates.java @@ -1,8 +1,7 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Engine.GalaxiEngine; -import net.ME1312.Galaxi.Library.UniversalFile; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Directories; import net.ME1312.SubData.Client.Protocol.PacketOut; import net.ME1312.SubData.Client.Protocol.PacketStreamIn; import net.ME1312.SubData.Client.SubDataSender; @@ -37,9 +36,9 @@ public class PacketExDownloadTemplates implements PacketOut, PacketStreamIn { @Override public void receive(SubDataSender client, InputStream stream) { - UniversalFile dir = new UniversalFile(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache:Remote:Templates"); + File dir = new File(GalaxiEngine.getInstance().getRuntimeDirectory(), "Cache/Remote/Templates"); try { - if (dir.exists()) Util.deleteDirectory(dir); + if (dir.exists()) Directories.delete(dir); } catch (Exception e) { SubAPI.getInstance().getAppInfo().getLogger().error.println(e); } @@ -54,7 +53,7 @@ public class PacketExDownloadTemplates implements PacketOut, PacketStreamIn { File newFile = new File(dir + File.separator + entry.getName().replace('/', File.separatorChar)); if (newFile.exists()) { if (newFile.isDirectory()) { - Util.deleteDirectory(newFile); + Directories.delete(newFile); } else { newFile.delete(); } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java index bd3efe78..b59f672a 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExRemoveServer.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; @@ -29,7 +30,7 @@ public class PacketExRemoveServer implements PacketObjectIn, PacketObje * @param host ExHost */ public PacketExRemoveServer(ExHost host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.host = host; } @@ -40,7 +41,7 @@ public class PacketExRemoveServer implements PacketObjectIn, PacketObje * @param tracker Receiver ID */ public PacketExRemoveServer(int response, UUID tracker) { - if (Util.isNull(response)) throw new NullPointerException(); + Util.nullpo(response); this.response = response; this.tracker = tracker; } @@ -55,7 +56,7 @@ public class PacketExRemoveServer implements PacketObjectIn, PacketObje @Override public void receive(SubDataSender client, ObjectMap data) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection())); UUID tracker = (data.contains(0x0000)?data.getUUID(0x0000):null); try { String name = data.getRawString(0x0001); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExReload.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExReload.java index 5208e491..659e3fcb 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExReload.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExReload.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataClient; @@ -26,7 +27,7 @@ public class PacketInExReload implements PacketObjectIn { @Override public void receive(SubDataSender client, ObjectMap data) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); if (data != null && data.contains(0x0000)) log.warning("Received request for a plugin reload: " + data.getString(0x0000)); // else log.warning("Received request for a plugin reload"); new Thread(() -> { diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExRunEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExRunEvent.java index e6acf67b..75d8da66 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInExRunEvent.java @@ -1,7 +1,6 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Engine.GalaxiEngine; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -12,113 +11,114 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; /** * Run Event Packet */ public class PacketInExRunEvent implements PacketObjectIn { - private static HashMap>>> callbacks = new HashMap>>>(); + private static HashMap>>> callbacks = new HashMap>>>(); /** * New PacketInRunEvent */ public PacketInExRunEvent() { - callback("SubAddHostEvent", new Callback>() { + callback("SubAddHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubAddHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"))); callback("SubAddHostEvent", this); } }); - callback("SubAddProxyEvent", new Callback>() { + callback("SubAddProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubAddProxyEvent(data.getRawString("proxy"))); callback("SubAddProxyEvent", this); } }); - callback("SubAddServerEvent", new Callback>() { + callback("SubAddServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubAddServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server"))); callback("SubAddServerEvent", this); } }); - callback("SubCreateEvent", new Callback>() { + callback("SubCreateEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubCreateEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"), data.getRawString("name"), data.getRawString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"))); callback("SubCreateEvent", this); } }); - callback("SubCreatedEvent", new Callback>() { + callback("SubCreatedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubCreatedEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"), data.getRawString("name"), data.getRawString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); callback("SubCreatedEvent", this); } }); - callback("SubSendCommandEvent", new Callback>() { + callback("SubSendCommandEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubSendCommandEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), data.getRawString("command"))); callback("SubSendCommandEvent", this); } }); - callback("SubEditServerEvent", new Callback>() { + callback("SubEditServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubEditServerEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), new ContainedPair(data.getRawString("edit"), data.get("value")))); callback("SubEditServerEvent", this); } }); - callback("SubStartEvent", new Callback>() { + callback("SubStartEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubStartEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"))); callback("SubStartEvent", this); } }); - callback("SubStartedEvent", new Callback>() { + callback("SubStartedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubStartedEvent(data.getRawString("server"))); callback("SubStartedEvent", this); } }); - callback("SubStopEvent", new Callback>() { + callback("SubStopEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubStopEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), data.getBoolean("force"))); callback("SubStopEvent", this); } }); - callback("SubStoppedEvent", new Callback>() { + callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubStoppedEvent(data.getRawString("server"))); callback("SubStoppedEvent", this); } }); - callback("SubRemoveServerEvent", new Callback>() { + callback("SubRemoveServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubRemoveServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server"))); callback("SubRemoveServerEvent", this); } }); - callback("SubRemoveProxyEvent", new Callback>() { + callback("SubRemoveProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubAddProxyEvent(data.getRawString("proxy"))); callback("SubRemoveProxyEvent", this); } }); - callback("SubRemoveHostEvent", new Callback>() { + callback("SubRemoveHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { GalaxiEngine.getInstance().getPluginManager().executeEvent(new SubRemoveHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"))); callback("SubRemoveHostEvent", this); } @@ -129,10 +129,10 @@ public class PacketInExRunEvent implements PacketObjectIn { @Override public void receive(SubDataSender client, ObjectMap data) { if (callbacks.keySet().contains(data.getString(0x0000))) { - List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); + List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); PacketInExRunEvent.callbacks.remove(data.getString(0x0000)); - for (Callback> callback : callbacks) { - callback.run(new ObjectMap<>((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks) { + callback.accept(new ObjectMap<>((Map) data.getObject(0x0001))); } } } @@ -142,8 +142,8 @@ public class PacketInExRunEvent implements PacketObjectIn { return 0x0001; } - public static void callback(String event, Callback> callback) { - List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); + public static void callback(String event, Consumer> callback) { + List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); callbacks.add(callback); PacketInExRunEvent.callbacks.put(event, callbacks); } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketLinkExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketLinkExHost.java index 8c578e53..0ba4f166 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketLinkExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketLinkExHost.java @@ -2,6 +2,7 @@ package net.ME1312.SubServers.Host.Network.Packet; import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Library.DebugUtil; import net.ME1312.SubData.Client.Protocol.Initial.InitialPacket; @@ -26,7 +27,7 @@ public class PacketLinkExHost implements InitialPacket, PacketObjectIn, * @param host SubServers.Host */ public PacketLinkExHost(ExHost host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.host = host; } @@ -36,7 +37,7 @@ public class PacketLinkExHost implements InitialPacket, PacketObjectIn, * @param host SubServers.Host */ public PacketLinkExHost(ExHost host, int channel) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.host = host; this.channel = channel; } @@ -51,7 +52,7 @@ public class PacketLinkExHost implements InitialPacket, PacketObjectIn, @Override public void receive(SubDataSender client, ObjectMap data) throws Throwable { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection()), null); + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.getConnection())); if (data.getInt(0x0001) == 0) { setReady(client.getConnection()); } else { diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java index b3a7cbf2..314a87f1 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubProtocol.java @@ -1,8 +1,8 @@ package net.ME1312.SubServers.Host.Network; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -18,6 +18,7 @@ import java.io.File; import java.io.IOException; import java.net.InetAddress; import java.util.HashMap; +import java.util.function.Consumer; import java.util.logging.Logger; /** @@ -138,9 +139,9 @@ public class SubProtocol extends SubDataProtocol { } @Override - protected SubDataClient sub(Callback scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { + protected SubDataClient sub(Consumer scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { ExHost host = SubAPI.getInstance().getInternals(); - HashMap map = Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("subdata"), host), null); + HashMap map = Try.all.get(() -> Util.reflect(ExHost.class.getDeclaredField("subdata"), host)); int channel = 1; while (map.keySet().contains(channel)) channel++; @@ -156,9 +157,9 @@ public class SubProtocol extends SubDataProtocol { @SuppressWarnings("deprecation") @Override - public SubDataClient open(Callback scheduler, Logger logger, InetAddress address, int port) throws IOException { + public SubDataClient open(Consumer scheduler, Logger logger, InetAddress address, int port) throws IOException { ExHost host = SubAPI.getInstance().getInternals(); - HashMap map = Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("subdata"), host), null); + HashMap map = Try.all.get(() -> Util.reflect(ExHost.class.getDeclaredField("subdata"), host)); SubDataClient subdata = super.open(scheduler, logger, address, port); subdata.sendPacket(new PacketLinkExHost(host, 0)); @@ -173,9 +174,9 @@ public class SubProtocol extends SubDataProtocol { SubNetworkDisconnectEvent event = new SubNetworkDisconnectEvent(client.value(), client.key()); host.engine.getPluginManager().executeEvent(event); - if (Util.getDespiteException(() -> Util.reflect(ExHost.class.getDeclaredField("running"), host), true)) { - Logger log = Util.getDespiteException(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.value()), null); - Util.isException(() -> Util.reflect(ExHost.class.getDeclaredMethod("connect", Logger.class, Pair.class), host, log, client)); + if (Try.all.get(() -> Util.reflect(ExHost.class.getDeclaredField("running"), host), true)) { + Logger log = Try.all.get(() -> Util.reflect(SubDataClient.class.getDeclaredField("log"), client.value())); + Try.all.run(() -> Util.reflect(ExHost.class.getDeclaredMethod("connect", Logger.class, Pair.class), host, log, client)); } else map.put(0, null); }); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java index 3ae0d7a3..5111edef 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java @@ -4,10 +4,12 @@ import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Plugin.PluginInfo; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.DataProtocol; -import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.ClientAPI; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; /** * SubAPI Class @@ -89,7 +91,7 @@ public final class SubAPI extends ClientAPI { * @return Lang Value */ public Map getLang(String channel) { - if (Util.isNull(channel)) throw new NullPointerException(); + Util.nullpo(channel); return new LinkedHashMap<>(host.lang.value().get(channel.toLowerCase())); } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java index 105cdc80..d0497c80 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java @@ -1,20 +1,18 @@ package net.ME1312.SubServers.Host; +import net.ME1312.Galaxi.Command.Command; import net.ME1312.Galaxi.Command.CommandProcessor.Status; +import net.ME1312.Galaxi.Command.CommandSender; +import net.ME1312.Galaxi.Command.CompletionHandler; import net.ME1312.Galaxi.Engine.CommandParser; import net.ME1312.Galaxi.Engine.GalaxiEngine; import net.ME1312.Galaxi.Library.AsyncConsolidator; -import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Version.Version; -import net.ME1312.Galaxi.Command.Command; -import net.ME1312.Galaxi.Command.CommandSender; -import net.ME1312.Galaxi.Command.CompletionHandler; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.Network.API.*; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketCreateServer; @@ -25,6 +23,8 @@ import net.ME1312.SubServers.Host.Network.Packet.PacketInExRunEvent; import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Supplier; /** * Command Class @@ -335,7 +335,7 @@ public class SubCommand { String Last = (args.length > 0)?args[args.length - 1]:""; String last = Last.toLowerCase(); - ReturnRunnable> getPlayers = () -> { + Supplier> getPlayers = () -> { LinkedList names = new LinkedList(); if (proxyMasterCache != null) for (Pair player : proxyMasterCache.getPlayers()) @@ -381,7 +381,7 @@ public class SubCommand { if (!list.contains(server.getName()) && server.getName().toLowerCase().startsWith(last)) list.add(Last + server.getName().substring(last.length())); } - for (String player : getPlayers.run()) { + for (String player : getPlayers.get()) { if (!list.contains(player) && player.toLowerCase().startsWith(last)) list.add(Last + player.substring(last.length())); } @@ -422,8 +422,10 @@ public class SubCommand { list.add(Last + server.getName().substring(last.length())); } break; + case "u": + case "user": case "player": - for (String player : getPlayers.run()) { + for (String player : getPlayers.get()) { if (player.toLowerCase().startsWith(last)) list.add(Last + player.substring(last.length())); } @@ -512,7 +514,7 @@ public class SubCommand { selectServers(sender, args, 0, true, select -> { if (select.subservers.length > 0) { // Step 5: Start the stopped Servers once more - Callback starter = server -> server.start(response -> { + Consumer starter = server -> server.start(response -> { switch (response) { case 3: case 4: @@ -542,9 +544,9 @@ public class SubCommand { // Step 4: Listen for stopped Servers final HashMap listening = new HashMap(); - PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() { + PacketInExRunEvent.callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap json) { + public void accept(ObjectMap json) { try { if (listening.size() > 0) { PacketInExRunEvent.callback("SubStoppedEvent", this); @@ -554,7 +556,7 @@ public class SubCommand { timer.schedule(new TimerTask() { @Override public void run() { - starter.run(listening.get(name)); + starter.accept(listening.get(name)); listening.remove(name); timer.cancel(); } @@ -582,7 +584,7 @@ public class SubCommand { sender.sendMessage("Could not restart server: Subserver " + server.getName() + " has disappeared"); break; case 5: - starter.run(server); + starter.accept(server); case 0: success.value++; break; @@ -755,7 +757,7 @@ public class SubCommand { public void command(CommandSender sender, String handle, String[] args) { if (canRun()) { if (args.length > 2) { - if (args.length > 4 && Util.isException(() -> Integer.parseInt(args[4]))) { + if (args.length > 4 && !Try.all.run(() -> Integer.parseInt(args[4]))) { sender.sendMessage("Invalid port number"); } else { ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCreateServer(null, args[0], args[1], args[2], (args.length > 3)?new Version(args[3]):null, (args.length > 4)?Integer.parseInt(args[4]):null, data -> { @@ -979,7 +981,7 @@ public class SubCommand { ).register("del", "delete", "remove"); } - private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, Callback callback) { + private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, Consumer callback) { StackTraceElement[] origin = new Exception().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList args = new LinkedList(); @@ -1025,7 +1027,7 @@ public class SubCommand { } try { - callback.run(new ServerSelection(msgs, selection, servers, subservers, args, last.value())); + callback.accept(new ServerSelection(msgs, selection, servers, subservers, args, last.value())); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java index e631bb55..5071d5b6 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java @@ -21,7 +21,7 @@ public class SubAddHostEvent extends Event implements SubEvent { * @param host Host to be added */ public SubAddHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java index bf8a515c..30231c8b 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java @@ -17,7 +17,7 @@ public class SubAddProxyEvent extends Event implements SubEvent { * @param proxy Host Being Added */ public SubAddProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java index dbc05be7..b2a2af4f 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java @@ -22,7 +22,7 @@ public class SubAddServerEvent extends Event implements SubEvent { * @param server Server Starting */ public SubAddServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java index 96e25411..252e68c7 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; @@ -11,6 +10,7 @@ import net.md_5.bungee.api.plugin.Event; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Create Event @@ -35,7 +35,7 @@ public class SubCreateEvent extends Event implements SubEvent { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - if (Util.isNull(host, name, template, version, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, version, port); this.player = player; this.update = update; this.host = host; @@ -68,10 +68,10 @@ public class SubCreateEvent extends Event implements SubEvent { * * @param callback Updating Server */ - public void getUpdatingServer(Callback callback) { + public void getUpdatingServer(Consumer callback) { if (!update) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java index a578ea97..b60af5d5 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Sync.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; @@ -11,6 +10,7 @@ import net.md_5.bungee.api.plugin.Event; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Created Event @@ -36,7 +36,7 @@ public class SubCreatedEvent extends Event implements SubEvent { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.success = success; this.update = update; @@ -79,10 +79,10 @@ public class SubCreatedEvent extends Event implements SubEvent { * * @param callback Updating Server */ - public void getServer(Callback callback) { + public void getServer(Consumer callback) { if (!update && !success) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java index 6e766cbe..97f8e03a 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java @@ -27,7 +27,7 @@ public class SubEditServerEvent extends Event implements SubEvent { * @param edit Edit to make */ public SubEditServerEvent(UUID player, String server, Pair edit) { - if (Util.isNull(server, edit)) throw new NullPointerException(); + Util.nullpo(server, edit); ObjectMap section = new ObjectMap(); section.set(".", edit.value()); this.player = player; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java index 388cd120..efbf9c0a 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java @@ -16,7 +16,7 @@ public class SubNetworkConnectEvent extends Event implements SubEvent { * SubData Network Connect Event */ public SubNetworkConnectEvent(DataClient network) { - if (Util.isNull(network)) throw new NullPointerException(); + Util.nullpo(network); this.network = network; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java index 8720d47f..aa991748 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java @@ -18,7 +18,7 @@ public class SubNetworkDisconnectEvent extends Event implements SubEvent { * SubData Network Disconnect Event */ public SubNetworkDisconnectEvent(DataClient network, DisconnectReason reason) { - if (Util.isNull(network, reason)) throw new NullPointerException(); + Util.nullpo(network, reason); this.network = network; this.reason = reason; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java index 39ea9e91..26839f1e 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java @@ -21,7 +21,7 @@ public class SubRemoveHostEvent extends Event implements SubEvent { * @param host Server Starting */ public SubRemoveHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java index d3cf546a..210d0fa5 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java @@ -17,7 +17,7 @@ public class SubRemoveProxyEvent extends Event implements SubEvent { * @param proxy Host Being Added */ public SubRemoveProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java index ca1c6787..25e1ad9f 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java @@ -22,7 +22,7 @@ public class SubRemoveServerEvent extends Event implements SubEvent { * @param server Server Starting */ public SubRemoveServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java index a58aeb79..8b50ccdd 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java @@ -22,7 +22,7 @@ public class SubSendCommandEvent extends Event implements SubEvent { * @param server Server being Commanded */ public SubSendCommandEvent(UUID player, String server, String command) { - if (Util.isNull(server, command)) throw new NullPointerException(); + Util.nullpo(server, command); this.player = player; this.server = server; this.command = command; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java index 182ead37..9c5d4644 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java @@ -22,7 +22,7 @@ public class SubStartEvent extends Event implements SubEvent { * @param server Server Starting */ public SubStartEvent(UUID player, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.server = server; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java index ffdb7eb5..1e75babd 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartedEvent.java @@ -18,7 +18,7 @@ public class SubStartedEvent extends Event implements SubEvent { * @param server Server that Started */ public SubStartedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java index b25106fb..153d23f3 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java @@ -23,7 +23,7 @@ public class SubStopEvent extends Event implements SubEvent { * @param force If it was a Forced Shutdown */ public SubStopEvent(UUID player, String server, boolean force) { - if (Util.isNull(server, force)) throw new NullPointerException(); + Util.nullpo(server, force); this.player = player; this.server = server; this.force = force; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java index 9be1aaf2..f4a9b86d 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java @@ -17,7 +17,7 @@ public class SubStoppedEvent extends Event implements SubEvent { * @param server Server that Stopped */ public SubStoppedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java index 31c452fc..708ad054 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java @@ -4,7 +4,7 @@ import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; @@ -18,7 +18,10 @@ import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger; import net.ME1312.SubServers.Bungee.Library.Fallback.FallbackState; import net.ME1312.SubServers.Bungee.Library.Fallback.SmartFallback; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDisconnectPlayer; -import net.ME1312.SubServers.Sync.Event.*; +import net.ME1312.SubServers.Sync.Event.SubAddServerEvent; +import net.ME1312.SubServers.Sync.Event.SubRemoveServerEvent; +import net.ME1312.SubServers.Sync.Event.SubStartEvent; +import net.ME1312.SubServers.Sync.Event.SubStoppedEvent; import net.ME1312.SubServers.Sync.Library.ConfigUpdater; import net.ME1312.SubServers.Sync.Library.Metrics; import net.ME1312.SubServers.Sync.Network.Packet.PacketExSyncPlayer; @@ -31,7 +34,6 @@ import com.dosse.upnp.UPnP; import com.google.gson.Gson; import net.md_5.bungee.BungeeServerInfo; import net.md_5.bungee.UserConnection; -import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.ServerPing; import net.md_5.bungee.api.chat.BaseComponent; @@ -67,7 +69,7 @@ public final class ExProxy extends BungeeCommon implements Listener { private final HashMap fallback = new HashMap(); public final PrintStream out; - public final UniversalFile dir = new UniversalFile(new File(System.getProperty("user.dir"))); + public final File dir = new File(System.getProperty("user.dir")); public YAMLConfig config; public final Plugin plugin; public final SubAPI api = new SubAPI(this); @@ -85,21 +87,21 @@ public final class ExProxy extends BungeeCommon implements Listener { this.isPatched = isPatched; Logger.get("SubServers").info("Loading SubServers.Sync v" + version.toString() + " Libraries (for Minecraft " + api.getGameVersion()[api.getGameVersion().length - 1] + ")"); - Util.isException(() -> new CachedPlayer((ProxiedPlayer) null)); // runs + Try.all.run(() -> new CachedPlayer((ProxiedPlayer) null)); // runs this.out = out; - if (!(new UniversalFile(dir, "config.yml").exists())) { - Util.copyFromJar(ExProxy.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/bungee.yml", new UniversalFile(dir, "config.yml").getPath()); - YAMLConfig tmp = new YAMLConfig(new UniversalFile("config.yml")); + if (!(new File(dir, "config.yml").exists())) { + Util.copyFromJar(ExProxy.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/bungee.yml", new File(dir, "config.yml").getPath()); + YAMLConfig tmp = new YAMLConfig(new File("config.yml")); tmp.get().set("stats", UUID.randomUUID().toString()); tmp.save(); Logger.get("SubServers").info("Created ./config.yml"); } - UniversalFile dir = new UniversalFile(this.dir, "SubServers"); + File dir = new File(this.dir, "SubServers"); dir.mkdir(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "sync.yml")); - config = new YAMLConfig(new UniversalFile(dir, "sync.yml")); + ConfigUpdater.updateConfig(new File(dir, "sync.yml")); + config = new YAMLConfig(new File(dir, "sync.yml")); SmartFallback.addInspector((player, server) -> { double confidence = 0; @@ -130,7 +132,7 @@ public final class ExProxy extends BungeeCommon implements Listener { PluginDescription description = new PluginDescription(); description.setName("SubServers-Sync"); description.setMain(net.ME1312.SubServers.Sync.Library.Compatibility.Plugin.class.getCanonicalName()); - description.setFile(Util.getDespiteException(() -> new File(ExProxy.class.getProtectionDomain().getCodeSource().getLocation().toURI()), null)); + description.setFile(Try.all.get(() -> new File(ExProxy.class.getProtectionDomain().getCodeSource().getLocation().toURI()))); description.setVersion(version.toString()); description.setAuthor("ME1312"); @@ -165,7 +167,7 @@ public final class ExProxy extends BungeeCommon implements Listener { SmartFallback.dns_forward = config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()).getBoolean("DNS-Forward", false); resetDate = Calendar.getInstance().getTime().getTime(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "SubServers:sync.yml")); + ConfigUpdater.updateConfig(new File(dir, "SubServers/sync.yml")); config.reload(); synchronized (rPlayers) { @@ -193,9 +195,9 @@ public final class ExProxy extends BungeeCommon implements Listener { Logger.get("SubData").info("AES Encryption Available"); } - if (new UniversalFile(dir, "SubServers:subdata.rsa.key").exists()) { + if (new File(dir, "SubServers/subdata.rsa.key").exists()) { try { - subprotocol.registerCipher("RSA", new RSA(new UniversalFile(dir, "SubServers:subdata.rsa.key"))); + subprotocol.registerCipher("RSA", new RSA(new File(dir, "SubServers/subdata.rsa.key"))); Logger.get("SubData").info("RSA Encryption Available"); } catch (Exception e) { e.printStackTrace(); @@ -410,7 +412,7 @@ public final class ExProxy extends BungeeCommon implements Listener { tmp.addAll(subdata.values()); for (SubDataClient client : tmp) if (client != null) { client.close(); - Util.isException(client::waitFor); + Try.all.run(client::waitFor); } subdata.clear(); subdata.put(0, null); @@ -450,7 +452,7 @@ public final class ExProxy extends BungeeCommon implements Listener { lock.value = false; if (mode) e.completeIntent(plugin); }, ((InitialHandler) e.getConnection()).getHandshake().getProtocolVersion()); - if (!mode) while (lock.value) Util.isException(() -> Thread.sleep(4)); + if (!mode) while (lock.value) Try.all.run(() -> Thread.sleep(4)); } } } else if (dynamic) { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java index a686b214..dcaab698 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java @@ -1,14 +1,12 @@ package net.ME1312.SubServers.Sync; import net.ME1312.Galaxi.Library.Platform; -import net.ME1312.Galaxi.Library.Util; -import net.ME1312.Galaxi.Library.Version.Version; +import net.ME1312.Galaxi.Library.Try; import java.security.Security; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import java.util.logging.Logger; /** * SubServers/BungeeCord Launch Class @@ -26,7 +24,7 @@ public final class Launch { System.setProperty("jdk.util.jar.enableMultiRelease", "force"); System.setProperty("apple.laf.useScreenMenuBar", "true"); - if (Util.getDespiteException(() -> Class.forName("net.md_5.bungee.BungeeCord") == null, true)) { + if (Try.all.get(() -> Class.forName("net.md_5.bungee.BungeeCord") == null, true)) { System.out.println(""); System.out.println("*******************************************"); System.out.println("*** Error: BungeeCord.jar Doesn't Exist ***"); @@ -92,9 +90,9 @@ public final class Launch { if (!options.has("noconsole")) { try { - if (Util.getDespiteException(() -> Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("readCommands") != null, false)) { // Waterfall Setup + if (Try.all.get(() -> Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("readCommands") != null, false)) { // Waterfall Setup Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("readCommands").invoke(null); - } else if (Util.getDespiteException(() -> Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("start") != null, false)) { + } else if (Try.all.get(() -> Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole").getMethod("start") != null, false)) { Class console = Class.forName("io.github.waterfallmc.waterfall.console.WaterfallConsole"); console.getMethod("start").invoke(console.getConstructor().newInstance()); } else { diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermission.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermission.java index cd4fea14..059f1a46 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermission.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermission.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Sync.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.Forwardable; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Check Permission Packet */ public class PacketCheckPermission implements Forwardable, PacketObjectIn, PacketObjectOut { - static HashMap[]> callbacks = new HashMap[]>(); + static HashMap[]> callbacks = new HashMap[]>(); private UUID player; private String permission; private UUID tracker; @@ -33,7 +33,7 @@ public class PacketCheckPermission implements Forwardable, PacketObjectIn... callback) { + public PacketCheckPermission(UUID player, String permission, Consumer... callback) { this.player = player; this.permission = permission; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermissionResponse.java index 23271a89..5b0d7fda 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketCheckPermissionResponse.java @@ -1,8 +1,7 @@ package net.ME1312.SubServers.Sync.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.SubData.Client.Protocol.Forwardable; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; @@ -11,6 +10,7 @@ import net.ME1312.SubData.Client.SubDataSender; import net.md_5.bungee.api.ProxyServer; import java.util.UUID; +import java.util.function.Consumer; import static net.ME1312.SubServers.Sync.Network.Packet.PacketCheckPermission.callbacks; @@ -35,7 +35,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI * @param tracker Receiver ID */ public PacketCheckPermissionResponse(UUID player, String permission, UUID tracker) { - this.result = Util.getDespiteException(() -> ProxyServer.getInstance().getPlayer(player).hasPermission(permission), false); + this.result = Try.all.get(() -> ProxyServer.getInstance().getPlayer(player).hasPermission(permission), false); this.tracker = tracker; } @@ -49,7 +49,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI @Override public void receive(SubDataSender client, ObjectMap data) throws Throwable { - for (Callback callback : callbacks.get(data.getUUID(0x0000))) callback.run(data.getBoolean(0x0001)); + for (Consumer callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data.getBoolean(0x0001)); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java index 99ee41b1..f56ccab9 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketDownloadLang.java @@ -23,7 +23,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut { * @param plugin SubServers.Client */ public PacketDownloadLang(ExProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExDisconnectPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExDisconnectPlayer.java index 291f2c9e..f75a3622 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExDisconnectPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExDisconnectPlayer.java @@ -5,7 +5,6 @@ import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Sync.ExProxy; -import net.ME1312.SubServers.Sync.Server.ServerImpl; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExMessagePlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExMessagePlayer.java index b979a6d7..b3ea1006 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExMessagePlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExMessagePlayer.java @@ -11,8 +11,6 @@ import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.chat.ComponentSerializer; -import java.util.Arrays; -import java.util.LinkedList; import java.util.List; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java index e82ea4f8..c2a70e5c 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExSyncPlayer.java @@ -28,7 +28,7 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject * @param plugin SubPlugin */ public PacketExSyncPlayer(ExProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExTransferPlayer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExTransferPlayer.java index b3c60881..1c218866 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExTransferPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketExTransferPlayer.java @@ -7,12 +7,8 @@ import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Sync.ExProxy; import net.ME1312.SubServers.Sync.Server.ServerImpl; -import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.chat.ComponentSerializer; -import java.util.Arrays; -import java.util.LinkedList; import java.util.List; import java.util.UUID; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExEditServer.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExEditServer.java index e4989d86..c3038b06 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExEditServer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExEditServer.java @@ -1,14 +1,11 @@ package net.ME1312.SubServers.Sync.Network.Packet; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Sync.ExProxy; import net.ME1312.SubServers.Sync.Server.ServerImpl; -import java.util.ArrayList; - /** * Server Edit Notification Packet */ diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExRunEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExRunEvent.java index e2e2d4b1..838e779f 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketInExRunEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Sync.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -14,113 +13,114 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; /** * Run Event Packet */ public class PacketInExRunEvent implements PacketObjectIn { - private static HashMap>>> callbacks = new HashMap>>>(); + private static HashMap>>> callbacks = new HashMap>>>(); /** * New PacketInExRunEvent */ public PacketInExRunEvent(ExProxy plugin) { - callback("SubAddHostEvent", new Callback>() { + callback("SubAddHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubAddHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"))); callback("SubAddHostEvent", this); } }); - callback("SubAddProxyEvent", new Callback>() { + callback("SubAddProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubAddProxyEvent(data.getRawString("proxy"))); callback("SubAddProxyEvent", this); } }); - callback("SubAddServerEvent", new Callback>() { + callback("SubAddServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubAddServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server"))); callback("SubAddServerEvent", this); } }); - callback("SubCreateEvent", new Callback>() { + callback("SubCreateEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubCreateEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"), data.getRawString("name"), data.getRawString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"))); callback("SubCreateEvent", this); } }); - callback("SubCreatedEvent", new Callback>() { + callback("SubCreatedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubCreatedEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"), data.getRawString("name"), data.getRawString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); callback("SubCreatedEvent", this); } }); - callback("SubSendCommandEvent", new Callback>() { + callback("SubSendCommandEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubSendCommandEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), data.getRawString("command"))); callback("SubSendCommandEvent", this); } }); - callback("SubEditServerEvent", new Callback>() { + callback("SubEditServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubEditServerEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), new ContainedPair(data.getRawString("edit"), data.get("value")))); callback("SubEditServerEvent", this); } }); - callback("SubStartEvent", new Callback>() { + callback("SubStartEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubStartEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"))); callback("SubStartEvent", this); } }); - callback("SubStartedEvent", new Callback>() { + callback("SubStartedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubStartedEvent(data.getRawString("server"))); callback("SubStartedEvent", this); } }); - callback("SubStopEvent", new Callback>() { + callback("SubStopEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubStopEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), data.getBoolean("force"))); callback("SubStopEvent", this); } }); - callback("SubStoppedEvent", new Callback>() { + callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubStoppedEvent(data.getRawString("server"))); callback("SubStoppedEvent", this); } }); - callback("SubRemoveServerEvent", new Callback>() { + callback("SubRemoveServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubRemoveServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server"))); callback("SubRemoveServerEvent", this); } }); - callback("SubRemoveProxyEvent", new Callback>() { + callback("SubRemoveProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubAddProxyEvent(data.getRawString("proxy"))); callback("SubRemoveProxyEvent", this); } }); - callback("SubRemoveHostEvent", new Callback>() { + callback("SubRemoveHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ProxyServer.getInstance().getPluginManager().callEvent(new SubRemoveHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"))); callback("SubRemoveHostEvent", this); } @@ -131,10 +131,10 @@ public class PacketInExRunEvent implements PacketObjectIn { @Override public void receive(SubDataSender client, ObjectMap data) { if (callbacks.keySet().contains(data.getString(0x0000))) { - List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); + List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); PacketInExRunEvent.callbacks.remove(data.getString(0x0000)); - for (Callback> callback : callbacks) { - callback.run(new ObjectMap<>((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks) { + callback.accept(new ObjectMap<>((Map) data.getObject(0x0001))); } } } @@ -144,8 +144,8 @@ public class PacketInExRunEvent implements PacketObjectIn { return 0x0001; } - public static void callback(String event, Callback> callback) { - List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); + public static void callback(String event, Consumer> callback) { + List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); callbacks.add(callback); PacketInExRunEvent.callbacks.put(event, callbacks); } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketLinkProxy.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketLinkProxy.java index fae18054..46daf62d 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketLinkProxy.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/Packet/PacketLinkProxy.java @@ -23,7 +23,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn, * @param plugin SubServers.Client */ public PacketLinkProxy(ExProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } /** @@ -33,7 +33,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn, * @param channel Channel ID */ public PacketLinkProxy(ExProxy plugin, int channel) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.channel = channel; } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java index 029b4285..a13f2923 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Network/SubProtocol.java @@ -1,8 +1,8 @@ package net.ME1312.SubServers.Sync.Network; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; import java.util.UUID; +import java.util.function.Consumer; import java.util.logging.Logger; /** @@ -133,9 +134,9 @@ public class SubProtocol extends SubDataProtocol { } @Override - protected SubDataClient sub(Callback scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { + protected SubDataClient sub(Consumer scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { ExProxy plugin = SubAPI.getInstance().getInternals(); - HashMap map = Util.getDespiteException(() -> Util.reflect(ExProxy.class.getDeclaredField("subdata"), plugin), null); + HashMap map = Try.all.get(() -> Util.reflect(ExProxy.class.getDeclaredField("subdata"), plugin)); int channel = 1; while (map.keySet().contains(channel)) channel++; @@ -151,10 +152,10 @@ public class SubProtocol extends SubDataProtocol { @SuppressWarnings("deprecation") @Override - public SubDataClient open(Callback scheduler, Logger logger, InetAddress address, int port) throws IOException { + public SubDataClient open(Consumer scheduler, Logger logger, InetAddress address, int port) throws IOException { ExProxy plugin = SubAPI.getInstance().getInternals(); SubDataClient subdata = super.open(scheduler, logger, address, port); - HashMap map = Util.getDespiteException(() -> Util.reflect(ExProxy.class.getDeclaredField("subdata"), plugin), null); + HashMap map = Try.all.get(() -> Util.reflect(ExProxy.class.getDeclaredField("subdata"), plugin)); subdata.sendPacket(new PacketLinkProxy(plugin, 0)); subdata.sendPacket(new PacketDownloadLang()); @@ -226,7 +227,7 @@ public class SubProtocol extends SubDataProtocol { if (plugin.isRunning) { Logger log = net.ME1312.SubServers.Bungee.Library.Compatibility.Logger.get("SubData"); - Util.isException(() -> Util.reflect(ExProxy.class.getDeclaredMethod("connect", Logger.class, Pair.class), plugin, log, client)); + Try.all.run(() -> Util.reflect(ExProxy.class.getDeclaredMethod("connect", Logger.class, Pair.class), plugin, log, client)); } else map.put(0, null); }); 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 cb0ae271..248ef26b 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/CachedPlayer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Sync.Server; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.SubDataClient; @@ -14,7 +13,9 @@ import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.chat.ComponentSerializer; -import java.util.*; +import java.util.ArrayList; +import java.util.UUID; +import java.util.function.IntConsumer; /** * Cached RemotePlayer Data Class @@ -85,24 +86,24 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. // These overrides provide for the static methods in BungeeCommon new RPSI() { @Override - protected void sendMessage(UUID[] players, String[] messages, Callback response) { + protected void sendMessage(UUID[] players, String[] messages, IntConsumer response) { RemotePlayer.sendMessage(players, messages, response); } @Override - protected void sendMessage(UUID[] players, BaseComponent[][] messages, Callback response) { + protected void sendMessage(UUID[] players, BaseComponent[][] messages, IntConsumer response) { String[] raw = new String[messages.length]; for (int i = 0; i < raw.length; ++i) raw[i] = ComponentSerializer.toString(messages[i]); RemotePlayer.sendRawMessage(players, raw, response); } @Override - protected void transfer(UUID[] players, String server, Callback response) { + protected void transfer(UUID[] players, String server, IntConsumer response) { RemotePlayer.transfer(players, server, response); } @Override - protected void disconnect(UUID[] players, String reason, Callback response) { + protected void disconnect(UUID[] players, String reason, IntConsumer response) { RemotePlayer.disconnect(players, reason, response); } }; @@ -114,7 +115,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. } @Override - protected void sendMessage(SubDataClient client, UUID[] players, String[] messages, Callback response) { + protected void sendMessage(SubDataClient client, UUID[] players, String[] messages, IntConsumer response) { if (players != null && players.length > 0) { ArrayList ids = new ArrayList(); for (UUID id : players) { @@ -127,7 +128,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. } if (ids.size() == 0) { - response.run(0); + response.accept(0); } else { super.sendMessage(client, ids.toArray(new UUID[0]), messages, response); } @@ -137,7 +138,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. } @Override - protected void sendRawMessage(SubDataClient client, UUID[] players, String[] messages, Callback response) { + protected void sendRawMessage(SubDataClient client, UUID[] players, String[] messages, IntConsumer response) { if (players != null && players.length > 0) { ArrayList ids = new ArrayList(); BaseComponent[][] components = null; @@ -157,7 +158,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. } if (ids.size() == 0) { - response.run(0); + response.accept(0); } else { super.sendRawMessage(client, ids.toArray(new UUID[0]), messages, response); } @@ -167,7 +168,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. } @Override - protected void transfer(SubDataClient client, UUID[] players, String server, Callback response) { + protected void transfer(SubDataClient client, UUID[] players, String server, IntConsumer response) { ArrayList ids = new ArrayList(); ServerImpl info = SubAPI.getInstance().getInternals().servers.get(server.toLowerCase()); int failures = 0; @@ -183,15 +184,15 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. } if (ids.size() == 0) { - response.run(failures); + response.accept(failures); } else { final int ff = failures; - super.transfer(client, ids.toArray(new UUID[0]), server, i -> response.run(i + ff)); + super.transfer(client, ids.toArray(new UUID[0]), server, i -> response.accept(i + ff)); } } @Override - protected void disconnect(SubDataClient client, UUID[] players, String reason, Callback response) { + protected void disconnect(SubDataClient client, UUID[] players, String reason, IntConsumer response) { ArrayList ids = new ArrayList(); for (UUID id : players) { ProxiedPlayer local = get(id); @@ -205,7 +206,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. } if (ids.size() == 0) { - response.run(0); + response.accept(0); } else { super.disconnect(client, ids.toArray(new UUID[0]), reason, response); } @@ -218,11 +219,11 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(message); } - public static void broadcastMessage(BaseComponent message, Callback response) { + public static void broadcastMessage(BaseComponent message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(message, response); } - public static void broadcastMessage(BaseComponent[] message, Callback response) { + public static void broadcastMessage(BaseComponent[] message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(message, response); } @@ -230,7 +231,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(messages); } - public static void broadcastMessage(BaseComponent[][] messages, Callback response) { + public static void broadcastMessage(BaseComponent[][] messages, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.broadcastMessage(messages, response); } @@ -238,11 +239,11 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, message); } - public static void sendMessage(UUID[] players, BaseComponent message, Callback response) { + public static void sendMessage(UUID[] players, BaseComponent message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, message, response); } - public static void sendMessage(UUID[] players, BaseComponent[] message, Callback response) { + public static void sendMessage(UUID[] players, BaseComponent[] message, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, message, response); } @@ -250,7 +251,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, messages); } - public static void sendMessage(UUID[] players, BaseComponent[][] messages, Callback response) { + public static void sendMessage(UUID[] players, BaseComponent[][] messages, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.sendMessage(players, messages, response); } @@ -258,7 +259,7 @@ public class CachedPlayer extends RemotePlayer implements net.ME1312.SubServers. net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.transfer(players, server); } - public static void transfer(UUID[] players, ServerInfo server, Callback response) { + public static void transfer(UUID[] players, ServerInfo server, IntConsumer response) { net.ME1312.SubServers.Bungee.Library.Compatibility.RemotePlayer.transfer(players, server, response); } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java index 67128d25..14553278 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Server/ServerImpl.java @@ -4,7 +4,6 @@ import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.DataSender; import net.ME1312.SubData.Client.Library.ForwardedDataSender; import net.ME1312.SubData.Client.SubDataClient; -import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Sync.SubAPI; import net.md_5.bungee.BungeeServerInfo; @@ -52,7 +51,7 @@ public class ServerImpl extends BungeeServerInfo { } private void init(String name, String display, SocketAddress address, Map subdata, String motd, boolean hidden, boolean restricted, Collection whitelist) { - if (Util.isNull(name, address, motd, hidden, restricted)) throw new NullPointerException(); + Util.nullpo(name, address, motd, hidden, restricted); this.whitelist.addAll(whitelist); this.hidden = hidden; setDisplayName(display); @@ -137,7 +136,7 @@ public class ServerImpl extends BungeeServerInfo { * @param value Value */ public void setHidden(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); this.hidden = value; } @@ -147,7 +146,7 @@ public class ServerImpl extends BungeeServerInfo { * @param value Value */ public void setMotd(String value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); try { Util.reflect(BungeeServerInfo.class.getDeclaredField("motd"), this, value); } catch (Exception e) { @@ -161,7 +160,7 @@ public class ServerImpl extends BungeeServerInfo { * @param value Value */ public void setRestricted(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); try { Util.reflect(BungeeServerInfo.class.getDeclaredField("restricted"), this, value); } catch (Exception e) { @@ -185,7 +184,7 @@ public class ServerImpl extends BungeeServerInfo { * @param player Player to add */ public void whitelist(UUID player) { - if (Util.isNull(player)) throw new NullPointerException(); + Util.nullpo(player); whitelist.add(player); } diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubAPI.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubAPI.java index 16c06ab9..7948dc59 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubAPI.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubAPI.java @@ -1,7 +1,6 @@ package net.ME1312.SubServers.Sync; -import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; @@ -9,13 +8,13 @@ import net.ME1312.SubData.Client.DataProtocol; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Bungee.BungeeAPI; import net.ME1312.SubServers.Client.Common.ClientAPI; -import net.ME1312.SubServers.Client.Common.Network.API.RemotePlayer; import net.ME1312.SubServers.Sync.Server.CachedPlayer; import net.ME1312.SubServers.Sync.Server.ServerImpl; import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.protocol.ProtocolConstants; +import java.io.File; import java.util.*; /** @@ -103,7 +102,7 @@ public final class SubAPI extends ClientAPI implements BungeeAPI { * @return Remote Player */ public CachedPlayer getRemotePlayer(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); for (CachedPlayer player : getRemotePlayers().values()) { if (player.getName().equalsIgnoreCase(name)) return player; } @@ -117,7 +116,7 @@ public final class SubAPI extends ClientAPI implements BungeeAPI { * @return Remote Player */ public CachedPlayer getRemotePlayer(UUID id) { - if (Util.isNull(id)) throw new NullPointerException(); + Util.nullpo(id); return getRemotePlayers().getOrDefault(id, null); } @@ -159,7 +158,7 @@ public final class SubAPI extends ClientAPI implements BungeeAPI { * @return Lang Value */ public Map getLang(String channel) { - if (Util.isNull(channel)) throw new NullPointerException(); + Util.nullpo(channel); return new LinkedHashMap<>(plugin.lang.value().get(channel.toLowerCase())); } @@ -168,7 +167,7 @@ public final class SubAPI extends ClientAPI implements BungeeAPI { * * @return Directory */ - public UniversalFile getRuntimeDirectory() { + public File getRuntimeDirectory() { return plugin.dir; } @@ -208,12 +207,12 @@ public final class SubAPI extends ClientAPI implements BungeeAPI { if (GAME_VERSION == null) { if (System.getProperty("subservers.minecraft.version", "").length() > 0) { return new Version[]{new Version(System.getProperty("subservers.minecraft.version"))}; - } else if (Util.getDespiteException(() -> ProtocolConstants.SUPPORTED_VERSIONS != null, false)) { + } else if (Try.all.get(() -> ProtocolConstants.SUPPORTED_VERSIONS != null, false)) { List versions = new LinkedList(); for (String version : ProtocolConstants.SUPPORTED_VERSIONS) versions.add(new Version(version)); Collections.sort(versions); return versions.toArray(new Version[versions.size()]); - } else if (Util.getDespiteException(() -> plugin.getGameVersion() != null, false)) { + } else if (Try.all.get(() -> plugin.getGameVersion() != null, false)) { String raw = plugin.getGameVersion(); if (raw.contains("-") || raw.contains(",")) { List versions = new LinkedList(); diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java index 4c5d24bb..c3deba98 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java @@ -1,14 +1,13 @@ package net.ME1312.SubServers.Sync; import net.ME1312.Galaxi.Library.AsyncConsolidator; -import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Platform; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -41,6 +40,8 @@ import java.net.URL; import java.nio.charset.Charset; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Supplier; @SuppressWarnings("deprecation") public final class SubCommand extends Command implements TabExecutor { @@ -387,7 +388,7 @@ public final class SubCommand extends Command implements TabExecutor { selectServers(sender, args, 1, true, select -> { if (select.subservers.length > 0) { // Step 5: Start the stopped Servers once more - Callback starter = server -> server.start(response -> { + Consumer starter = server -> server.start(response -> { switch (response) { case 3: case 4: @@ -417,9 +418,9 @@ public final class SubCommand extends Command implements TabExecutor { // Step 4: Listen for stopped Servers final HashMap listening = new HashMap(); - PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() { + PacketInExRunEvent.callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap json) { + public void accept(ObjectMap json) { try { if (listening.size() > 0) { PacketInExRunEvent.callback("SubStoppedEvent", this); @@ -429,7 +430,7 @@ public final class SubCommand extends Command implements TabExecutor { timer.schedule(new TimerTask() { @Override public void run() { - starter.run(listening.get(name)); + starter.accept(listening.get(name)); listening.remove(name); timer.cancel(); } @@ -457,7 +458,7 @@ public final class SubCommand extends Command implements TabExecutor { sender.sendMessage("Could not restart server: Subserver " + server.getName() + " has disappeared"); break; case 5: - starter.run(server); + starter.accept(server); case 0: success.value++; break; @@ -581,7 +582,7 @@ public final class SubCommand extends Command implements TabExecutor { } } else if (args[0].equalsIgnoreCase("create")) { if (args.length > 3) { - if (args.length > 5 && Util.isException(() -> Integer.parseInt(args[5]))) { + if (args.length > 5 && !Try.all.run(() -> Integer.parseInt(args[5]))) { sender.sendMessage("SubServers > Invalid port number"); } else { ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCreateServer(null, args[1], args[2],args[3], (args.length > 4)?new Version(args[4]):null, (args.length > 5)?Integer.parseInt(args[5]):null, data -> { @@ -733,7 +734,7 @@ public final class SubCommand extends Command implements TabExecutor { } } - private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, Callback callback) { + private void selectServers(CommandSender sender, String[] rargs, int index, boolean mode, Consumer callback) { StackTraceElement[] origin = new Exception().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList args = new LinkedList(); @@ -779,7 +780,7 @@ public final class SubCommand extends Command implements TabExecutor { } try { - callback.run(new ServerSelection(msgs, selection, servers, subservers, args, last.value())); + callback.accept(new ServerSelection(msgs, selection, servers, subservers, args, last.value())); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -981,7 +982,7 @@ public final class SubCommand extends Command implements TabExecutor { return list; } else { if (args[0].equals("info") || args[0].equals("status")) { - ReturnRunnable> getPlayers = () -> { + Supplier> getPlayers = () -> { LinkedList names = new LinkedList(); for (ProxiedPlayer player : plugin.getPlayers()) names.add(player.getName()); for (CachedPlayer player : plugin.api.getRemotePlayers().values()) if (!names.contains(player.getName())) names.add(player.getName()); @@ -1023,7 +1024,7 @@ public final class SubCommand extends Command implements TabExecutor { if (!list.contains(server.getName()) && server.getName().toLowerCase().startsWith(last)) list.add(Last + server.getName().substring(last.length())); } - for (String player : getPlayers.run()) { + for (String player : getPlayers.get()) { if (!list.contains(player) && player.toLowerCase().startsWith(last)) list.add(Last + player.substring(last.length())); } @@ -1064,8 +1065,10 @@ public final class SubCommand extends Command implements TabExecutor { list.add(Last + server.getName().substring(last.length())); } break; + case "u": + case "user": case "player": - for (String player : getPlayers.run()) { + for (String player : getPlayers.get()) { if (player.toLowerCase().startsWith(last)) list.add(Last + player.substring(last.length())); } @@ -1157,7 +1160,7 @@ public final class SubCommand extends Command implements TabExecutor { return Collections.singletonList("[Version]"); } else if (args.length == 6) { if (last.length() > 0) { - if (Util.isException(() -> Integer.parseInt(last)) || Integer.parseInt(last) <= 0 || Integer.parseInt(last) > 65535) { + if (!Try.all.run(() -> Integer.parseInt(last)) || Integer.parseInt(last) <= 0 || Integer.parseInt(last) > 65535) { return Collections.emptyList(); } } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddHostEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddHostEvent.java index 3822e190..62bd2c8f 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddHostEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddHostEvent.java @@ -19,7 +19,7 @@ public class SubAddHostEvent implements SubEvent { * @param host Host to be added */ public SubAddHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddProxyEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddProxyEvent.java index bf3638c6..5447df24 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddProxyEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddProxyEvent.java @@ -15,7 +15,7 @@ public class SubAddProxyEvent implements SubEvent { * @param proxy Host Being Added */ public SubAddProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddServerEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddServerEvent.java index f31bd255..4859bae4 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddServerEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubAddServerEvent.java @@ -20,7 +20,7 @@ public class SubAddServerEvent implements SubEvent { * @param server Server Starting */ public SubAddServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java index a1d26697..d2625b4e 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Velocity.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; @@ -9,6 +8,7 @@ import net.ME1312.SubServers.Velocity.SubAPI; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Create Event @@ -33,7 +33,7 @@ public class SubCreateEvent implements SubEvent { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - if (Util.isNull(host, name, template, version, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, version, port); this.player = player; this.update = update; this.host = host; @@ -66,10 +66,10 @@ public class SubCreateEvent implements SubEvent { * * @param callback Updating Server */ - public void getUpdatingServer(Callback callback) { + public void getUpdatingServer(Consumer callback) { if (!update) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java index 534acf39..81343e96 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Velocity.Event; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubServers.Client.Common.Network.API.SubServer; @@ -9,6 +8,7 @@ import net.ME1312.SubServers.Velocity.SubAPI; import java.lang.reflect.InvocationTargetException; import java.util.UUID; +import java.util.function.Consumer; /** * Server Created Event @@ -34,7 +34,7 @@ public class SubCreatedEvent implements SubEvent { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - if (Util.isNull(host, name, template, port)) throw new NullPointerException(); + Util.nullpo(host, name, template, port); this.player = player; this.success = success; this.update = update; @@ -77,10 +77,10 @@ public class SubCreatedEvent implements SubEvent { * * @param callback Updating Server */ - public void getServer(Callback callback) { + public void getServer(Consumer callback) { if (!update && !success) { try { - callback.run(null); + callback.accept(null); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.printStackTrace(); diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubEditServerEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubEditServerEvent.java index 8845be3e..12e2db74 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubEditServerEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubEditServerEvent.java @@ -25,7 +25,7 @@ public class SubEditServerEvent implements SubEvent { * @param edit Edit to make */ public SubEditServerEvent(UUID player, String server, Pair edit) { - if (Util.isNull(server, edit)) throw new NullPointerException(); + Util.nullpo(server, edit); ObjectMap section = new ObjectMap(); section.set(".", edit.value()); this.player = player; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubNetworkConnectEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubNetworkConnectEvent.java index 01a213a7..b1226f5c 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubNetworkConnectEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubNetworkConnectEvent.java @@ -14,7 +14,7 @@ public class SubNetworkConnectEvent implements SubEvent { * SubData Network Connect Event */ public SubNetworkConnectEvent(DataClient network) { - if (Util.isNull(network)) throw new NullPointerException(); + Util.nullpo(network); this.network = network; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubNetworkDisconnectEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubNetworkDisconnectEvent.java index 3189cfd1..74b9a5bc 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubNetworkDisconnectEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubNetworkDisconnectEvent.java @@ -16,7 +16,7 @@ public class SubNetworkDisconnectEvent implements SubEvent { * SubData Network Disconnect Event */ public SubNetworkDisconnectEvent(DataClient network, DisconnectReason reason) { - if (Util.isNull(network, reason)) throw new NullPointerException(); + Util.nullpo(network, reason); this.network = network; this.reason = reason; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveHostEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveHostEvent.java index bca27fd4..9772144a 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveHostEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveHostEvent.java @@ -19,7 +19,7 @@ public class SubRemoveHostEvent implements SubEvent { * @param host Server Starting */ public SubRemoveHostEvent(UUID player, String host) { - if (Util.isNull(host)) throw new NullPointerException(); + Util.nullpo(host); this.player = player; this.host = host; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveProxyEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveProxyEvent.java index 497f369d..e154b34a 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveProxyEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveProxyEvent.java @@ -15,7 +15,7 @@ public class SubRemoveProxyEvent implements SubEvent { * @param proxy Host Being Added */ public SubRemoveProxyEvent(String proxy) { - if (Util.isNull(proxy)) throw new NullPointerException(); + Util.nullpo(proxy); this.proxy = proxy; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveServerEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveServerEvent.java index 06246094..b86cb7dc 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveServerEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubRemoveServerEvent.java @@ -20,7 +20,7 @@ public class SubRemoveServerEvent implements SubEvent { * @param server Server Starting */ public SubRemoveServerEvent(UUID player, String host, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.host = host; this.server = server; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubSendCommandEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubSendCommandEvent.java index e93f5fd4..ffcabc2b 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubSendCommandEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubSendCommandEvent.java @@ -20,7 +20,7 @@ public class SubSendCommandEvent implements SubEvent { * @param server Server being Commanded */ public SubSendCommandEvent(UUID player, String server, String command) { - if (Util.isNull(server, command)) throw new NullPointerException(); + Util.nullpo(server, command); this.player = player; this.server = server; this.command = command; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStartEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStartEvent.java index 98c54ec3..cd63cbdf 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStartEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStartEvent.java @@ -20,7 +20,7 @@ public class SubStartEvent implements SubEvent { * @param server Server Starting */ public SubStartEvent(UUID player, String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.player = player; this.server = server; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStartedEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStartedEvent.java index 7d35e9ea..4e8a80fc 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStartedEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStartedEvent.java @@ -16,7 +16,7 @@ public class SubStartedEvent implements SubEvent { * @param server Server that Started */ public SubStartedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStopEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStopEvent.java index 34f804d7..efe2e19c 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStopEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStopEvent.java @@ -21,7 +21,7 @@ public class SubStopEvent implements SubEvent { * @param force If it was a Forced Shutdown */ public SubStopEvent(UUID player, String server, boolean force) { - if (Util.isNull(server, force)) throw new NullPointerException(); + Util.nullpo(server, force); this.player = player; this.server = server; this.force = force; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStoppedEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStoppedEvent.java index 537db23b..21b7b601 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStoppedEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubStoppedEvent.java @@ -15,7 +15,7 @@ public class SubStoppedEvent implements SubEvent { * @param server Server that Stopped */ public SubStoppedEvent(String server) { - if (Util.isNull(server)) throw new NullPointerException(); + Util.nullpo(server); this.server = server; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/ExProxy.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/ExProxy.java index 5e7980db..64b8a37c 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/ExProxy.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/ExProxy.java @@ -3,7 +3,7 @@ package net.ME1312.SubServers.Velocity; import net.ME1312.Galaxi.Library.Config.YAMLConfig; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.UniversalFile; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; @@ -13,7 +13,10 @@ import net.ME1312.SubData.Client.Encryption.RSA; import net.ME1312.SubData.Client.Library.DisconnectReason; import net.ME1312.SubData.Client.SubDataClient; import net.ME1312.SubServers.Client.Common.Network.Packet.PacketDisconnectPlayer; -import net.ME1312.SubServers.Velocity.Event.*; +import net.ME1312.SubServers.Velocity.Event.SubAddServerEvent; +import net.ME1312.SubServers.Velocity.Event.SubRemoveServerEvent; +import net.ME1312.SubServers.Velocity.Event.SubStartEvent; +import net.ME1312.SubServers.Velocity.Event.SubStoppedEvent; import net.ME1312.SubServers.Velocity.Library.Compatibility.ChatColor; import net.ME1312.SubServers.Velocity.Library.Compatibility.Logger; import net.ME1312.SubServers.Velocity.Library.ConfigUpdater; @@ -51,7 +54,10 @@ import net.kyori.adventure.text.TextReplacementConfig; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.InetAddress; import java.net.URL; import java.nio.charset.Charset; @@ -70,7 +76,7 @@ public class ExProxy { private final HashMap fallback = new HashMap(); public final org.apache.logging.log4j.Logger out; - public final UniversalFile dir = new UniversalFile(new File(System.getProperty("user.dir"))); + public final File dir = new File(System.getProperty("user.dir")); public YAMLConfig config; public final PluginDescription plugin; private final ProxyServer proxy; @@ -93,13 +99,13 @@ public class ExProxy { Util.reflect(Logger.class.getDeclaredField("parent"), null, (this.out = Util.reflect(proxy.getClass().getDeclaredField("logger"), proxy))); Logger.get("SubServers").info("Loading SubServers.Sync v" + version.toString() + " Libraries (for Minecraft " + api.getGameVersion()[api.getGameVersion().length - 1] + ")"); - Util.isException(() -> new CachedPlayer((Player) null)); // runs + Try.all.run(() -> new CachedPlayer((Player) null)); // runs - UniversalFile dir = new UniversalFile(this.dir, "SubServers"); + File dir = new File(this.dir, "SubServers"); dir.mkdir(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "sync.yml")); - config = new YAMLConfig(new UniversalFile(dir, "sync.yml")); + ConfigUpdater.updateConfig(new File(dir, "sync.yml")); + config = new YAMLConfig(new File(dir, "sync.yml")); SmartFallback.addInspector((player, info) -> { ServerData server = getData(info.getServerInfo()); @@ -135,7 +141,7 @@ public class ExProxy { SmartFallback.dns_forward = config.get().getMap("Settings").getMap("Smart-Fallback", new ObjectMap<>()).getBoolean("DNS-Forward", false); resetDate = Calendar.getInstance().getTime().getTime(); - ConfigUpdater.updateConfig(new UniversalFile(dir, "SubServers:sync.yml")); + ConfigUpdater.updateConfig(new File(dir, "SubServers/sync.yml")); config.reload(); synchronized (rPlayers) { @@ -164,9 +170,9 @@ public class ExProxy { Logger.get("SubData").info("AES Encryption Available"); } - if (new UniversalFile(dir, "SubServers:subdata.rsa.key").exists()) { + if (new File(dir, "SubServers/subdata.rsa.key").exists()) { try { - subprotocol.registerCipher("RSA", new RSA(new UniversalFile(dir, "SubServers:subdata.rsa.key"))); + subprotocol.registerCipher("RSA", new RSA(new File(dir, "SubServers/subdata.rsa.key"))); Logger.get("SubData").info("RSA Encryption Available"); } catch (Exception x) { x.printStackTrace(); @@ -369,7 +375,7 @@ public class ExProxy { tmp.addAll(subdata.values()); for (SubDataClient client : tmp) if (client != null) { client.close(); - Util.isException(client::waitFor); + Try.all.run(client::waitFor); } subdata.clear(); subdata.put(0, null); diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Compatibility/ChatColor.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Compatibility/ChatColor.java index 2b1ba6b2..ac5edda6 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Compatibility/ChatColor.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Compatibility/ChatColor.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Velocity.Library.Compatibility; -import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Fallback/SmartFallback.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Fallback/SmartFallback.java index 1d69dbb2..b88bcb0e 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Fallback/SmartFallback.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Fallback/SmartFallback.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Velocity.Library.Fallback; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubServers.Velocity.ExProxy; @@ -167,7 +168,7 @@ public class SmartFallback { * @param inspector Inspector */ public static void addInspector(FallbackInspector inspector) { - if (Util.isNull(inspector)) throw new NullPointerException(); + Util.nullpo(inspector); inspectors.add(inspector); } @@ -177,7 +178,7 @@ public class SmartFallback { * @param inspector Inspector */ public static void removeInspector(FallbackInspector inspector) { - if (Util.isNull(inspector)) throw new NullPointerException(); - Util.isException(() -> inspectors.remove(inspector)); + Util.nullpo(inspector); + Try.all.run(() -> inspectors.remove(inspector)); } } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Metrics.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Metrics.java index 51789b16..60a93b67 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Metrics.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Library/Metrics.java @@ -10,15 +10,10 @@ import com.velocitypowered.api.plugin.PluginDescription; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; +import org.slf4j.Logger; + +import javax.net.ssl.HttpsURLConnection; +import java.io.*; import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Path; @@ -33,8 +28,6 @@ import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.zip.GZIPOutputStream; -import javax.net.ssl.HttpsURLConnection; -import org.slf4j.Logger; public class Metrics { diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketCheckPermission.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketCheckPermission.java index 38b33572..e27d5230 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketCheckPermission.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketCheckPermission.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Velocity.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Util; import net.ME1312.SubData.Client.Protocol.Forwardable; @@ -10,12 +9,13 @@ import net.ME1312.SubData.Client.SubDataSender; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; /** * Check Permission Packet */ public class PacketCheckPermission implements Forwardable, PacketObjectIn, PacketObjectOut { - static HashMap[]> callbacks = new HashMap[]>(); + static HashMap[]> callbacks = new HashMap[]>(); private UUID player; private String permission; private UUID tracker; @@ -33,7 +33,7 @@ public class PacketCheckPermission implements Forwardable, PacketObjectIn... callback) { + public PacketCheckPermission(UUID player, String permission, Consumer... callback) { this.player = player; this.permission = permission; this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID); diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketCheckPermissionResponse.java index 85de7798..e4be03c5 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketCheckPermissionResponse.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketCheckPermissionResponse.java @@ -1,8 +1,7 @@ package net.ME1312.SubServers.Velocity.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; -import net.ME1312.Galaxi.Library.Util; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.SubData.Client.Protocol.Forwardable; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; import net.ME1312.SubData.Client.Protocol.PacketObjectOut; @@ -10,6 +9,7 @@ import net.ME1312.SubData.Client.SubDataSender; import net.ME1312.SubServers.Velocity.ExProxy; import java.util.UUID; +import java.util.function.Consumer; import static net.ME1312.SubServers.Velocity.Network.Packet.PacketCheckPermission.callbacks; @@ -34,7 +34,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI * @param tracker Receiver ID */ public PacketCheckPermissionResponse(UUID player, String permission, UUID tracker) { - this.result = Util.getDespiteException(() -> ExProxy.getInstance().getPlayer(player).get().hasPermission(permission), false); + this.result = Try.all.get(() -> ExProxy.getInstance().getPlayer(player).get().hasPermission(permission), false); this.tracker = tracker; } @@ -48,7 +48,7 @@ public class PacketCheckPermissionResponse implements Forwardable, PacketObjectI @Override public void receive(SubDataSender client, ObjectMap data) throws Throwable { - for (Callback callback : callbacks.get(data.getUUID(0x0000))) callback.run(data.getBoolean(0x0001)); + for (Consumer callback : callbacks.get(data.getUUID(0x0000))) callback.accept(data.getBoolean(0x0001)); callbacks.remove(data.getUUID(0x0000)); } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketDownloadLang.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketDownloadLang.java index c4042177..49ce2399 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketDownloadLang.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketDownloadLang.java @@ -23,7 +23,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut { * @param plugin SubServers.Client */ public PacketDownloadLang(ExProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExDisconnectPlayer.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExDisconnectPlayer.java index 8e66a0f8..9fa7aacb 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExDisconnectPlayer.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExDisconnectPlayer.java @@ -9,7 +9,6 @@ import net.ME1312.SubServers.Velocity.Library.Compatibility.ChatColor; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import java.util.List; import java.util.Optional; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExMessagePlayer.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExMessagePlayer.java index 791eda38..5a93fbf0 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExMessagePlayer.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExMessagePlayer.java @@ -10,7 +10,6 @@ import net.ME1312.SubServers.Velocity.Library.Compatibility.ChatColor; import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import java.util.List; import java.util.Optional; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java index bed8da72..8ee3ed62 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketExSyncPlayer.java @@ -30,7 +30,7 @@ public class PacketExSyncPlayer implements PacketObjectIn, PacketObject * @param plugin SubPlugin */ public PacketExSyncPlayer(ExProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketInExRunEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketInExRunEvent.java index df45a701..7dc0335c 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketInExRunEvent.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Velocity.Network.Packet; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubData.Client.Protocol.PacketObjectIn; @@ -12,113 +11,114 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Consumer; /** * Run Event Packet */ public class PacketInExRunEvent implements PacketObjectIn { - private static HashMap>>> callbacks = new HashMap>>>(); + private static HashMap>>> callbacks = new HashMap>>>(); /** * New PacketInExRunEvent */ public PacketInExRunEvent(ExProxy plugin) { - callback("SubAddHostEvent", new Callback>() { + callback("SubAddHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubAddHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"))); callback("SubAddHostEvent", this); } }); - callback("SubAddProxyEvent", new Callback>() { + callback("SubAddProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubAddProxyEvent(data.getRawString("proxy"))); callback("SubAddProxyEvent", this); } }); - callback("SubAddServerEvent", new Callback>() { + callback("SubAddServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubAddServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server"))); callback("SubAddServerEvent", this); } }); - callback("SubCreateEvent", new Callback>() { + callback("SubCreateEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubCreateEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"), data.getRawString("name"), data.getRawString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"))); callback("SubCreateEvent", this); } }); - callback("SubCreatedEvent", new Callback>() { + callback("SubCreatedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubCreatedEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"), data.getRawString("name"), data.getRawString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); callback("SubCreatedEvent", this); } }); - callback("SubSendCommandEvent", new Callback>() { + callback("SubSendCommandEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubSendCommandEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), data.getRawString("command"))); callback("SubSendCommandEvent", this); } }); - callback("SubEditServerEvent", new Callback>() { + callback("SubEditServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubEditServerEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), new ContainedPair(data.getRawString("edit"), data.get("value")))); callback("SubEditServerEvent", this); } }); - callback("SubStartEvent", new Callback>() { + callback("SubStartEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubStartEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"))); callback("SubStartEvent", this); } }); - callback("SubStartedEvent", new Callback>() { + callback("SubStartedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubStartedEvent(data.getRawString("server"))); callback("SubStartedEvent", this); } }); - callback("SubStopEvent", new Callback>() { + callback("SubStopEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubStopEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("server"), data.getBoolean("force"))); callback("SubStopEvent", this); } }); - callback("SubStoppedEvent", new Callback>() { + callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubStoppedEvent(data.getRawString("server"))); callback("SubStoppedEvent", this); } }); - callback("SubRemoveServerEvent", new Callback>() { + callback("SubRemoveServerEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubRemoveServerEvent((data.contains("player"))?data.getUUID("player"):null, (data.contains("host"))?data.getRawString("host"):null, data.getRawString("server"))); callback("SubRemoveServerEvent", this); } }); - callback("SubRemoveProxyEvent", new Callback>() { + callback("SubRemoveProxyEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubAddProxyEvent(data.getRawString("proxy"))); callback("SubRemoveProxyEvent", this); } }); - callback("SubRemoveHostEvent", new Callback>() { + callback("SubRemoveHostEvent", new Consumer>() { @Override - public void run(ObjectMap data) { + public void accept(ObjectMap data) { ExProxy.getInstance().getEventManager().fire(new SubRemoveHostEvent((data.contains("player"))?data.getUUID("player"):null, data.getRawString("host"))); callback("SubRemoveHostEvent", this); } @@ -129,10 +129,10 @@ public class PacketInExRunEvent implements PacketObjectIn { @Override public void receive(SubDataSender client, ObjectMap data) { if (callbacks.keySet().contains(data.getString(0x0000))) { - List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); + List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000)); PacketInExRunEvent.callbacks.remove(data.getString(0x0000)); - for (Callback> callback : callbacks) { - callback.run(new ObjectMap<>((Map) data.getObject(0x0001))); + for (Consumer> callback : callbacks) { + callback.accept(new ObjectMap<>((Map) data.getObject(0x0001))); } } } @@ -142,8 +142,8 @@ public class PacketInExRunEvent implements PacketObjectIn { return 0x0001; } - public static void callback(String event, Callback> callback) { - List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); + public static void callback(String event, Consumer> callback) { + List>> callbacks = (PacketInExRunEvent.callbacks.keySet().contains(event))? PacketInExRunEvent.callbacks.get(event):new ArrayList>>(); callbacks.add(callback); PacketInExRunEvent.callbacks.put(event, callbacks); } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketLinkProxy.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketLinkProxy.java index 9946c28d..dcc2004f 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketLinkProxy.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/Packet/PacketLinkProxy.java @@ -23,7 +23,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn, * @param plugin SubServers.Client */ public PacketLinkProxy(ExProxy plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; } /** @@ -33,7 +33,7 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn, * @param channel Channel ID */ public PacketLinkProxy(ExProxy plugin, int channel) { - if (Util.isNull(plugin)) throw new NullPointerException(); + Util.nullpo(plugin); this.plugin = plugin; this.channel = channel; } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/SubProtocol.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/SubProtocol.java index 1f544f3b..792c1fe2 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/SubProtocol.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Network/SubProtocol.java @@ -1,8 +1,8 @@ package net.ME1312.SubServers.Velocity.Network; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Map.ObjectMap; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -19,9 +19,7 @@ import net.ME1312.SubServers.Velocity.Server.CachedPlayer; import net.ME1312.SubServers.Velocity.Server.ServerData; import net.ME1312.SubServers.Velocity.SubAPI; -import com.velocitypowered.api.proxy.config.ProxyConfig; import com.velocitypowered.api.proxy.server.RegisteredServer; -import com.velocitypowered.api.proxy.server.ServerInfo; import java.io.File; import java.io.IOException; @@ -29,6 +27,7 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.HashMap; import java.util.UUID; +import java.util.function.Consumer; import java.util.logging.Logger; /** @@ -132,9 +131,9 @@ public class SubProtocol extends SubDataProtocol { } @Override - protected SubDataClient sub(Callback scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { + protected SubDataClient sub(Consumer scheduler, Logger logger, InetAddress address, int port, ObjectMap login) throws IOException { ExProxy plugin = SubAPI.getInstance().getInternals(); - HashMap map = Util.getDespiteException(() -> Util.reflect(ExProxy.class.getDeclaredField("subdata"), plugin), null); + HashMap map = Try.all.get(() -> Util.reflect(ExProxy.class.getDeclaredField("subdata"), plugin), null); int channel = 1; while (map.keySet().contains(channel)) channel++; @@ -150,10 +149,10 @@ public class SubProtocol extends SubDataProtocol { @SuppressWarnings("deprecation") @Override - public SubDataClient open(Callback scheduler, Logger logger, InetAddress address, int port) throws IOException { + public SubDataClient open(Consumer scheduler, Logger logger, InetAddress address, int port) throws IOException { ExProxy plugin = SubAPI.getInstance().getInternals(); SubDataClient subdata = super.open(scheduler, logger, address, port); - HashMap map = Util.getDespiteException(() -> Util.reflect(ExProxy.class.getDeclaredField("subdata"), plugin), null); + HashMap map = Try.all.get(() -> Util.reflect(ExProxy.class.getDeclaredField("subdata"), plugin)); subdata.sendPacket(new PacketLinkProxy(plugin, 0)); subdata.sendPacket(new PacketDownloadLang()); @@ -224,7 +223,7 @@ public class SubProtocol extends SubDataProtocol { if (plugin.running) { Logger log = net.ME1312.SubServers.Velocity.Library.Compatibility.Logger.get("SubData"); - Util.isException(() -> Util.reflect(ExProxy.class.getDeclaredMethod("connect", Logger.class, Pair.class), plugin, log, client)); + Try.all.run(() -> Util.reflect(ExProxy.class.getDeclaredMethod("connect", Logger.class, Pair.class), plugin, log, client)); } else map.put(0, null); }); diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/CachedPlayer.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/CachedPlayer.java index 1d0d2b37..42c6caa8 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/CachedPlayer.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/CachedPlayer.java @@ -1,6 +1,5 @@ package net.ME1312.SubServers.Velocity.Server; -import net.ME1312.Galaxi.Library.Callback.Callback; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.SubData.Client.DataClient; import net.ME1312.SubData.Client.SubDataClient; @@ -14,11 +13,11 @@ import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.proxy.server.ServerInfo; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import java.util.ArrayList; import java.util.Optional; import java.util.UUID; +import java.util.function.IntConsumer; /** * Cached RemotePlayer Data Class @@ -107,7 +106,7 @@ public class CachedPlayer extends RemotePlayer { } @Override - protected void sendMessage(SubDataClient client, UUID[] players, String[] messages, Callback response) { + protected void sendMessage(SubDataClient client, UUID[] players, String[] messages, IntConsumer response) { if (players != null && players.length > 0) { ArrayList ids = new ArrayList(); for (UUID id : players) { @@ -122,7 +121,7 @@ public class CachedPlayer extends RemotePlayer { } if (ids.size() == 0) { - response.run(0); + response.accept(0); } else { super.sendMessage(client, ids.toArray(new UUID[0]), messages, response); } @@ -132,7 +131,7 @@ public class CachedPlayer extends RemotePlayer { } @Override - protected void sendRawMessage(SubDataClient client, UUID[] players, String[] messages, Callback response) { + protected void sendRawMessage(SubDataClient client, UUID[] players, String[] messages, IntConsumer response) { if (players != null && players.length > 0) { ArrayList ids = new ArrayList(); Component[] components = null; @@ -152,7 +151,7 @@ public class CachedPlayer extends RemotePlayer { } if (ids.size() == 0) { - response.run(0); + response.accept(0); } else { super.sendRawMessage(client, ids.toArray(new UUID[0]), messages, response); } @@ -162,7 +161,7 @@ public class CachedPlayer extends RemotePlayer { } @Override - protected void transfer(SubDataClient client, UUID[] players, String server, Callback response) { + protected void transfer(SubDataClient client, UUID[] players, String server, IntConsumer response) { ArrayList ids = new ArrayList(); Optional rs = ExProxy.getInstance().getServer(server.toLowerCase()); int failures = 0; @@ -178,15 +177,15 @@ public class CachedPlayer extends RemotePlayer { } if (ids.size() == 0) { - response.run(failures); + response.accept(failures); } else { final int ff = failures; - super.transfer(client, ids.toArray(new UUID[0]), server, i -> response.run(i + ff)); + super.transfer(client, ids.toArray(new UUID[0]), server, i -> response.accept(i + ff)); } } @Override - protected void disconnect(SubDataClient client, UUID[] players, String reason, Callback response) { + protected void disconnect(SubDataClient client, UUID[] players, String reason, IntConsumer response) { Component message = (reason == null)? Component.text().build() : ChatColor.convertColor(reason); ArrayList ids = new ArrayList(); for (UUID id : players) { @@ -199,7 +198,7 @@ public class CachedPlayer extends RemotePlayer { } if (ids.size() == 0) { - response.run(0); + response.accept(0); } else { super.disconnect(client, ids.toArray(new UUID[0]), reason, response); } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/ServerData.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/ServerData.java index 51cf2aa0..735b30ef 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/ServerData.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/ServerData.java @@ -133,7 +133,7 @@ public class ServerData { * @param value Value */ public void setHidden(boolean value) { - if (Util.isNull(value)) throw new NullPointerException(); + Util.nullpo(value); this.hidden = value; } @@ -189,7 +189,7 @@ public class ServerData { * @param player Player to add */ public void whitelist(UUID player) { - if (Util.isNull(player)) throw new NullPointerException(); + Util.nullpo(player); whitelist.add(player); } diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/SubServerData.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/SubServerData.java index 4a9d7ce7..0569f65a 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/SubServerData.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Server/SubServerData.java @@ -1,7 +1,6 @@ package net.ME1312.SubServers.Velocity.Server; import java.net.InetSocketAddress; -import java.net.SocketAddress; import java.util.Collection; import java.util.Map; import java.util.UUID; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubAPI.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubAPI.java index 2ae1b256..5380c807 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubAPI.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubAPI.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Velocity; -import net.ME1312.Galaxi.Library.UniversalFile; + +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.DataClient; @@ -13,6 +14,7 @@ import net.ME1312.SubServers.Velocity.Server.ServerData; import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.proxy.server.ServerInfo; +import java.io.File; import java.util.*; /** @@ -101,7 +103,7 @@ public final class SubAPI extends ClientAPI { * @return Remote Player */ public CachedPlayer getRemotePlayer(String name) { - if (Util.isNull(name)) throw new NullPointerException(); + Util.nullpo(name); for (CachedPlayer player : getRemotePlayers().values()) { if (player.getName().equalsIgnoreCase(name)) return player; } @@ -115,7 +117,7 @@ public final class SubAPI extends ClientAPI { * @return Remote Player */ public CachedPlayer getRemotePlayer(UUID id) { - if (Util.isNull(id)) throw new NullPointerException(); + Util.nullpo(id); return getRemotePlayers().getOrDefault(id, null); } @@ -157,7 +159,7 @@ public final class SubAPI extends ClientAPI { * @return Lang Value */ public Map getLang(String channel) { - if (Util.isNull(channel)) throw new NullPointerException(); + Util.nullpo(channel); return new LinkedHashMap<>(plugin.lang.value().get(channel.toLowerCase())); } @@ -166,7 +168,7 @@ public final class SubAPI extends ClientAPI { * * @return Directory */ - public UniversalFile getRuntimeDirectory() { + public File getRuntimeDirectory() { return plugin.dir; } @@ -206,7 +208,7 @@ public final class SubAPI extends ClientAPI { if (GAME_VERSION == null) { if (System.getProperty("subservers.minecraft.version", "").length() > 0) { return new Version[]{new Version(System.getProperty("subservers.minecraft.version"))}; - } else if (Util.getDespiteException(() -> ProtocolVersion.SUPPORTED_VERSIONS != null, false)) { + } else if (Try.all.get(() -> ProtocolVersion.SUPPORTED_VERSIONS != null, false)) { List versions = new LinkedList(); for (ProtocolVersion protocol : ProtocolVersion.SUPPORTED_VERSIONS) for (String version : protocol.getVersionsSupportedBy()) versions.add(new Version(version)); Collections.sort(versions); diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java index a35dce13..ad356e88 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java @@ -1,14 +1,13 @@ package net.ME1312.SubServers.Velocity; import net.ME1312.Galaxi.Library.AsyncConsolidator; -import net.ME1312.Galaxi.Library.Callback.Callback; -import net.ME1312.Galaxi.Library.Callback.ReturnRunnable; import net.ME1312.Galaxi.Library.Container.ContainedPair; import net.ME1312.Galaxi.Library.Container.Container; import net.ME1312.Galaxi.Library.Container.Pair; import net.ME1312.Galaxi.Library.Container.Value; import net.ME1312.Galaxi.Library.Map.ObjectMap; import net.ME1312.Galaxi.Library.Platform; +import net.ME1312.Galaxi.Library.Try; import net.ME1312.Galaxi.Library.Util; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -45,6 +44,8 @@ import java.net.URL; import java.nio.charset.Charset; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Supplier; @SuppressWarnings("deprecation") public final class SubCommand implements SimpleCommand { @@ -392,7 +393,7 @@ public final class SubCommand implements SimpleCommand { selectServers(sender, args, 1, true, select -> { if (select.subservers.length > 0) { // Step 5: Start the stopped Servers once more - Callback starter = server -> server.start(response -> { + Consumer starter = server -> server.start(response -> { switch (response) { case 3: case 4: @@ -422,9 +423,9 @@ public final class SubCommand implements SimpleCommand { // Step 4: Listen for stopped Servers final HashMap listening = new HashMap(); - PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() { + PacketInExRunEvent.callback("SubStoppedEvent", new Consumer>() { @Override - public void run(ObjectMap json) { + public void accept(ObjectMap json) { try { if (listening.size() > 0) { PacketInExRunEvent.callback("SubStoppedEvent", this); @@ -434,7 +435,7 @@ public final class SubCommand implements SimpleCommand { timer.schedule(new TimerTask() { @Override public void run() { - starter.run(listening.get(name)); + starter.accept(listening.get(name)); listening.remove(name); timer.cancel(); } @@ -462,7 +463,7 @@ public final class SubCommand implements SimpleCommand { sender.sendMessage(Component.text("Could not restart server: Subserver " + server.getName() + " has disappeared")); break; case 5: - starter.run(server); + starter.accept(server); case 0: success.value++; break; @@ -586,7 +587,7 @@ public final class SubCommand implements SimpleCommand { } } else if (args[0].equalsIgnoreCase("create")) { if (args.length > 3) { - if (args.length > 5 && Util.isException(() -> Integer.parseInt(args[5]))) { + if (args.length > 5 && !Try.all.run(() -> Integer.parseInt(args[5]))) { sender.sendMessage(Component.text("SubServers > Invalid port number")); } else { ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCreateServer(null, args[1], args[2],args[3], (args.length > 4)?new Version(args[4]):null, (args.length > 5)?Integer.parseInt(args[5]):null, data -> { @@ -738,7 +739,7 @@ public final class SubCommand implements SimpleCommand { } } - private void selectServers(CommandSource sender, String[] rargs, int index, boolean mode, Callback callback) { + private void selectServers(CommandSource sender, String[] rargs, int index, boolean mode, Consumer callback) { StackTraceElement[] origin = new Exception().getStackTrace(); LinkedList msgs = new LinkedList(); LinkedList args = new LinkedList(); @@ -784,7 +785,7 @@ public final class SubCommand implements SimpleCommand { } try { - callback.run(new ServerSelection(msgs, selection, servers, subservers, args, last.value())); + callback.accept(new ServerSelection(msgs, selection, servers, subservers, args, last.value())); } catch (Throwable e) { Throwable ew = new InvocationTargetException(e); ew.setStackTrace(origin); @@ -990,7 +991,7 @@ public final class SubCommand implements SimpleCommand { return list; } else { if (args[0].equals("info") || args[0].equals("status")) { - ReturnRunnable> getPlayers = () -> { + Supplier> getPlayers = () -> { LinkedList names = new LinkedList(); for (Player player : ExProxy.getInstance().getAllPlayers()) names.add(player.getGameProfile().getName()); for (CachedPlayer player : plugin.api.getRemotePlayers().values()) if (!names.contains(player.getName())) names.add(player.getName()); @@ -1032,7 +1033,7 @@ public final class SubCommand implements SimpleCommand { if (!list.contains(server.getName()) && server.getName().toLowerCase().startsWith(last)) list.add(Last + server.getName().substring(last.length())); } - for (String player : getPlayers.run()) { + for (String player : getPlayers.get()) { if (!list.contains(player) && player.toLowerCase().startsWith(last)) list.add(Last + player.substring(last.length())); } @@ -1073,8 +1074,10 @@ public final class SubCommand implements SimpleCommand { list.add(Last + server.getName().substring(last.length())); } break; + case "u": + case "user": case "player": - for (String player : getPlayers.run()) { + for (String player : getPlayers.get()) { if (player.toLowerCase().startsWith(last)) list.add(Last + player.substring(last.length())); } @@ -1166,7 +1169,7 @@ public final class SubCommand implements SimpleCommand { return Collections.singletonList("[Version]"); } else if (args.length == 6) { if (last.length() > 0) { - if (Util.isException(() -> Integer.parseInt(last)) || Integer.parseInt(last) <= 0 || Integer.parseInt(last) > 65535) { + if (!Try.all.run(() -> Integer.parseInt(last)) || Integer.parseInt(last) <= 0 || Integer.parseInt(last) > 65535) { return Collections.emptyList(); } }