Update default templates

SubServers.Bungee/common/pom.xml

@@ -28,7 +28,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w44c</version>
+            <version>21w47d</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

SubServers.Bungee/pom.xml

@@ -84,7 +84,6 @@
                                 <copy file="${basedir}/../Artifacts/SubServers.Client.Universal.jar" tofile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/client.jar" />
                                 <mkdir dir="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates" />
                                 <zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip" includes="Forge/**" />
-                                <zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip" includes="Paper/**" />
                                 <zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/purpur.zip" includes="Purpur/**" />
                                 <zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip" includes="Spigot/**" />
                                 <zip basedir="${basedir}/../SubServers.Creator" destfile="${project.build.directory}/classes/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip" includes="Sponge/**" />

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java

@@ -534,6 +534,11 @@ public abstract class Host implements ExtraDataHandler<String> {
         return signature;
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Host && signature.equals(((Host) obj).signature);
+    }
+
     @Override
     public void addExtra(String handle, Object value) {
         Util.nullpo(handle, value);

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java

@@ -156,6 +156,11 @@ public class Proxy implements ClientHandler, ExtraDataHandler<String> {
         return signature;
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof Proxy && signature.equals(((Proxy) obj).signature);
+    }
+
     @Override
     public void addExtra(String handle, Object value) {
         Util.nullpo(handle, value);

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java

@@ -265,6 +265,11 @@ public class ServerImpl extends BungeeServerInfo implements Server {
         return signature;
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof ServerImpl && signature.equals(((ServerImpl) obj).signature);
+    }
+
     @Override
     public void addExtra(String handle, Object value) {
         Util.nullpo(handle, value);

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java

@@ -537,4 +537,9 @@ public abstract class SubCreator {
      * Reload SubCreator
      */
     public abstract void reload();
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof SubCreator && getHost().getSignature().equals(((SubCreator) obj).getHost().getSignature());
+    }
 }

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java

@@ -188,7 +188,12 @@ public abstract class SubServerImpl extends ServerImpl implements SubServer {
         return servers;
     }
 
-    @SuppressWarnings({"deprecation", "unchecked"})
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof SubServerImpl && super.equals(obj);
+    }
+
+    @SuppressWarnings("deprecation")
     @Override
     public ObjectMap<String> forSubData() {
         ObjectMap<String> sinfo = super.forSubData();

SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java

@@ -92,7 +92,7 @@ public final class SubProxy extends BungeeCommon implements Listener {
     public SubProtocol subprotocol;
     public SubDataServer subdata = null;
     public SubServer sudo = null;
-    public static final Version version = Version.fromString("2.17.1a");
+    public static final Version version = Version.fromString("2.18a");
 
     public final Proxy mProxy;
     public boolean canSudo = false;
@@ -145,9 +145,6 @@ public final class SubProxy extends BungeeCommon implements Listener {
             Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip"), new File(dir, "Templates"));
             Logger.get("SubServers").info("Created ./SubServers/Templates/Spigot");
 
-            Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip"), new File(dir, "Templates"));
-            Logger.get("SubServers").info("Created ./SubServers/Templates/Paper");
-
             Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/purpur.zip"), new File(dir, "Templates"));
             Logger.get("SubServers").info("Created ./SubServers/Templates/Purpur");
 
@@ -158,34 +155,30 @@ public final class SubProxy extends BungeeCommon implements Listener {
             Logger.get("SubServers").info("Created ./SubServers/Templates/Sponge");
         } else {
             long stamp = Math.round(Math.random() * 100000);
-            Version version = new Version("2.16a+");
+            Version tv1 = new Version("2.16a+");
+            Version tv2 = new Version("2.18a+");
 
-            if (new File(dir, "Templates/Vanilla/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Vanilla/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) {
+            if (new File(dir, "Templates/Vanilla/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Vanilla/template.yml"))).get().getVersion("Version", tv2)).compareTo(tv2) != 0) {
                 Files.move(new File(dir, "Templates/Vanilla").toPath(), new File(dir, "Templates/Vanilla." + stamp + ".x").toPath());
                 Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip"), new File(dir, "Templates"));
                 Logger.get("SubServers").info("Updated ./SubServers/Templates/Vanilla");
             }
-            if (new File(dir, "Templates/Spigot/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Spigot/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) {
+            if (new File(dir, "Templates/Spigot/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Spigot/template.yml"))).get().getVersion("Version", tv1)).compareTo(tv1) != 0) {
                 Files.move(new File(dir, "Templates/Spigot").toPath(), new File(dir, "Templates/Spigot." + stamp + ".x").toPath());
                 Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip"), new File(dir, "Templates"));
                 Logger.get("SubServers").info("Updated ./SubServers/Templates/Spigot");
             }
-            if (new File(dir, "Templates/Paper/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Paper/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) {
+            if (new File(dir, "Templates/Purpur/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Purpur/template.yml"))).get().getVersion("Version", tv2)).compareTo(tv2) != 0) {
-                Files.move(new File(dir, "Templates/Paper").toPath(), new File(dir, "Templates/Paper." + stamp + ".x").toPath());
-                Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/paper.zip"), new File(dir, "Templates"));
-                Logger.get("SubServers").info("Updated ./SubServers/Templates/Paper");
-            }
-            if (new File(dir, "Templates/Purpur/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Purpur/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) {
                 Files.move(new File(dir, "Templates/Purpur").toPath(), new File(dir, "Templates/Purpur." + stamp + ".x").toPath());
                 Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/purpur.zip"), new File(dir, "Templates"));
                 Logger.get("SubServers").info("Updated ./SubServers/Templates/Purpur");
             }
-            if (new File(dir, "Templates/Forge/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Forge/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) {
+            if (new File(dir, "Templates/Forge/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Forge/template.yml"))).get().getVersion("Version", tv2)).compareTo(tv2) != 0) {
                 Files.move(new File(dir, "Templates/Forge").toPath(), new File(dir, "Templates/Forge." + stamp + ".x").toPath());
                 Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/forge.zip"), new File(dir, "Templates"));
                 Logger.get("SubServers").info("Updated ./SubServers/Templates/Forge");
             }
-            if (new File(dir, "Templates/Sponge/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Sponge/template.yml"))).get().getVersion("Version", version)).compareTo(version) != 0) {
+            if (new File(dir, "Templates/Sponge/template.yml").exists() && ((new YAMLConfig(new File(dir, "Templates/Sponge/template.yml"))).get().getVersion("Version", tv1)).compareTo(tv1) != 0) {
                 Files.move(new File(dir, "Templates/Sponge").toPath(), new File(dir, "Templates/Sponge." + stamp + ".x").toPath());
                 Directories.unzip(SubProxy.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip"), new File(dir, "Templates"));
                 Logger.get("SubServers").info("Updated ./SubServers/Templates/Sponge");

SubServers.Client/Bukkit/src/plugin.yml

@@ -1,6 +1,6 @@
 name: SubServers-Client-Bukkit
 main: net.ME1312.SubServers.Client.Bukkit.SubPlugin
-version: "2.17.1a"
+version: "2.18a"
 authors: ["ME1312"]
 softdepend: [TitleAPI, PlaceholderAPI]
 website: "https://github.com/ME1312/SubServers-2"

SubServers.Client/Common/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUtil</artifactId>
-            <version>21w44c</version>
+            <version>21w47d</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubPlugin.java

@@ -47,7 +47,7 @@ import static net.ME1312.SubServers.Client.Sponge.Library.AccessMode.NO_COMMANDS
 /**
  * SubServers Client Plugin Class
  */
-@Plugin(id = "subservers-client-sponge", name = "SubServers-Client-Sponge", authors = "ME1312", version = "2.17.1a", url = "https://github.com/ME1312/SubServers-2", description = "Take control of the server manager — from your servers")
+@Plugin(id = "subservers-client-sponge", name = "SubServers-Client-Sponge", authors = "ME1312", version = "2.18a", url = "https://github.com/ME1312/SubServers-2", description = "Take control of the server manager — from your servers")
 public final class SubPlugin {
     HashMap<Integer, SubDataClient> subdata = new HashMap<Integer, SubDataClient>();
     Pair<Long, Map<String, Map<String, String>>> lang = null;

SubServers.Console/src/bungee.yml

@@ -1,4 +1,4 @@
 name: SubServers-Console
 main: net.ME1312.SubServers.Console.ConsolePlugin
-version: 2.17.1a
+version: 2.18a
 author: ME1312

SubServers.Creator/Forge/template.yml

@@ -1,4 +1,4 @@
-Version: '2.16a+'
+Version: '2.18a+'
 Template:
   Enabled: true
   Icon: 'anvil'

SubServers.Creator/Paper/build.sh

@@ -1,52 +0,0 @@
-# SubCreator Paper Build Script
-#
-#!/usr/bin/env bash
-if [[ -z "$version" ]]
-  then
-    echo ERROR: No Build Version Supplied
-    rm -Rf "$0"
-    exit 1
-fi
-function __DL() {
-    if [[ -x "$(command -v wget)" ]]; then
-        wget -O "$1" "$2"; return $?
-    else
-        curl -Lo "$1" "$2"; return $?
-    fi
-}
-function __Restore() {
-    if [[ -f "Paper.old.jar.x" ]]; then
-        if [[ -f "Paper.jar" ]]; then
-            rm -Rf Paper.jar
-        fi
-        mv Paper.old.jar.x Paper.jar
-    fi
-}
-echo Downloading Paper...
-if [[ -f "Paper.jar" ]]; then
-    if [[ -f "Paper.old.jar.x" ]]; then
-        rm -Rf Paper.old.jar.x
-    fi
-    mv Paper.jar Paper.old.jar.x
-fi
-__DL Paper.jar "https://papermc.io/api/v1/paper/$version/latest/download"; __RETURN=$?
-if [[ $__RETURN -eq 0 ]]; then
-    if [[ $(stat -c%s "Paper.jar") -ge 1000000 ]]; then
-        echo Cleaning Up...
-        rm -Rf "$0"
-        exit 0
-    else
-        echo ERROR: Received invalid jarfile when requesting Paper version $version:
-        cat Paper.jar
-        printf "\n"
-        __Restore
-        rm -Rf "$0"
-        exit 4
-    fi
-else
-    echo ERROR: Failed downloading Paper. Is PaperMC.io down?
-    __Restore
-    rm -Rf "$0"
-    exit 3
-fi
-exit 2

SubServers.Creator/Paper/eula.txt

@@ -1,2 +0,0 @@
-#By using SubCreator to create your server you have indicated your agreement to the Minecraft EULA (https://account.mojang.com/documents/minecraft_eula).
-eula=true

SubServers.Creator/Paper/server.properties

@@ -1,10 +0,0 @@
-#Minecraft server properties
-server-ip=SubServers::address
-server-port=SubServers::port
-online-mode=false
-enable-query=false
-broadcast-console-to-ops=false
-announce-player-achievements=false
-network-compression-threshold=-1
-enable-command-block=true
-motd=Some SubServer

SubServers.Creator/Paper/spigot.yml

@@ -1,3 +0,0 @@
-config-version: 4
-settings:
-  bungeecord: true

SubServers.Creator/Paper/template.yml

@@ -1,12 +0,0 @@
-Version: '2.16a+'
-Template:
-  Enabled: true
-  Icon: 'paper'
-  Build:
-    Server-Type: 'Spigot'
-    Use-Cache: false
-    Require-Version: true
-    Can-Update: true
-    Executable: 'bash build.sh'
-  Settings:
-    Executable: 'java -Xmx1024M -Dterminal.jline=false -jar Paper.jar nogui'

SubServers.Creator/Purpur/template.yml

@@ -1,4 +1,4 @@
-Version: '2.16a+'
+Version: '2.18a+'
 Template:
   Enabled: true
   Icon: 'purpur_block'

SubServers.Creator/Vanilla/build.sh

@@ -24,7 +24,7 @@ if [[ -z "$cache" ]] || [[ ! -f "$cache/Vanilla-$version.jar" ]]; then
     fi
     mkdir VanillaCord
     echo Downloading the VanillaCord Launcher...
-    __DL VanillaCord/VanillaCord.jar https://dev.me1312.net/jenkins/job/VanillaCord/job/master/lastSuccessfulBuild/artifact/artifacts/VanillaCord.jar; __RETURN=$?
+    __DL VanillaCord/VanillaCord.jar https://dev.me1312.net/jenkins/job/VanillaCord/lastSuccessfulBuild/artifact/artifacts/VanillaCord.jar; __RETURN=$?
     if [[ $__RETURN -eq 0 ]]; then
         cd VanillaCord
         echo Launching VanillaCord

SubServers.Creator/Vanilla/template.yml

@@ -1,4 +1,4 @@
-Version: '2.16a+'
+Version: '2.18a+'
 Template:
   Enabled: true
   Icon: 'bukkit:grass'

SubServers.Host/pom.xml

@@ -30,13 +30,13 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiEngine</artifactId>
-            <version>21w44c</version>
+            <version>21w47d</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiUI</artifactId>
-            <version>21w44c</version>
+            <version>21w47d</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java

@@ -42,7 +42,7 @@ import java.util.jar.Manifest;
 /**
  * SubServers.Host Main Class
  */
-@App(name = "SubServers.Host", version = "2.17.1a", authors = "ME1312", website = "https://github.com/ME1312/SubServers-2", description = "Host subservers on separate machines")
+@App(name = "SubServers.Host", version = "2.18a", authors = "ME1312", website = "https://github.com/ME1312/SubServers-2", description = "Host subservers on separate machines")
 public final class ExHost {
     HashMap<Integer, SubDataClient> subdata = new HashMap<Integer, SubDataClient>();
     Pair<Long, Map<String, Map<String, String>>> lang = null;

SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java

@@ -1008,12 +1008,10 @@ public class SubCommand {
                 i++;
             }
 
-            LinkedList<Server> history = new LinkedList<Server>();
             LinkedList<Server> servers = new LinkedList<Server>();
             LinkedList<SubServer> subservers = new LinkedList<SubServer>();
             for (Server server : select) {
-                if (!history.contains(server)) {
+                if (!servers.contains(server)) {
-                    history.add(server);
                     servers.add(server);
                     if (server instanceof SubServer)
                         subservers.add((SubServer) server);

SubServers.Sync/src/net/ME1312/SubServers/Sync/ExProxy.java

@@ -74,7 +74,7 @@ public final class ExProxy extends BungeeCommon implements Listener {
     public final Plugin plugin;
     public final SubAPI api = new SubAPI(this);
     public SubProtocol subprotocol;
-    public static final Version version = Version.fromString("2.17.1a");
+    public static final Version version = Version.fromString("2.18a");
 
     public final boolean isPatched;
     public long lastReload = -1;

SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java

@@ -761,12 +761,10 @@ public final class SubCommand extends Command implements TabExecutor {
                 i++;
             }
 
-            LinkedList<Server> history = new LinkedList<Server>();
             LinkedList<Server> servers = new LinkedList<Server>();
             LinkedList<SubServer> subservers = new LinkedList<SubServer>();
             for (Server server : select) {
-                if (!history.contains(server)) {
+                if (!servers.contains(server)) {
-                    history.add(server);
                     servers.add(server);
                     if (server instanceof SubServer)
                         subservers.add((SubServer) server);

SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/ExProxy.java

@@ -64,7 +64,7 @@ import java.nio.charset.Charset;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-@Plugin(id = "subservers-sync", name = "SubServers-Sync", authors = "ME1312", version = "2.17.1a/pr1", url = "https://github.com/ME1312/SubServers-2", description = "Dynamically sync player and server connection info over multiple proxy instances")
+@Plugin(id = "subservers-sync", name = "SubServers-Sync", authors = "ME1312", version = "2.18a", url = "https://github.com/ME1312/SubServers-2", description = "Dynamically sync player and server connection info over multiple proxy instances")
 public class ExProxy {
 
     HashMap<Integer, SubDataClient> subdata = new HashMap<Integer, SubDataClient>();

SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java

@@ -766,12 +766,10 @@ public final class SubCommand implements SimpleCommand {
                 i++;
             }
 
-            LinkedList<Server> history = new LinkedList<Server>();
             LinkedList<Server> servers = new LinkedList<Server>();
             LinkedList<SubServer> subservers = new LinkedList<SubServer>();
             for (Server server : select) {
-                if (!history.contains(server)) {
+                if (!servers.contains(server)) {
-                    history.add(server);
                     servers.add(server);
                     if (server instanceof SubServer)
                         subservers.add((SubServer) server);