Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#80 Bring creation event handling up to spec

This commit is contained in:
ME1312 2022-08-17 13:18:44 -04:00
parent 41dd2d69d0
commit 36f2821524
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
17 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SubServers.Bungee/common/pom.xml
View File

@ -28,7 +28,7 @@
<dependency>
<groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiBase</artifactId>
<version>22w16a</version>
<version>22w24a</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreateEvent.java
View File

@ -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;

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubCreatedEvent.java
View File

@ -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;

2
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreateEvent.java
View File

@ -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;

2
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubCreatedEvent.java
View File

@ -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;

4
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInExRunEvent.java
View File

@ -58,7 +58,7 @@ public class PacketInExRunEvent implements PacketObjectIn<Integer> {
public void accept(ObjectMap<String> 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<Integer> {
public void accept(ObjectMap<String> 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);
}
}

2
SubServers.Client/Common/pom.xml
View File

@ -18,7 +18,7 @@
<dependency>
<groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiBase</artifactId>
<version>22w16a</version>
<version>22w24a</version>
<scope>compile</scope>
</dependency>
<dependency>

2
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreateEvent.java
View File

@ -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;

2
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Event/SubCreatedEvent.java
View File

@ -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;

4
SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketInExRunEvent.java
View File

@ -51,7 +51,7 @@ public class PacketInExRunEvent implements PacketObjectIn<Integer> {
@Override
public void accept(ObjectMap<String> 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<Integer> {
@Override
public void accept(ObjectMap<String> 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);
}
});

4
SubServers.Host/pom.xml
View File

@ -30,13 +30,13 @@
<dependency>
<groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiEngine</artifactId>
<version>22w16a</version>
<version>22w24a</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.ME1312.Galaxi</groupId>
<artifactId>GalaxiUI</artifactId>
<version>22w16a</version>
<version>22w24a</version>
<scope>runtime</scope>
</dependency>
<dependency>

2
SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreateEvent.java
View File

@ -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;

2
SubServers.Host/src/net/ME1312/SubServers/Host/Event/SubCreatedEvent.java
View File

@ -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;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java
View File

@ -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;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreatedEvent.java
View File

@ -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;

2
SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreateEvent.java
View File

@ -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;

2
SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/Event/SubCreatedEvent.java
View File

@ -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;