diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml index b068b632..dbfdd81f 100644 --- a/SubServers.Bungee/common/pom.xml +++ b/SubServers.Bungee/common/pom.xml @@ -28,7 +28,7 @@ net.ME1312.Galaxi GalaxiBase - 22w16a + 22w24a compile 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 0201ba94..ffee85af 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) { - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.host = host; this.name = name; 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 5751cee6..0fd0fc80 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) { - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.host = host; this.name = name; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java index 587fd434..7a1be0a1 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java @@ -37,7 +37,7 @@ public class SubCreateEvent extends Event implements SubEvent { */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { super(true); - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.update = update; this.host = host; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java index e91b8f24..ed1a577b 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java @@ -38,7 +38,7 @@ public class SubCreatedEvent extends Event implements SubEvent { */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { super(true); - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.success = success; this.update = update; 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 ee8e1574..4f4ca53f 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 @@ -58,7 +58,7 @@ public class PacketInExRunEvent implements PacketObjectIn { public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubCreateEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"), data.getString("name"), - data.getString("template"), (data.contains("version"))?new Version(data.getString("version")):null, data.getInt("port"), data.getBoolean("update"))); + data.getString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"))); callback("SubCreateEvent", this); } } @@ -68,7 +68,7 @@ public class PacketInExRunEvent implements PacketObjectIn { public void accept(ObjectMap data) { if (plugin.isEnabled()) { Bukkit.getPluginManager().callEvent(new SubCreatedEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"), data.getString("name"), - data.getString("template"), (data.contains("version"))?new Version(data.getString("version")):null, data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); + data.getString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); callback("SubCreatedEvent", this); } } diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml index 968a962b..0537e0fe 100644 --- a/SubServers.Client/Common/pom.xml +++ b/SubServers.Client/Common/pom.xml @@ -18,7 +18,7 @@ net.ME1312.Galaxi GalaxiBase - 22w16a + 22w24a compile diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java index 7b4f9eab..f025a79f 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java @@ -36,7 +36,7 @@ public class SubCreateEvent extends AbstractEvent implements SubEvent { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.update = update; this.host = host; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java index 6e358ddf..9d1ae3b7 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java @@ -37,7 +37,7 @@ public class SubCreatedEvent extends AbstractEvent implements SubEvent { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.success = success; this.update = update; diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java index 3ddd99f1..c5d00e2d 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java @@ -51,7 +51,7 @@ public class PacketInExRunEvent implements PacketObjectIn { @Override public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubCreateEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"), data.getString("name"), - data.getString("template"), new Version(data.getString("version")), data.getInt("port"), data.getBoolean("update"))); + data.getString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"))); callback("SubCreateEvent", this); } }); @@ -59,7 +59,7 @@ public class PacketInExRunEvent implements PacketObjectIn { @Override public void accept(ObjectMap data) { Sponge.getEventManager().post(new SubCreatedEvent((data.contains("player"))?data.getUUID("player"):null, data.getString("host"), data.getString("name"), - data.getString("template"), new Version(data.getString("version")), data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); + data.getString("template"), data.getVersion("version"), data.getInt("port"), data.getBoolean("update"), data.getBoolean("success"))); callback("SubCreatedEvent", this); } }); diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml index 5cf7daa4..de496c0b 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -30,13 +30,13 @@ net.ME1312.Galaxi GalaxiEngine - 22w16a + 22w24a compile net.ME1312.Galaxi GalaxiUI - 22w16a + 22w24a runtime diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java index b6ada700..9baaf375 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java @@ -33,7 +33,7 @@ public class SubCreateEvent extends Event { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.update = update; this.host = host; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java index 58adbb5a..05ee8d0b 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java @@ -34,7 +34,7 @@ public class SubCreatedEvent extends Event { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.success = success; this.update = update; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java index 9cbfa9c8..ad2ebf14 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java @@ -35,7 +35,7 @@ public class SubCreateEvent extends Event implements SubEvent { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - Util.nullpo(host, name, template, version, port); + Util.nullpo(host, name, template); this.player = player; this.update = update; this.host = host; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java index cc837bca..788d29d8 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java @@ -36,7 +36,7 @@ public class SubCreatedEvent extends Event implements SubEvent { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.success = success; this.update = update; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java index d2625b4e..5af1309d 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java @@ -33,7 +33,7 @@ public class SubCreateEvent implements SubEvent { * @param port Server Port Number */ public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port, boolean update) { - Util.nullpo(host, name, template, version, port); + Util.nullpo(host, name, template); this.player = player; this.update = update; this.host = host; diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java index 81343e96..8de8b3c9 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java @@ -34,7 +34,7 @@ public class SubCreatedEvent implements SubEvent { * @param port Server Port Number */ public SubCreatedEvent(UUID player, String host, String name, String template, Version version, int port, boolean update, boolean success) { - Util.nullpo(host, name, template, port); + Util.nullpo(host, name, template); this.player = player; this.success = success; this.update = update;