diff --git a/Artifacts/SubServers.Bungee.Patcher.sh b/Artifacts/SubServers.Bungee.Patcher.sh index 7dd1663c..dcd54787 100644 --- a/Artifacts/SubServers.Bungee.Patcher.sh +++ b/Artifacts/SubServers.Bungee.Patcher.sh @@ -30,7 +30,7 @@ echo ">> Extracting $1..." mkdir BuildTools mkdir BuildTools/Modded.jar cd BuildTools/Modded.jar -jar xvf ../../$1; retvala=$?; +jar xvf "../../$1"; retvala=$?; if [ $retvala -eq 0 ] then if [ -f "LICENSE.txt" ]; then @@ -40,7 +40,7 @@ if [ $retvala -eq 0 ] rm -Rf LICENSE fi if [ -f "META-INF/MANIFEST.MF" ]; then - cat META-INF/MANIFEST.MF | sed -e "/^\s*$/d" -e "/^Main-Class:.*$/d" -e "/^Implementation-Title:.*$/d" -e "/^Build-Jdk:.*$/d" -e "/^Created-By:.*$/d" -e "/^Built-By:.*$/d" > ../MANIFEST.MF + cat META-INF/MANIFEST.MF | sed -e "/^\s*$/d" -e "/^Main-Class:.*$/d" -e "/^Implementation-Title:.*$/d" -e "/^Specification-Title:.*$/d" -e "/^Build-Jdk:.*$/d" -e "/^Created-By:.*$/d" -e "/^Built-By:.*$/d" > ../MANIFEST.MF else printf "Manifest-Version: 1.0\n" > ../MANIFEST.MF fi @@ -50,7 +50,7 @@ if [ $retvala -eq 0 ] echo ">> Extracting $2..." mkdir ../Vanilla.jar cd ../Vanilla.jar - jar xvf ../../$2; retvalb=$?; + jar xvf "../../$2"; retvalb=$?; if [ $retvalb -eq 0 ] then echo ">> Writing Changes..." @@ -69,6 +69,9 @@ if [ $retvala -eq 0 ] cd ../ printf "Built-By: SubServers.Bungee.Patcher\n" >> MANIFEST.MF cp -f MANIFEST.MF Modded.jar/META-INF + if [ -f "Modded.jar/bungee.yml" ]; then + rm -Rf Modded.jar/bungee.yml + fi if [ ! -f "MODIFICATIONS" ]; then printf "# SubServers.Bungee.Patcher generated difference list (may be empty if git is not installed)\n#\n" > MODIFICATIONS fi diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index 243c49ce..bfe6caed 100644 Binary files a/Artifacts/SubServers.Bungee.jar and b/Artifacts/SubServers.Bungee.jar differ diff --git a/Artifacts/SubServers.Client.Bukkit.jar b/Artifacts/SubServers.Client.Bukkit.jar index 043b43e8..84086644 100644 Binary files a/Artifacts/SubServers.Client.Bukkit.jar and b/Artifacts/SubServers.Client.Bukkit.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index 129ac6a1..f613f1e0 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Artifacts/SubServers.Sync.jar b/Artifacts/SubServers.Sync.jar index 1d9a33e5..107747db 100644 Binary files a/Artifacts/SubServers.Sync.jar and b/Artifacts/SubServers.Sync.jar differ diff --git a/Javadoc/SubServers.Bungee.jar b/Javadoc/SubServers.Bungee.jar index 5aae0334..af760781 100644 Binary files a/Javadoc/SubServers.Bungee.jar and b/Javadoc/SubServers.Bungee.jar differ diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Version/VersionType.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Version/VersionType.html index 5c9ba4fd..b645bcbb 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Version/VersionType.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Version/VersionType.html @@ -160,9 +160,12 @@ extends java.lang.Enum<REVISION  -UPDATE  +SNAPSHOT  +UPDATE  + + VERSION  @@ -267,6 +270,15 @@ the order they are declared. 
public static final VersionType BETA
+ + + + diff --git a/Javadoc/SubServers.Client.Bukkit.jar b/Javadoc/SubServers.Client.Bukkit.jar index fd0ca54f..d0701d58 100644 Binary files a/Javadoc/SubServers.Client.Bukkit.jar and b/Javadoc/SubServers.Client.Bukkit.jar differ diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html index e82fbcbc..d02589e5 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html @@ -160,9 +160,12 @@ extends java.lang.Enum<REVISION  -UPDATE  +SNAPSHOT  +UPDATE  + + VERSION  @@ -267,6 +270,15 @@ the order they are declared. 
public static final VersionType BETA
+ + + + diff --git a/Javadoc/SubServers.Host.jar b/Javadoc/SubServers.Host.jar index b6c835e7..9fb2f48e 100644 Binary files a/Javadoc/SubServers.Host.jar and b/Javadoc/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html index c27d4219..75e353cc 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html @@ -293,22 +293,22 @@ extends java.lang.Object 
public SubDataClient subdata
- + - + diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Version/VersionType.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Version/VersionType.html index 19076941..6be5aae4 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Version/VersionType.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Version/VersionType.html @@ -160,9 +160,12 @@ extends java.lang.Enum<REVISION  -UPDATE  +SNAPSHOT  +UPDATE  + + VERSION  @@ -267,6 +270,15 @@ the order they are declared. 
public static final VersionType BETA
+ + + + diff --git a/Javadoc/SubServers.Sync.jar b/Javadoc/SubServers.Sync.jar index 62baca66..27ea6484 100644 Binary files a/Javadoc/SubServers.Sync.jar and b/Javadoc/SubServers.Sync.jar differ diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Library/Version/VersionType.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Library/Version/VersionType.html index a6f99d71..ce08772a 100644 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Library/Version/VersionType.html +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Library/Version/VersionType.html @@ -160,9 +160,12 @@ extends java.lang.Enum<REVISION  -UPDATE  +SNAPSHOT  +UPDATE  + + VERSION  @@ -267,6 +270,15 @@ the order they are declared. 
public static final VersionType BETA
+ + + + diff --git a/SubServers.Bungee/src.jar b/SubServers.Bungee/src.jar index 71c54dea..c8ef8697 100644 Binary files a/SubServers.Bungee/src.jar and b/SubServers.Bungee/src.jar differ diff --git a/SubServers.Bungee/src/META-INF/MANIFEST.MF b/SubServers.Bungee/src/META-INF/MANIFEST.MF index 015421c5..e463ec51 100644 --- a/SubServers.Bungee/src/META-INF/MANIFEST.MF +++ b/SubServers.Bungee/src/META-INF/MANIFEST.MF @@ -2,3 +2,4 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Waterfall.jar Main-Class: net.ME1312.SubServers.Bungee.Launch Implementation-Title: SubServers.Bungee +Specification-Title: 18w22a diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip index 1ab183ec..4e2bdf98 100644 Binary files a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip and b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip differ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip index 9e02e87a..6dc5f259 100644 Binary files a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip and b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip differ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip index 104f091e..2a5ecb77 100644 Binary files a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip and b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip differ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/Version.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/Version.java index 969b07b2..69fa96ca 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/Version.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/Version.java @@ -119,7 +119,7 @@ public class Version implements Serializable, Comparable { * @see #toFullString() #toString() returns a valid string */ public static Version fromString(String string) { - Matcher regex = Pattern.compile("(rv|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); + Matcher regex = Pattern.compile("(rv|s|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); Version current = null; while (regex.find()) { try { @@ -140,6 +140,9 @@ public class Version implements Serializable, Comparable { case "b": type = VersionType.BETA; break; + case "s": + type = VersionType.SNAPSHOT; + break; case "pr": type = VersionType.PRE_RELEASE; break; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/VersionType.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/VersionType.java index cacac29d..d9768429 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/VersionType.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/VersionType.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Bungee.Library.Version; public enum VersionType { - PRE_ALPHA(-5, "pa", "pre-alpha"), - ALPHA(-4, "a", "alpha"), - PREVIEW(-3, "pv", "preview"), - PRE_BETA(-3, "pb", "pre-beta"), - BETA(-2, "b", "beta"), + PRE_ALPHA(-6, "pa", "pre-alpha"), + ALPHA(-5, "a", "alpha"), + PREVIEW(-4, "pv", "preview"), + PRE_BETA(-4, "pb", "pre-beta"), + BETA(-3, "b", "beta"), + SNAPSHOT(-2, "s", "snapshot"), PRE_RELEASE(-1, "pr", "pre-release"), RELEASE(0, "r", "release"), REVISION(0, "rv", "revision"), diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index f4e219e2..d18169eb 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java @@ -333,11 +333,11 @@ public final class SubCommand extends CommandX { if (plugin.canSudo) { if (args.length > 1) { Map servers = plugin.api.getServers(); - if (!args[1].equals("*") && !servers.keySet().contains(args[1].toLowerCase())) { + if (!servers.keySet().contains(args[1].toLowerCase())) { sender.sendMessage("SubServers > There is no server with that name"); - } else if (!args[1].equals("*") && !(servers.get(args[1].toLowerCase()) instanceof SubServer)) { + } else if (!(servers.get(args[1].toLowerCase()) instanceof SubServer)) { sender.sendMessage("SubServers > That Server is not a SubServer"); - } else if (!args[1].equals("*") && !((SubServer) servers.get(args[1].toLowerCase())).isRunning()) { + } else if (!((SubServer) servers.get(args[1].toLowerCase())).isRunning()) { sender.sendMessage("SubServers > That SubServer is not running"); } else { plugin.sudo = (SubServer) servers.get(args[1].toLowerCase()); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index 6142b92f..fe689120 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java @@ -60,7 +60,8 @@ public final class SubPlugin extends BungeeCord implements Listener { public SubServer sudo = null; //public static final Version version = new Version("2.13a"); //public static final Version version = new Version(new Version("2.13a"), VersionType.BETA, 1); // TODO Beta Version Setting - public static final Version version = new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3); // TODO Beta Version Setting + public static final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 4), VersionType.SNAPSHOT, + (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"0":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Beta Version Setting */ public boolean redis = false; public boolean canSudo = true; diff --git a/SubServers.Client/Bukkit/src.jar b/SubServers.Client/Bukkit/src.jar index 09309734..40b9ef7d 100644 Binary files a/SubServers.Client/Bukkit/src.jar and b/SubServers.Client/Bukkit/src.jar differ diff --git a/SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF b/SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF new file mode 100644 index 00000000..d478634c --- /dev/null +++ b/SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Implementation-Title: SubServers.Client.Bukkit +Specification-Title: 18w22a diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/Version.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/Version.java index 8f463b16..46b8a5d7 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/Version.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/Version.java @@ -119,7 +119,7 @@ public class Version implements Serializable, Comparable { * @see #toFullString() #toString() returns a valid string */ public static Version fromString(String string) { - Matcher regex = Pattern.compile("(rv|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); + Matcher regex = Pattern.compile("(rv|s|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); Version current = null; while (regex.find()) { try { @@ -140,6 +140,9 @@ public class Version implements Serializable, Comparable { case "b": type = VersionType.BETA; break; + case "s": + type = VersionType.SNAPSHOT; + break; case "pr": type = VersionType.PRE_RELEASE; break; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.java index f1fb452c..6b47fd96 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Client.Bukkit.Library.Version; public enum VersionType { - PRE_ALPHA(-5, "pa", "pre-alpha"), - ALPHA(-4, "a", "alpha"), - PREVIEW(-3, "pv", "preview"), - PRE_BETA(-3, "pb", "pre-beta"), - BETA(-2, "b", "beta"), + PRE_ALPHA(-6, "pa", "pre-alpha"), + ALPHA(-5, "a", "alpha"), + PREVIEW(-4, "pv", "preview"), + PRE_BETA(-4, "pb", "pre-beta"), + BETA(-3, "b", "beta"), + SNAPSHOT(-2, "s", "snapshot"), PRE_RELEASE(-1, "pr", "pre-release"), RELEASE(0, "r", "release"), REVISION(0, "rv", "revision"), diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index 4bf766e9..fa26c3f0 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -48,7 +48,8 @@ public final class SubPlugin extends JavaPlugin { super(); //version = new Version(getDescription().getVersion()); //version = new Version(new Version(getDescription().getVersion()), VersionType.BETA, 1); // TODO Beta Version Setting - version = new Version(new Version(getDescription().getVersion()), VersionType.PRE_RELEASE, 3); // TODO Beta Version Setting + version = new Version(new Version(new Version(getDescription().getVersion()), VersionType.PRE_RELEASE, 4), VersionType.SNAPSHOT, + (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"0":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Beta Version Setting */ } /** diff --git a/SubServers.Host/src.jar b/SubServers.Host/src.jar index 2c8ddccd..567a31ca 100644 Binary files a/SubServers.Host/src.jar and b/SubServers.Host/src.jar differ diff --git a/SubServers.Host/src/META-INF/MANIFEST.MF b/SubServers.Host/src/META-INF/MANIFEST.MF index a51c711d..e64a36ab 100644 --- a/SubServers.Host/src/META-INF/MANIFEST.MF +++ b/SubServers.Host/src/META-INF/MANIFEST.MF @@ -1,2 +1,4 @@ Manifest-Version: 1.0 Main-Class: net.ME1312.SubServers.Host.ExHost +Implementation-Title: SubServers.Host +Specification-Title: 18w22a diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index 2e728e37..e6dd6f2a 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -51,10 +51,11 @@ public final class ExHost { public YAMLSection host = null; public SubDataClient subdata = null; + public final SubAPI api = new SubAPI(this); //public final Version version = new Version("2.13a"); //public final Version version = new Version(new Version("2.13a"), VersionType.BETA, 1); // TODO Beta Version Setting - public final Version version = new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3); // TODO Beta Version Setting - public final SubAPI api = new SubAPI(this); + public final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 4), VersionType.SNAPSHOT, + (ExHost.class.getPackage().getSpecificationTitle() == null)?"0":ExHost.class.getPackage().getSpecificationTitle()); // TODO Beta Version Setting */ private ConsoleReader jline; private boolean running = false; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/Version.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/Version.java index 1c9b28d0..124df34a 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/Version.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/Version.java @@ -119,7 +119,7 @@ public class Version implements Serializable, Comparable { * @see #toFullString() #toString() returns a valid string */ public static Version fromString(String string) { - Matcher regex = Pattern.compile("(rv|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); + Matcher regex = Pattern.compile("(rv|s|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); Version current = null; while (regex.find()) { try { @@ -140,6 +140,9 @@ public class Version implements Serializable, Comparable { case "b": type = VersionType.BETA; break; + case "s": + type = VersionType.SNAPSHOT; + break; case "pr": type = VersionType.PRE_RELEASE; break; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/VersionType.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/VersionType.java index 09f16474..81f49493 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/VersionType.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/VersionType.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Host.Library.Version; public enum VersionType { - PRE_ALPHA(-5, "pa", "pre-alpha"), - ALPHA(-4, "a", "alpha"), - PREVIEW(-3, "pv", "preview"), - PRE_BETA(-3, "pb", "pre-beta"), - BETA(-2, "b", "beta"), + PRE_ALPHA(-6, "pa", "pre-alpha"), + ALPHA(-5, "a", "alpha"), + PREVIEW(-4, "pv", "preview"), + PRE_BETA(-4, "pb", "pre-beta"), + BETA(-3, "b", "beta"), + SNAPSHOT(-2, "s", "snapshot"), PRE_RELEASE(-1, "pr", "pre-release"), RELEASE(0, "r", "release"), REVISION(0, "rv", "revision"), diff --git a/SubServers.Sync/src.jar b/SubServers.Sync/src.jar index 1bb148ad..cbbdd6df 100644 Binary files a/SubServers.Sync/src.jar and b/SubServers.Sync/src.jar differ diff --git a/SubServers.Sync/src/META-INF/MANIFEST.MF b/SubServers.Sync/src/META-INF/MANIFEST.MF index da7d5eb9..372af548 100644 --- a/SubServers.Sync/src/META-INF/MANIFEST.MF +++ b/SubServers.Sync/src/META-INF/MANIFEST.MF @@ -2,3 +2,4 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Waterfall.jar Main-Class: net.ME1312.SubServers.Sync.Launch Implementation-Title: SubServers.Sync +Specification-Title: 18w22a diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/Version.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/Version.java index 7961cb96..83da7b7c 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/Version.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/Version.java @@ -119,7 +119,7 @@ public class Version implements Serializable, Comparable { * @see #toFullString() #toString() returns a valid string */ public static Version fromString(String string) { - Matcher regex = Pattern.compile("(rv|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); + Matcher regex = Pattern.compile("(rv|s|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); Version current = null; while (regex.find()) { try { @@ -140,6 +140,9 @@ public class Version implements Serializable, Comparable { case "b": type = VersionType.BETA; break; + case "s": + type = VersionType.SNAPSHOT; + break; case "pr": type = VersionType.PRE_RELEASE; break; diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/VersionType.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/VersionType.java index aec704d6..2af604b2 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/VersionType.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/VersionType.java @@ -1,11 +1,12 @@ package net.ME1312.SubServers.Sync.Library.Version; public enum VersionType { - PRE_ALPHA(-5, "pa", "pre-alpha"), - ALPHA(-4, "a", "alpha"), - PREVIEW(-3, "pv", "preview"), - PRE_BETA(-3, "pb", "pre-beta"), - BETA(-2, "b", "beta"), + PRE_ALPHA(-6, "pa", "pre-alpha"), + ALPHA(-5, "a", "alpha"), + PREVIEW(-4, "pv", "preview"), + PRE_BETA(-4, "pb", "pre-beta"), + BETA(-3, "b", "beta"), + SNAPSHOT(-2, "s", "snapshot"), PRE_RELEASE(-1, "pr", "pre-release"), RELEASE(0, "r", "release"), REVISION(0, "rv", "revision"), diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java index e54bd61a..77819dbb 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java @@ -50,7 +50,8 @@ public final class SubPlugin extends BungeeCord implements Listener { public SubDataClient subdata = null; //public static final Version version = new Version("2.13a"); //public static final Version version = new Version(new Version("2.13a"), VersionType.BETA, 1); // TODO Beta Version Setting - public static final Version version = new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 3); // TODO Beta Version Setting + public static final Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 4), VersionType.SNAPSHOT, + (SubPlugin.class.getPackage().getSpecificationTitle() == null)?"0":SubPlugin.class.getPackage().getSpecificationTitle()); // TODO Beta Version Setting */ public final boolean isPatched; public long lastReload = -1;