diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
index 54fde5f2..5fd55c0f 100644
--- a/SubServers.Bungee/pom.xml
+++ b/SubServers.Bungee/pom.xml
@@ -43,7 +43,7 @@
net.ME1312.SubData
Server
- 19w39a
+ 19w42c
compile
true
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 2559bde5..fd085c88 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,21 +1,22 @@
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;
import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
import net.ME1312.SubData.Server.SubDataClient;
-import net.ME1312.SubServers.Bungee.Host.Server;
-import net.ME1312.SubServers.Bungee.SubAPI;
-import net.md_5.bungee.api.ProxyServer;
+import java.util.HashMap;
import java.util.UUID;
/**
* Check Permission Packet
*/
public class PacketCheckPermission implements PacketObjectIn, PacketObjectOut {
- private boolean result;
+ static HashMap[]> callbacks = new HashMap[]>();
+ private UUID player;
+ private String permission;
private UUID tracker;
/**
@@ -28,35 +29,28 @@ public class PacketCheckPermission implements PacketObjectIn, PacketObj
*
* @param player Player to check on
* @param permission Permission to check
- * @param tracker Receiver ID
+ * @param callback Callbacks
*/
- public PacketCheckPermission(UUID player, String permission, UUID tracker) {
- this(Util.getDespiteException(() -> ProxyServer.getInstance().getPlayer(player).hasPermission(permission), false), tracker);
- }
-
- PacketCheckPermission(boolean result, UUID tracker) {
- this.result = result;
- this.tracker = tracker;
+ @SafeVarargs
+ public PacketCheckPermission(UUID player, String permission, Callback... callback) {
+ this.player = player;
+ this.permission = permission;
+ this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID);
+ callbacks.put(tracker, callback);
}
@Override
public ObjectMap send(SubDataClient client) throws Throwable {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
- data.set(0x0001, result);
+ data.set(0x0001, player);
+ data.set(0x0002, permission);
return data;
}
@Override
public void receive(SubDataClient client, ObjectMap data) throws Throwable {
- Server server = data.contains(0x0003)?SubAPI.getInstance().getServer(data.getRawString(0x0003)):null;
- if (server != null && server.getSubData()[0] != null) {
- ((SubDataClient) server.getSubData()[0]).sendPacket(new PacketExCheckPermission(data.getUUID(0x0001), data.getRawString(0x0002), result -> {
- client.sendPacket(new PacketCheckPermission(result, (data.contains(0x0000))?data.getUUID(0x0000):null));
- }));
- } else {
- client.sendPacket(new PacketCheckPermission(data.getUUID(0x0001), data.getRawString(0x0002), (data.contains(0x0000))?data.getUUID(0x0000):null));
- }
+ client.sendPacket(new PacketCheckPermissionResponse(data.getUUID(0x0001), data.getRawString(0x0002), (data.contains(0x0000))?data.getUUID(0x0000):null));
}
@Override
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCheckPermission.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java
similarity index 56%
rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCheckPermission.java
rename to SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java
index 9484a78e..39fc7a2d 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCheckPermission.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketCheckPermissionResponse.java
@@ -6,45 +6,42 @@ import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
import net.ME1312.SubData.Server.SubDataClient;
+import net.md_5.bungee.api.ProxyServer;
-import java.util.HashMap;
import java.util.UUID;
+import static net.ME1312.SubServers.Bungee.Network.Packet.PacketCheckPermission.callbacks;
+
+
/**
- * Packet Check Permission
+ * Check Permission Response Packet
*/
-public class PacketExCheckPermission implements PacketObjectIn, PacketObjectOut {
- private static HashMap[]> callbacks = new HashMap[]>();
- private UUID player;
- private String permission;
+public class PacketCheckPermissionResponse implements PacketObjectIn, PacketObjectOut {
+ private boolean result;
private UUID tracker;
/**
- * New PacketCheckPermission (In)
+ * New PacketCheckPermissionResponse (In)
*/
- public PacketExCheckPermission() {}
+ public PacketCheckPermissionResponse() {}
/**
- * New PacketCheckPermission (Out)
+ * New PacketCheckPermissionResponse (Out)
*
* @param player Player to check on
* @param permission Permission to check
- * @param callback Callbacks
+ * @param tracker Receiver ID
*/
- @SafeVarargs
- public PacketExCheckPermission(UUID player, String permission, Callback... callback) {
- this.player = player;
- this.permission = permission;
- this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID);
- callbacks.put(tracker, callback);
+ public PacketCheckPermissionResponse(UUID player, String permission, UUID tracker) {
+ this.result = Util.getDespiteException(() -> ProxyServer.getInstance().getPlayer(player).hasPermission(permission), false);
+ this.tracker = tracker;
}
@Override
public ObjectMap send(SubDataClient client) throws Throwable {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
- data.set(0x0001, player);
- data.set(0x0002, permission);
+ data.set(0x0001, result);
return data;
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java
index ae22d31b..9ceb88cc 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java
@@ -51,6 +51,7 @@ public class SubProtocol extends SubDataProtocol {
instance.registerPacket(0x0015, PacketDownloadServerInfo.class);
instance.registerPacket(0x0016, PacketDownloadPlayerList.class);
instance.registerPacket(0x0017, PacketCheckPermission.class);
+ instance.registerPacket(0x0018, PacketCheckPermissionResponse.class);
instance.registerPacket(0x0010, new PacketDownloadLang(plugin));
instance.registerPacket(0x0011, new PacketDownloadPlatformInfo(plugin));
@@ -60,6 +61,7 @@ public class SubProtocol extends SubDataProtocol {
instance.registerPacket(0x0015, new PacketDownloadServerInfo(plugin));
instance.registerPacket(0x0016, new PacketDownloadPlayerList(plugin));
instance.registerPacket(0x0017, new PacketCheckPermission());
+ instance.registerPacket(0x0018, new PacketCheckPermissionResponse());
// 30-4F: Control Packets
@@ -113,13 +115,11 @@ public class SubProtocol extends SubDataProtocol {
instance.registerPacket(0x0071, PacketOutExReset.class);
instance.registerPacket(0x0072, PacketOutExReload.class);
instance.registerPacket(0x0073, PacketOutExUpdateWhitelist.class);
- instance.registerPacket(0x0074, PacketExCheckPermission.class);
//instance.registerPacket(0x0070, new PacketOutRunEvent());
//instance.registerPacket(0x0071, new PacketOutReset());
//instance.registerPacket(0x0072, new PacketOutReload());
//instance.registerPacket(0x0073, new PacketOutExUpdateWhitelist());
- instance.registerPacket(0x0074, new PacketExCheckPermission());
}
return instance;
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
index ea32b848..313db16d 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
@@ -11,7 +11,7 @@ import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Server.ClientHandler;
import net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiInfo;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
-import net.ME1312.SubServers.Bungee.Network.Packet.PacketExCheckPermission;
+import net.ME1312.SubServers.Bungee.Network.Packet.PacketCheckPermission;
import net.md_5.bungee.BungeeCord;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
@@ -719,7 +719,7 @@ public final class SubCommand extends CommandX {
HashMap> map = (players.keySet().contains(((ProxiedPlayer) sender).getUniqueId()))?players.get(((ProxiedPlayer) sender).getUniqueId()):new HashMap>();
map.put(((ProxiedPlayer) sender).getServer().getInfo(), new NamedContainer<>(null, false));
players.put(((ProxiedPlayer) sender).getUniqueId(), map);
- ((SubDataClient) ((Server) ((ProxiedPlayer) sender).getServer().getInfo()).getSubData()[0]).sendPacket(new PacketExCheckPermission(((ProxiedPlayer) sender).getUniqueId(), "subservers.command", result -> {
+ ((SubDataClient) ((Server) ((ProxiedPlayer) sender).getServer().getInfo()).getSubData()[0]).sendPacket(new PacketCheckPermission(((ProxiedPlayer) sender).getUniqueId(), "subservers.command", result -> {
map.put(((ProxiedPlayer) sender).getServer().getInfo(), new NamedContainer<>(Calendar.getInstance().getTime().getTime(), result));
}));
}
@@ -727,7 +727,7 @@ public final class SubCommand extends CommandX {
return new NamedContainer<>(null, Collections.emptyList());
} else if (args.length <= 1) {
List cmds = new ArrayList<>();
- cmds.addAll(Arrays.asList("help", "list", "info", "status", "version", "start", "stop", "restart", "kill", "terminate", "cmd", "command", "create", "update", "upgrade"));
+ cmds.addAll(Arrays.asList("help", "list", "info", "status", "version", "start", "restart", "stop", "kill", "terminate", "cmd", "command", "create", "update", "upgrade"));
if (!(sender instanceof ProxiedPlayer)) cmds.addAll(Arrays.asList("reload", "sudo", "screen", "delete", "restore"));
if (last.length() == 0) {
return new NamedContainer<>(null, cmds);
diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml
index 9d27cf0a..4b251ed3 100644
--- a/SubServers.Client/Bukkit/pom.xml
+++ b/SubServers.Client/Bukkit/pom.xml
@@ -55,7 +55,7 @@
net.ME1312.SubData
Client
- 19w39a
+ 19w42c
compile
true
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Host.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Host.java
index e7002f8c..c68b1ac9 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Host.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Host.java
@@ -4,7 +4,10 @@ import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubData.Client.DataSender;
+import net.ME1312.SubData.Client.Library.ForwardedDataSender;
import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.Network.Packet.*;
import net.ME1312.SubServers.Client.Bukkit.SubAPI;
@@ -58,16 +61,16 @@ public class Host {
* @return SubData Client Channel ID Array (may be empty if unsupported)
*/
@SuppressWarnings("unchecked")
- public UUID[] getSubData() {
+ public DataSender[] getSubData() {
if (raw.contains("subdata")) {
ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
LinkedList keys = new LinkedList(subdata.getKeys());
- LinkedList channels = new LinkedList();
+ LinkedList channels = new LinkedList();
Collections.sort(keys);
- for (Integer channel : keys) channels.add(subdata.getUUID(channel));
- return channels.toArray(new UUID[0]);
+ for (Integer channel : keys) channels.add((subdata.isNull(channel))?null:new ForwardedDataSender((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(channel)));
+ return channels.toArray(new SubDataSender[0]);
} else {
- return new UUID[0];
+ return new SubDataSender[0];
}
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Proxy.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Proxy.java
index d844f10b..6c7c44ef 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Proxy.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Proxy.java
@@ -4,7 +4,10 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
import net.ME1312.Galaxi.Library.NamedContainer;
import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubData.Client.DataSender;
+import net.ME1312.SubData.Client.Library.ForwardedDataSender;
import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketDownloadProxyInfo;
import net.ME1312.SubServers.Client.Bukkit.SubAPI;
@@ -47,13 +50,13 @@ public class Proxy {
* @return SubData Client Channel ID Array
*/
@SuppressWarnings("unchecked")
- public UUID[] getSubData() {
+ public DataSender[] getSubData() {
ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
LinkedList keys = new LinkedList(subdata.getKeys());
- LinkedList channels = new LinkedList();
+ LinkedList channels = new LinkedList();
Collections.sort(keys);
- for (Integer channel : keys) channels.add(subdata.getUUID(channel));
- return channels.toArray(new UUID[0]);
+ for (Integer channel : keys) channels.add((subdata.isNull(channel))?null:new ForwardedDataSender((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(channel)));
+ return channels.toArray(new SubDataSender[0]);
}
/**
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Server.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Server.java
index 89354200..2c8bef08 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Server.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Server.java
@@ -2,7 +2,10 @@ package net.ME1312.SubServers.Client.Bukkit.Network.API;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.NamedContainer;
+import net.ME1312.SubData.Client.DataSender;
+import net.ME1312.SubData.Client.Library.ForwardedDataSender;
import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketDownloadServerInfo;
import net.ME1312.SubServers.Client.Bukkit.SubAPI;
@@ -46,13 +49,13 @@ public class Server {
* @return SubData Client Channel ID Array
*/
@SuppressWarnings("unchecked")
- public UUID[] getSubData() {
+ public DataSender[] getSubData() {
ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
LinkedList keys = new LinkedList(subdata.getKeys());
- LinkedList channels = new LinkedList();
+ LinkedList channels = new LinkedList();
Collections.sort(keys);
- for (Integer channel : keys) channels.add(subdata.getUUID(channel));
- return channels.toArray(new UUID[0]);
+ for (Integer channel : keys) channels.add((subdata.isNull(channel))?null:new ForwardedDataSender((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0], subdata.getUUID(channel)));
+ return channels.toArray(new SubDataSender[0]);
}
/**
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketAddServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketAddServer.java
index 6b74ede0..dab9ffc4 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketAddServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketAddServer.java
@@ -6,7 +6,7 @@ import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.Graphic.UIRenderer;
import java.net.InetAddress;
@@ -102,7 +102,7 @@ public class PacketAddServer implements PacketObjectIn, PacketObjectOut
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, name);
@@ -113,7 +113,7 @@ public class PacketAddServer implements PacketObjectIn, PacketObjectOut
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermission.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermission.java
index e112fc2d..068c8535 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermission.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermission.java
@@ -3,19 +3,19 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet;
import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubData.Client.Protocol.Forwardable;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.UUID;
/**
- * Packet Check Permission
+ * Check Permission Packet
*/
-public class PacketCheckPermission implements PacketObjectIn, PacketObjectOut {
- private static HashMap[]> callbacks = new HashMap[]>();
- private String name;
+public class PacketCheckPermission implements Forwardable, PacketObjectIn, PacketObjectOut {
+ static HashMap[]> callbacks = new HashMap[]>();
private UUID player;
private String permission;
private UUID tracker;
@@ -34,20 +34,6 @@ public class PacketCheckPermission implements PacketObjectIn, PacketObj
*/
@SafeVarargs
public PacketCheckPermission(UUID player, String permission, Callback... callback) {
- this(null, player, permission, callback);
- }
-
- /**
- * New PacketCheckPermission (Out)
- *
- * @param server Server to check on
- * @param player Player to check on
- * @param permission Permission to check
- * @param callback Callbacks
- */
- @SafeVarargs
- public PacketCheckPermission(String server, UUID player, String permission, Callback... callback) {
- this.name = server;
this.player = player;
this.permission = permission;
this.tracker = Util.getNew(callbacks.keySet(), UUID::randomUUID);
@@ -55,19 +41,17 @@ public class PacketCheckPermission implements PacketObjectIn, PacketObj
}
@Override
- public ObjectMap send(SubDataClient client) throws Throwable {
+ public ObjectMap send(SubDataSender client) throws Throwable {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, player);
data.set(0x0002, permission);
- if (name != null) data.set(0x0003, name);
return data;
}
@Override
- public void receive(SubDataClient client, ObjectMap data) throws Throwable {
- for (Callback callback : callbacks.get(data.getUUID(0x0000))) callback.run(data.getBoolean(0x0001));
- callbacks.remove(data.getUUID(0x0000));
+ public void receive(SubDataSender client, ObjectMap data) throws Throwable {
+ client.sendPacket(new PacketCheckPermissionResponse(data.getUUID(0x0001), data.getRawString(0x0002), (data.contains(0x0000))?data.getUUID(0x0000):null));
}
@Override
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java
new file mode 100644
index 00000000..28c443bb
--- /dev/null
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCheckPermissionResponse.java
@@ -0,0 +1,59 @@
+package net.ME1312.SubServers.Client.Bukkit.Network.Packet;
+
+import net.ME1312.Galaxi.Library.Callback.Callback;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubData.Client.Protocol.Forwardable;
+import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
+import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
+import net.ME1312.SubData.Client.SubDataSender;
+import org.bukkit.Bukkit;
+
+import java.util.UUID;
+
+import static net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketCheckPermission.callbacks;
+
+
+/**
+ * Check Permission Response Packet
+ */
+public class PacketCheckPermissionResponse implements Forwardable, PacketObjectIn, PacketObjectOut {
+ private boolean result;
+ private UUID tracker;
+
+ /**
+ * New PacketCheckPermissionResponse (In)
+ */
+ public PacketCheckPermissionResponse() {}
+
+ /**
+ * New PacketCheckPermissionResponse (Out)
+ *
+ * @param player Player to check on
+ * @param permission Permission to check
+ * @param tracker Receiver ID
+ */
+ public PacketCheckPermissionResponse(UUID player, String permission, UUID tracker) {
+ this.result = Util.getDespiteException(() -> Bukkit.getServer().getPlayer(player).hasPermission(permission), false);
+ this.tracker = tracker;
+ }
+
+ @Override
+ public ObjectMap send(SubDataSender client) throws Throwable {
+ ObjectMap data = new ObjectMap();
+ data.set(0x0000, tracker);
+ data.set(0x0001, result);
+ return data;
+ }
+
+ @Override
+ public void receive(SubDataSender client, ObjectMap data) throws Throwable {
+ for (Callback callback : callbacks.get(data.getUUID(0x0000))) callback.run(data.getBoolean(0x0001));
+ callbacks.remove(data.getUUID(0x0000));
+ }
+
+ @Override
+ public int version() {
+ return 0x0001;
+ }
+}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCommandServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCommandServer.java
index b9202856..75050e19 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCommandServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCommandServer.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.UUID;
@@ -44,7 +44,7 @@ public class PacketCommandServer implements PacketObjectIn, PacketObjec
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, server);
@@ -54,7 +54,7 @@ public class PacketCommandServer implements PacketObjectIn, PacketObjec
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCreateServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCreateServer.java
index b34ecea6..f1d9f904 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCreateServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketCreateServer.java
@@ -2,7 +2,7 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.Graphic.UIRenderer;
import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
@@ -109,7 +109,7 @@ public class PacketCreateServer implements PacketObjectIn, PacketObject
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, name);
@@ -123,7 +123,7 @@ public class PacketCreateServer implements PacketObjectIn, PacketObject
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDeleteServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDeleteServer.java
index 6e2c8aa6..0006190d 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDeleteServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDeleteServer.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.UUID;
@@ -45,7 +45,7 @@ public class PacketDeleteServer implements PacketObjectIn, PacketObject
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, server);
@@ -56,7 +56,7 @@ public class PacketDeleteServer implements PacketObjectIn, PacketObject
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadGroupInfo.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadGroupInfo.java
index f4c5604a..f1e0e5b6 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadGroupInfo.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadGroupInfo.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +39,7 @@ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketO
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap json = new ObjectMap();
json.set(0x0000, tracker);
if (group != null) json.set(0x0001, group);
@@ -48,7 +48,7 @@ public class PacketDownloadGroupInfo implements PacketObjectIn, PacketO
@SuppressWarnings("unchecked")
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001)));
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadHostInfo.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadHostInfo.java
index 848729ab..1eff6459 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadHostInfo.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadHostInfo.java
@@ -6,7 +6,7 @@ import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.Map;
@@ -40,7 +40,7 @@ public class PacketDownloadHostInfo implements PacketObjectIn, PacketOb
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap json = new ObjectMap();
json.set(0x0000, tracker);
if (group != null) json.set(0x0001, group);
@@ -49,7 +49,7 @@ public class PacketDownloadHostInfo implements PacketObjectIn, PacketOb
@SuppressWarnings("unchecked")
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001)));
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java
index 8e405255..f6dfa9c9 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.java
@@ -6,7 +6,7 @@ import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
import net.ME1312.SubData.Client.Protocol.PacketOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
import org.bukkit.Bukkit;
@@ -34,7 +34,7 @@ public class PacketDownloadLang implements PacketObjectIn, PacketOut {
public PacketDownloadLang() {}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
try {
Util.reflect(SubPlugin.class.getDeclaredField("lang"), plugin, new NamedContainer<>(Calendar.getInstance().getTime().getTime(), data.getObject(0x0001)));
Bukkit.getLogger().info("SubData > Lang Settings Downloaded");
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadPlatformInfo.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadPlatformInfo.java
index a12b6755..912a8a68 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadPlatformInfo.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadPlatformInfo.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.Map;
@@ -30,7 +30,7 @@ public class PacketDownloadPlatformInfo implements PacketObjectIn, Pack
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
return data;
@@ -38,7 +38,7 @@ public class PacketDownloadPlatformInfo implements PacketObjectIn, Pack
@SuppressWarnings("unchecked")
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001)));
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadPlayerList.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadPlayerList.java
index 35a714f3..38d5671e 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadPlayerList.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadPlayerList.java
@@ -6,7 +6,7 @@ import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.Map;
@@ -32,7 +32,7 @@ public class PacketDownloadPlayerList implements PacketObjectIn, Packet
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap json = new ObjectMap();
json.set(0x0000, tracker);
return json;
@@ -40,7 +40,7 @@ public class PacketDownloadPlayerList implements PacketObjectIn, Packet
@SuppressWarnings("unchecked")
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001)));
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadProxyInfo.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadProxyInfo.java
index 08f21956..f920044b 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadProxyInfo.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadProxyInfo.java
@@ -6,7 +6,7 @@ import net.ME1312.Galaxi.Library.NamedContainer;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.Map;
@@ -40,7 +40,7 @@ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketO
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap json = new ObjectMap();
json.set(0x0000, tracker);
if (proxy != null) json.set(0x0001, proxy);
@@ -49,7 +49,7 @@ public class PacketDownloadProxyInfo implements PacketObjectIn, PacketO
@SuppressWarnings("unchecked")
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
boolean mode = callbacks.get(data.getUUID(0x0000)).name();
for (Callback> callback : callbacks.get(data.getUUID(0x0000)).get()) {
if (mode) {
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadServerInfo.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadServerInfo.java
index 466e08f1..ff19ef2a 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadServerInfo.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadServerInfo.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +39,7 @@ public class PacketDownloadServerInfo implements PacketObjectIn, Packet
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap json = new ObjectMap();
json.set(0x0000, tracker);
if (server != null) json.set(0x0001, server);
@@ -48,7 +48,7 @@ public class PacketDownloadServerInfo implements PacketObjectIn, Packet
@SuppressWarnings("unchecked")
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(new ObjectMap((Map) data.getObject(0x0001)));
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketEditServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketEditServer.java
index 2ffddafa..c4b88804 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketEditServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketEditServer.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.UUID;
@@ -47,7 +47,7 @@ public class PacketEditServer implements PacketObjectIn, PacketObjectOu
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, server);
@@ -58,7 +58,7 @@ public class PacketEditServer implements PacketObjectIn, PacketObjectOu
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketExCheckPermission.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketExCheckPermission.java
deleted file mode 100644
index d0488656..00000000
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketExCheckPermission.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package net.ME1312.SubServers.Client.Bukkit.Network.Packet;
-
-import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Util;
-import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
-import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
-import org.bukkit.Bukkit;
-
-import java.util.UUID;
-
-/**
- * External Check Permission Packet
- */
-public class PacketExCheckPermission implements PacketObjectIn, PacketObjectOut {
- private UUID player;
- private String permission;
- private UUID tracker;
-
- /**
- * New PacketExCheckPermission (In)
- */
- public PacketExCheckPermission() {}
-
- /**
- * New PacketExCheckPermission (Out)
- *
- * @param player Player to check on
- * @param permission Permission to check
- * @param tracker Receiver ID
- */
- public PacketExCheckPermission(UUID player, String permission, UUID tracker) {
- this.player = player;
- this.permission = permission;
- this.tracker = tracker;
- }
-
- @Override
- public ObjectMap send(SubDataClient client) throws Throwable {
- ObjectMap data = new ObjectMap();
- data.set(0x0000, tracker);
- data.set(0x0001, Util.getDespiteException(() -> Bukkit.getServer().getPlayer(player).hasPermission(permission), false));
- return data;
- }
-
- @Override
- public void receive(SubDataClient client, ObjectMap data) throws Throwable {
- client.sendPacket(new PacketExCheckPermission(data.getUUID(0x0001), data.getRawString(0x0002), (data.contains(0x0000))?data.getUUID(0x0000):null));
- }
-
- @Override
- public int version() {
- return 0x0001;
- }
-}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReload.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReload.java
index f2ae7bba..1fb069c4 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReload.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReload.java
@@ -3,7 +3,7 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
import org.bukkit.Bukkit;
@@ -23,7 +23,7 @@ public class PacketInExReload implements PacketObjectIn {
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
if (data != null && data.contains(0x0000)) Bukkit.getLogger().warning("SubData > Received request for a plugin reload: " + data.getString(0x0000));
else Bukkit.getLogger().warning("SubData > Received request for a plugin reload");
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReset.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReset.java
index 204b46a7..e5e04bd0 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReset.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExReset.java
@@ -3,7 +3,7 @@ package net.ME1312.SubServers.Client.Bukkit.Network.Packet;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import org.bukkit.Bukkit;
/**
@@ -12,7 +12,7 @@ import org.bukkit.Bukkit;
public class PacketInExReset implements PacketObjectIn {
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
if (data != null && data.contains(0x0000)) Bukkit.getLogger().warning("SubData > Received shutdown signal: " + data.getString(0x0000));
else Bukkit.getLogger().warning("SubData > Received shutdown signal");
Bukkit.shutdown();
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java
index 80fb748e..61a9c3f2 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Client.Bukkit.Network.Packet;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.Event.*;
import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
@@ -147,7 +147,7 @@ public class PacketInExRunEvent implements PacketObjectIn {
@SuppressWarnings("unchecked")
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
if (callbacks.keySet().contains(data.getString(0x0000))) {
List>> callbacks = PacketInExRunEvent.callbacks.get(data.getString(0x0000));
PacketInExRunEvent.callbacks.remove(data.getString(0x0000));
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java
index 31b361b6..694bff3f 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.Initial.InitialPacket;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.Event.SubNetworkConnectEvent;
import net.ME1312.SubServers.Client.Bukkit.SubAPI;
import net.ME1312.SubServers.Client.Bukkit.SubPlugin;
@@ -40,7 +40,7 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn,
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap json = new ObjectMap();
if (plugin.api.getName() != null) json.set(0x0000, plugin.api.getName());
json.set(0x0001, Bukkit.getServer().getPort());
@@ -49,12 +49,12 @@ public class PacketLinkServer implements InitialPacket, PacketObjectIn,
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
if (data.getInt(0x0001) == 0) {
try {
if (data.contains(0x0000)) {
Util.reflect(SubAPI.class.getDeclaredField("name"), plugin.api, data.getRawString(0x0000));
- setReady(client, true);
+ setReady(client.getConnection(), true);
}
} catch (Throwable e) {
e.printStackTrace();
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketRemoveServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketRemoveServer.java
index 60daaa1c..c49ae722 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketRemoveServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketRemoveServer.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.UUID;
@@ -43,7 +43,7 @@ public class PacketRemoveServer implements PacketObjectIn, PacketObject
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, server);
@@ -53,7 +53,7 @@ public class PacketRemoveServer implements PacketObjectIn, PacketObject
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketRestartServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketRestartServer.java
index f2c51daf..dba42f83 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketRestartServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketRestartServer.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.UUID;
@@ -41,7 +41,7 @@ public class PacketRestartServer implements PacketObjectIn, PacketObjec
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, server);
@@ -50,7 +50,7 @@ public class PacketRestartServer implements PacketObjectIn, PacketObjec
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketStartServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketStartServer.java
index b866ebec..b7a75806 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketStartServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketStartServer.java
@@ -5,7 +5,7 @@ import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.UUID;
@@ -41,7 +41,7 @@ public class PacketStartServer implements PacketObjectIn, PacketObjectO
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, server);
@@ -50,7 +50,7 @@ public class PacketStartServer implements PacketObjectIn, PacketObjectO
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketStopServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketStopServer.java
index abebb3a7..74f4e7d1 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketStopServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketStopServer.java
@@ -6,7 +6,7 @@ import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import java.util.HashMap;
import java.util.UUID;
@@ -45,7 +45,7 @@ public class PacketStopServer implements PacketObjectIn, PacketObjectOu
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, id);
data.set(0x0001, server);
@@ -55,7 +55,7 @@ public class PacketStopServer implements PacketObjectIn, PacketObjectOu
}
@Override
- public void receive(SubDataClient client, ObjectMap data) {
+ public void receive(SubDataSender client, ObjectMap data) {
for (Callback> callback : callbacks.get(data.getUUID(0x0000))) callback.run(data);
callbacks.remove(data.getUUID(0x0000));
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java
index 2881ab98..108ac404 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketUpdateServer.java
@@ -6,7 +6,7 @@ import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
-import net.ME1312.SubData.Client.SubDataClient;
+import net.ME1312.SubData.Client.SubDataSender;
import net.ME1312.SubServers.Client.Bukkit.Graphic.UIRenderer;
import java.util.HashMap;
@@ -62,7 +62,7 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject
}
@Override
- public ObjectMap send(SubDataClient client) {
+ public ObjectMap send(SubDataSender client) {
ObjectMap data = new ObjectMap();
data.set(0x0000, tracker);
data.set(0x0001, name);
@@ -73,7 +73,7 @@ public class PacketUpdateServer implements PacketObjectIn, PacketObject
}
@Override
- public void receive(SubDataClient client, ObjectMap