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

Update BungeeCord 

The official BungeeCord fork hit us with a surprise incompatibility recently. Yikes.
This commit is contained in:
ME1312 2020-01-18 00:13:10 -05:00
parent d39d875e2b
commit 7a4d28b113
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
15 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SubServers.Bungee/pom.xml
View File

@ -24,7 +24,7 @@
<dependency>
<groupId>net.md_5</groupId>
<artifactId>bungeecord-internal</artifactId>
<version>1.9-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java
View File

@ -2,7 +2,7 @@ package net.ME1312.SubServers.Bungee;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiInfo;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiInfo;
import java.security.Security;
import java.text.SimpleDateFormat;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiCommand.java → SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommand.java
View File

@ -1,4 +1,4 @@
package net.ME1312.SubServers.Sync.Library.Compatibility;
package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Command;

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiCommandWrapper.java → SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java
View File

@ -1,4 +1,4 @@
package net.ME1312.SubServers.Bungee.Library.Compatibility;
package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
import net.ME1312.Galaxi.Galaxi;
import net.ME1312.Galaxi.Library.Util;

3
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiEventListener.java → SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiEventListener.java
View File

@ -1,9 +1,10 @@
package net.ME1312.SubServers.Bungee.Library.Compatibility;
package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
import net.ME1312.Galaxi.Event.ConsoleInputEvent;
import net.ME1312.Galaxi.Galaxi;
import net.ME1312.Galaxi.Library.Event.ListenerOrder;
import net.ME1312.Galaxi.Library.Event.Subscribe;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.SubProxy;
/**

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiInfo.java → SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/Galaxi/GalaxiInfo.java
View File

@ -1,4 +1,4 @@
package net.ME1312.SubServers.Bungee.Library.Compatibility;
package net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;

4
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
View File

@ -9,7 +9,7 @@ import net.ME1312.Galaxi.Library.NamedContainer;
import net.ME1312.Galaxi.Library.Util;
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.Galaxi.GalaxiInfo;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.Network.Packet.PacketCheckPermission;
import net.md_5.bungee.BungeeCord;
@ -31,7 +31,7 @@ import java.nio.charset.Charset;
import java.util.*;
import java.util.concurrent.TimeUnit;
import static net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiCommand.*;
import static net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand.*;
/**
* Plugin Command Class

6
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
View File

@ -15,7 +15,7 @@ import net.ME1312.SubServers.Bungee.Host.*;
import net.ME1312.SubServers.Bungee.Library.*;
import net.ME1312.Galaxi.Library.Config.YAMLConfig;
import net.ME1312.Galaxi.Library.Config.YAMLSection;
import net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiCommand;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCommand;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.Library.Fallback.SmartReconnectHandler;
import net.ME1312.SubServers.Bungee.Library.Updates.ConfigUpdater;
@ -72,7 +72,7 @@ public final class SubProxy extends BungeeCord implements Listener {
public SubProtocol subprotocol;
public SubDataServer subdata = null;
public SubServer sudo = null;
public static final Version version = Version.fromString("2.15a");
public static final Version version = Version.fromString("2.15a/rv2");
public Proxy redis = null;
public boolean canSudo = false;
@ -233,7 +233,7 @@ public final class SubProxy extends BungeeCord implements Listener {
subprotocol = SubProtocol.get();
Logger.get("SubServers").info("Loading BungeeCord Libraries...");
if (isGalaxi) Util.reflect(net.ME1312.SubServers.Bungee.Library.Compatibility.GalaxiEventListener.class.getConstructor(SubProxy.class), this);
if (isGalaxi) Util.reflect(net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiEventListener.class.getConstructor(SubProxy.class), this);
}
/**

2
SubServers.Sync/pom.xml
View File

@ -24,7 +24,7 @@
<dependency>
<groupId>net.md_5</groupId>
<artifactId>bungeecord-internal</artifactId>
<version>1.9-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

4
SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java
View File

@ -9,7 +9,7 @@ import net.ME1312.SubData.Client.Library.DisconnectReason;
import net.ME1312.SubServers.Sync.Event.*;
import net.ME1312.Galaxi.Library.Config.YAMLConfig;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.SubServers.Sync.Library.Compatibility.GalaxiCommand;
import net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi.GalaxiCommand;
import net.ME1312.SubServers.Sync.Library.Compatibility.Logger;
import net.ME1312.SubServers.Sync.Library.Fallback.SmartReconnectHandler;
import net.ME1312.SubServers.Sync.Library.Metrics;
@ -57,7 +57,7 @@ public final class ExProxy extends BungeeCord implements Listener {
public boolean redis = false;
public final SubAPI api = new SubAPI(this);
public SubProtocol subprotocol;
public static final Version version = Version.fromString("2.15a");
public static final Version version = Version.fromString("2.15a/rv2");
public final boolean isPatched;
public final boolean isGalaxi;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java
View File

@ -2,7 +2,7 @@ package net.ME1312.SubServers.Sync;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Sync.Library.Compatibility.GalaxiInfo;
import net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi.GalaxiInfo;
import java.security.Security;
import java.text.SimpleDateFormat;

2
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Compatibility/GalaxiCommand.java → SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiCommand.java
View File

@ -1,4 +1,4 @@
package net.ME1312.SubServers.Bungee.Library.Compatibility;
package net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi;
import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Command;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiCommandWrapper.java → SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiCommandWrapper.java
View File

@ -1,4 +1,4 @@
package net.ME1312.SubServers.Sync.Library.Compatibility;
package net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi;
import net.ME1312.Galaxi.Galaxi;
import net.ME1312.Galaxi.Library.Util;

2
SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/GalaxiInfo.java → SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/Galaxi/GalaxiInfo.java
View File

@ -1,4 +1,4 @@
package net.ME1312.SubServers.Sync.Library.Compatibility;
package net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;

4
SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java
View File

@ -10,7 +10,7 @@ import net.ME1312.Galaxi.Library.Container;
import net.ME1312.Galaxi.Library.NamedContainer;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Sync.Library.Compatibility.GalaxiInfo;
import net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi.GalaxiInfo;
import net.ME1312.SubServers.Sync.Network.API.*;
import net.ME1312.SubServers.Sync.Network.Packet.*;
import net.ME1312.SubServers.Sync.Server.ServerImpl;
@ -33,7 +33,7 @@ import java.nio.charset.Charset;
import java.util.*;
import java.util.concurrent.TimeUnit;
import static net.ME1312.SubServers.Sync.Library.Compatibility.GalaxiCommand.*;
import static net.ME1312.SubServers.Sync.Library.Compatibility.Galaxi.GalaxiCommand.*;
@SuppressWarnings("deprecation")
public final class SubCommand extends CommandX {