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