Upstream/SubServers-2
1
0
Fork 0
mirror of https://github.com/ME1312/SubServers-2.git synced 2024-11-22 10:15:52 +01:00
Code Issues Projects Releases Wiki Activity

Sign all builds with a Snapshot ID

Browse Source 
All builds of commonly updated SubServers apps are now auto-signed with a unique Snapshot ID simalar to the ones Mojang uses. This will replace the beta version number for unreleased builds.
This commit is contained in:
ME1312 2018-06-02 15:02:03 -04:00
parent 705660980c
commit 9f2618778f
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
38 changed files with 123 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Artifacts/SubServers.Bungee.Patcher.sh
View File

@ -30,7 +30,7 @@ echo ">> Extracting $1..."
mkdir BuildTools mkdir BuildTools
mkdir BuildTools/Modded.jar mkdir BuildTools/Modded.jar
cd BuildTools/Modded.jar cd BuildTools/Modded.jar
jar xvf ../../$1; retvala=$?; jar xvf "../../$1"; retvala=$?;
if [ $retvala -eq 0 ] if [ $retvala -eq 0 ]
then then
if [ -f "LICENSE.txt" ]; then if [ -f "LICENSE.txt" ]; then
@ -40,7 +40,7 @@ if [ $retvala -eq 0 ]
rm -Rf LICENSE rm -Rf LICENSE
fi fi
if [ -f "META-INF/MANIFEST.MF" ]; then 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 else
printf "Manifest-Version: 1.0\n" > ../MANIFEST.MF printf "Manifest-Version: 1.0\n" > ../MANIFEST.MF
fi fi
@ -50,7 +50,7 @@ if [ $retvala -eq 0 ]
echo ">> Extracting $2..." echo ">> Extracting $2..."
mkdir ../Vanilla.jar mkdir ../Vanilla.jar
cd ../Vanilla.jar cd ../Vanilla.jar
jar xvf ../../$2; retvalb=$?; jar xvf "../../$2"; retvalb=$?;
if [ $retvalb -eq 0 ] if [ $retvalb -eq 0 ]
then then
echo ">> Writing Changes..." echo ">> Writing Changes..."
@ -69,6 +69,9 @@ if [ $retvala -eq 0 ]
cd ../ cd ../
printf "Built-By: SubServers.Bungee.Patcher\n" >> MANIFEST.MF printf "Built-By: SubServers.Bungee.Patcher\n" >> MANIFEST.MF
cp -f MANIFEST.MF Modded.jar/META-INF 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 if [ ! -f "MODIFICATIONS" ]; then
printf "# SubServers.Bungee.Patcher generated difference list (may be empty if git is not installed)\n#\n" > MODIFICATIONS printf "# SubServers.Bungee.Patcher generated difference list (may be empty if git is not installed)\n#\n" > MODIFICATIONS
fi fi

BIN
Artifacts/SubServers.Bungee.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Client.Bukkit.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Host.jar
View File

Binary file not shown.

BIN
Artifacts/SubServers.Sync.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Bungee.jar
View File

Binary file not shown.

14
Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Version/VersionType.html
View File

@ -160,9 +160,12 @@ extends java.lang.Enum&lt;<a href="../../../../../../net/ME1312/SubServers/Bunge
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html#REVISION">REVISION</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html#REVISION">REVISION</a></span></code>&nbsp;</td>
</tr> </tr>
<tr class="altColor"> <tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html#UPDATE">UPDATE</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html#SNAPSHOT">SNAPSHOT</a></span></code>&nbsp;</td>
</tr> </tr>
<tr class="rowColor"> <tr class="rowColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html#UPDATE">UPDATE</a></span></code>&nbsp;</td>
</tr>
<tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html#VERSION">VERSION</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html#VERSION">VERSION</a></span></code>&nbsp;</td>
</tr> </tr>
</table> </table>
@ -267,6 +270,15 @@ the order they are declared.</div>
<pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Bungee.Library.Version">VersionType</a> BETA</pre> <pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Bungee.Library.Version">VersionType</a> BETA</pre>
</li> </li>
</ul> </ul>
<a name="SNAPSHOT">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>SNAPSHOT</h4>
<pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Bungee/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Bungee.Library.Version">VersionType</a> SNAPSHOT</pre>
</li>
</ul>
<a name="PRE_RELEASE"> <a name="PRE_RELEASE">
<!-- --> <!-- -->
</a> </a>

BIN
Javadoc/SubServers.Client.Bukkit.jar
View File

Binary file not shown.

14
Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html
View File

@ -160,9 +160,12 @@ extends java.lang.Enum&lt;<a href="../../../../../../../net/ME1312/SubServers/Cl
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html#REVISION">REVISION</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html#REVISION">REVISION</a></span></code>&nbsp;</td>
</tr> </tr>
<tr class="altColor"> <tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html#UPDATE">UPDATE</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html#SNAPSHOT">SNAPSHOT</a></span></code>&nbsp;</td>
</tr> </tr>
<tr class="rowColor"> <tr class="rowColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html#UPDATE">UPDATE</a></span></code>&nbsp;</td>
</tr>
<tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html#VERSION">VERSION</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html#VERSION">VERSION</a></span></code>&nbsp;</td>
</tr> </tr>
</table> </table>
@ -267,6 +270,15 @@ the order they are declared.</div>
<pre>public static final&nbsp;<a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Client.Bukkit.Library.Version">VersionType</a> BETA</pre> <pre>public static final&nbsp;<a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Client.Bukkit.Library.Version">VersionType</a> BETA</pre>
</li> </li>
</ul> </ul>
<a name="SNAPSHOT">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>SNAPSHOT</h4>
<pre>public static final&nbsp;<a href="../../../../../../../net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Client.Bukkit.Library.Version">VersionType</a> SNAPSHOT</pre>
</li>
</ul>
<a name="PRE_RELEASE"> <a name="PRE_RELEASE">
<!-- --> <!-- -->
</a> </a>

BIN
Javadoc/SubServers.Host.jar
View File

Binary file not shown.

12
Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html
View File

@ -293,22 +293,22 @@ extends java.lang.Object</pre>
<pre>public&nbsp;<a href="../../../../net/ME1312/SubServers/Host/Network/SubDataClient.html" title="class in net.ME1312.SubServers.Host.Network">SubDataClient</a> subdata</pre> <pre>public&nbsp;<a href="../../../../net/ME1312/SubServers/Host/Network/SubDataClient.html" title="class in net.ME1312.SubServers.Host.Network">SubDataClient</a> subdata</pre>
</li> </li>
</ul> </ul>
<a name="version"> <a name="api">
<!-- --> <!-- -->
</a> </a>
<ul class="blockList"> <ul class="blockList">
<li class="blockList"> <li class="blockList">
<h4>version</h4> <h4>api</h4>
<pre>public final&nbsp;<a href="../../../../net/ME1312/SubServers/Host/Library/Version/Version.html" title="class in net.ME1312.SubServers.Host.Library.Version">Version</a> version</pre> <pre>public final&nbsp;<a href="../../../../net/ME1312/SubServers/Host/SubAPI.html" title="class in net.ME1312.SubServers.Host">SubAPI</a> api</pre>
</li> </li>
</ul> </ul>
<a name="api"> <a name="version">
<!-- --> <!-- -->
</a> </a>
<ul class="blockListLast"> <ul class="blockListLast">
<li class="blockList"> <li class="blockList">
<h4>api</h4> <h4>version</h4>
<pre>public final&nbsp;<a href="../../../../net/ME1312/SubServers/Host/SubAPI.html" title="class in net.ME1312.SubServers.Host">SubAPI</a> api</pre> <pre>public final&nbsp;<a href="../../../../net/ME1312/SubServers/Host/Library/Version/Version.html" title="class in net.ME1312.SubServers.Host.Library.Version">Version</a> version</pre>
</li> </li>
</ul> </ul>
</li> </li>

14
Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Version/VersionType.html
View File

@ -160,9 +160,12 @@ extends java.lang.Enum&lt;<a href="../../../../../../net/ME1312/SubServers/Host/
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html#REVISION">REVISION</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html#REVISION">REVISION</a></span></code>&nbsp;</td>
</tr> </tr>
<tr class="altColor"> <tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html#UPDATE">UPDATE</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html#SNAPSHOT">SNAPSHOT</a></span></code>&nbsp;</td>
</tr> </tr>
<tr class="rowColor"> <tr class="rowColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html#UPDATE">UPDATE</a></span></code>&nbsp;</td>
</tr>
<tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html#VERSION">VERSION</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html#VERSION">VERSION</a></span></code>&nbsp;</td>
</tr> </tr>
</table> </table>
@ -267,6 +270,15 @@ the order they are declared.</div>
<pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Host.Library.Version">VersionType</a> BETA</pre> <pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Host.Library.Version">VersionType</a> BETA</pre>
</li> </li>
</ul> </ul>
<a name="SNAPSHOT">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>SNAPSHOT</h4>
<pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Host/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Host.Library.Version">VersionType</a> SNAPSHOT</pre>
</li>
</ul>
<a name="PRE_RELEASE"> <a name="PRE_RELEASE">
<!-- --> <!-- -->
</a> </a>

BIN
Javadoc/SubServers.Sync.jar
View File

Binary file not shown.

14
Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/Library/Version/VersionType.html
View File

@ -160,9 +160,12 @@ extends java.lang.Enum&lt;<a href="../../../../../../net/ME1312/SubServers/Sync/
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html#REVISION">REVISION</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html#REVISION">REVISION</a></span></code>&nbsp;</td>
</tr> </tr>
<tr class="altColor"> <tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html#UPDATE">UPDATE</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html#SNAPSHOT">SNAPSHOT</a></span></code>&nbsp;</td>
</tr> </tr>
<tr class="rowColor"> <tr class="rowColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html#UPDATE">UPDATE</a></span></code>&nbsp;</td>
</tr>
<tr class="altColor">
<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html#VERSION">VERSION</a></span></code>&nbsp;</td> <td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html#VERSION">VERSION</a></span></code>&nbsp;</td>
</tr> </tr>
</table> </table>
@ -267,6 +270,15 @@ the order they are declared.</div>
<pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Sync.Library.Version">VersionType</a> BETA</pre> <pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Sync.Library.Version">VersionType</a> BETA</pre>
</li> </li>
</ul> </ul>
<a name="SNAPSHOT">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>SNAPSHOT</h4>
<pre>public static final&nbsp;<a href="../../../../../../net/ME1312/SubServers/Sync/Library/Version/VersionType.html" title="enum in net.ME1312.SubServers.Sync.Library.Version">VersionType</a> SNAPSHOT</pre>
</li>
</ul>
<a name="PRE_RELEASE"> <a name="PRE_RELEASE">
<!-- --> <!-- -->
</a> </a>

BIN
SubServers.Bungee/src.jar
View File

Binary file not shown.

1
SubServers.Bungee/src/META-INF/MANIFEST.MF
View File

@ -2,3 +2,4 @@ Manifest-Version: 1.0
Class-Path: BungeeCord.jar Waterfall.jar Class-Path: BungeeCord.jar Waterfall.jar
Main-Class: net.ME1312.SubServers.Bungee.Launch Main-Class: net.ME1312.SubServers.Bungee.Launch
Implementation-Title: SubServers.Bungee Implementation-Title: SubServers.Bungee
Specification-Title: 18w22a

BIN
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip
View File

Binary file not shown.

BIN
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip
View File

Binary file not shown.

BIN
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip
View File

Binary file not shown.

5
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/Version.java
View File

@ -119,7 +119,7 @@ public class Version implements Serializable, Comparable<Version> {
* @see #toFullString() <b>#toString()</b> returns a valid string * @see #toFullString() <b>#toString()</b> returns a valid string
*/ */
public static Version fromString(String 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; Version current = null;
while (regex.find()) { while (regex.find()) {
try { try {
@ -140,6 +140,9 @@ public class Version implements Serializable, Comparable<Version> {
case "b": case "b":
type = VersionType.BETA; type = VersionType.BETA;
break; break;
case "s":
type = VersionType.SNAPSHOT;
break;
case "pr": case "pr":
type = VersionType.PRE_RELEASE; type = VersionType.PRE_RELEASE;
break; break;

11
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Version/VersionType.java
View File

@ -1,11 +1,12 @@
package net.ME1312.SubServers.Bungee.Library.Version; package net.ME1312.SubServers.Bungee.Library.Version;
public enum VersionType { public enum VersionType {
PRE_ALPHA(-5, "pa", "pre-alpha"), PRE_ALPHA(-6, "pa", "pre-alpha"),
ALPHA(-4, "a", "alpha"), ALPHA(-5, "a", "alpha"),
PREVIEW(-3, "pv", "preview"), PREVIEW(-4, "pv", "preview"),
PRE_BETA(-3, "pb", "pre-beta"), PRE_BETA(-4, "pb", "pre-beta"),
BETA(-2, "b", "beta"), BETA(-3, "b", "beta"),
SNAPSHOT(-2, "s", "snapshot"),
PRE_RELEASE(-1, "pr", "pre-release"), PRE_RELEASE(-1, "pr", "pre-release"),
RELEASE(0, "r", "release"), RELEASE(0, "r", "release"),
REVISION(0, "rv", "revision"), REVISION(0, "rv", "revision"),

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

@ -333,11 +333,11 @@ public final class SubCommand extends CommandX {
if (plugin.canSudo) { if (plugin.canSudo) {
if (args.length > 1) { if (args.length > 1) {
Map<String, Server> servers = plugin.api.getServers(); Map<String, Server> 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"); 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"); 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"); sender.sendMessage("SubServers > That SubServer is not running");
} else { } else {
plugin.sudo = (SubServer) servers.get(args[1].toLowerCase()); plugin.sudo = (SubServer) servers.get(args[1].toLowerCase());

3
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java
View File

@ -60,7 +60,8 @@ public final class SubPlugin extends BungeeCord implements Listener {
public SubServer sudo = null; public SubServer sudo = null;
//public static final Version version = new Version("2.13a"); //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.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 redis = false;
public boolean canSudo = true; public boolean canSudo = true;

BIN
SubServers.Client/Bukkit/src.jar
View File

Binary file not shown.

3
SubServers.Client/Bukkit/src/META-INF/MANIFEST.MF Normal file
View File

@ -0,0 +1,3 @@
Manifest-Version: 1.0
Implementation-Title: SubServers.Client.Bukkit
Specification-Title: 18w22a

5
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/Version.java
View File

@ -119,7 +119,7 @@ public class Version implements Serializable, Comparable<Version> {
* @see #toFullString() <b>#toString()</b> returns a valid string * @see #toFullString() <b>#toString()</b> returns a valid string
*/ */
public static Version fromString(String 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; Version current = null;
while (regex.find()) { while (regex.find()) {
try { try {
@ -140,6 +140,9 @@ public class Version implements Serializable, Comparable<Version> {
case "b": case "b":
type = VersionType.BETA; type = VersionType.BETA;
break; break;
case "s":
type = VersionType.SNAPSHOT;
break;
case "pr": case "pr":
type = VersionType.PRE_RELEASE; type = VersionType.PRE_RELEASE;
break; break;

11
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Version/VersionType.java
View File

@ -1,11 +1,12 @@
package net.ME1312.SubServers.Client.Bukkit.Library.Version; package net.ME1312.SubServers.Client.Bukkit.Library.Version;
public enum VersionType { public enum VersionType {
PRE_ALPHA(-5, "pa", "pre-alpha"), PRE_ALPHA(-6, "pa", "pre-alpha"),
ALPHA(-4, "a", "alpha"), ALPHA(-5, "a", "alpha"),
PREVIEW(-3, "pv", "preview"), PREVIEW(-4, "pv", "preview"),
PRE_BETA(-3, "pb", "pre-beta"), PRE_BETA(-4, "pb", "pre-beta"),
BETA(-2, "b", "beta"), BETA(-3, "b", "beta"),
SNAPSHOT(-2, "s", "snapshot"),
PRE_RELEASE(-1, "pr", "pre-release"), PRE_RELEASE(-1, "pr", "pre-release"),
RELEASE(0, "r", "release"), RELEASE(0, "r", "release"),
REVISION(0, "rv", "revision"), REVISION(0, "rv", "revision"),

3
SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
View File

@ -48,7 +48,8 @@ public final class SubPlugin extends JavaPlugin {
super(); super();
//version = new Version(getDescription().getVersion()); //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.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 */
} }
/** /**

BIN
SubServers.Host/src.jar
View File

Binary file not shown.

2
SubServers.Host/src/META-INF/MANIFEST.MF
View File

@ -1,2 +1,4 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Main-Class: net.ME1312.SubServers.Host.ExHost Main-Class: net.ME1312.SubServers.Host.ExHost
Implementation-Title: SubServers.Host
Specification-Title: 18w22a

5
SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
View File

@ -51,10 +51,11 @@ public final class ExHost {
public YAMLSection host = null; public YAMLSection host = null;
public SubDataClient subdata = 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("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.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 Version version = new Version(new Version(new Version("2.13a"), VersionType.PRE_RELEASE, 4), VersionType.SNAPSHOT,
public final SubAPI api = new SubAPI(this); (ExHost.class.getPackage().getSpecificationTitle() == null)?"0":ExHost.class.getPackage().getSpecificationTitle()); // TODO Beta Version Setting */
private ConsoleReader jline; private ConsoleReader jline;
private boolean running = false; private boolean running = false;

5
SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/Version.java
View File

@ -119,7 +119,7 @@ public class Version implements Serializable, Comparable<Version> {
* @see #toFullString() <b>#toString()</b> returns a valid string * @see #toFullString() <b>#toString()</b> returns a valid string
*/ */
public static Version fromString(String 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; Version current = null;
while (regex.find()) { while (regex.find()) {
try { try {
@ -140,6 +140,9 @@ public class Version implements Serializable, Comparable<Version> {
case "b": case "b":
type = VersionType.BETA; type = VersionType.BETA;
break; break;
case "s":
type = VersionType.SNAPSHOT;
break;
case "pr": case "pr":
type = VersionType.PRE_RELEASE; type = VersionType.PRE_RELEASE;
break; break;

11
SubServers.Host/src/net/ME1312/SubServers/Host/Library/Version/VersionType.java
View File

@ -1,11 +1,12 @@
package net.ME1312.SubServers.Host.Library.Version; package net.ME1312.SubServers.Host.Library.Version;
public enum VersionType { public enum VersionType {
PRE_ALPHA(-5, "pa", "pre-alpha"), PRE_ALPHA(-6, "pa", "pre-alpha"),
ALPHA(-4, "a", "alpha"), ALPHA(-5, "a", "alpha"),
PREVIEW(-3, "pv", "preview"), PREVIEW(-4, "pv", "preview"),
PRE_BETA(-3, "pb", "pre-beta"), PRE_BETA(-4, "pb", "pre-beta"),
BETA(-2, "b", "beta"), BETA(-3, "b", "beta"),
SNAPSHOT(-2, "s", "snapshot"),
PRE_RELEASE(-1, "pr", "pre-release"), PRE_RELEASE(-1, "pr", "pre-release"),
RELEASE(0, "r", "release"), RELEASE(0, "r", "release"),
REVISION(0, "rv", "revision"), REVISION(0, "rv", "revision"),

BIN
SubServers.Sync/src.jar
View File

Binary file not shown.

1
SubServers.Sync/src/META-INF/MANIFEST.MF
View File

@ -2,3 +2,4 @@ Manifest-Version: 1.0
Class-Path: BungeeCord.jar Waterfall.jar Class-Path: BungeeCord.jar Waterfall.jar
Main-Class: net.ME1312.SubServers.Sync.Launch Main-Class: net.ME1312.SubServers.Sync.Launch
Implementation-Title: SubServers.Sync Implementation-Title: SubServers.Sync
Specification-Title: 18w22a

5
SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/Version.java
View File

@ -119,7 +119,7 @@ public class Version implements Serializable, Comparable<Version> {
* @see #toFullString() <b>#toString()</b> returns a valid string * @see #toFullString() <b>#toString()</b> returns a valid string
*/ */
public static Version fromString(String 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; Version current = null;
while (regex.find()) { while (regex.find()) {
try { try {
@ -140,6 +140,9 @@ public class Version implements Serializable, Comparable<Version> {
case "b": case "b":
type = VersionType.BETA; type = VersionType.BETA;
break; break;
case "s":
type = VersionType.SNAPSHOT;
break;
case "pr": case "pr":
type = VersionType.PRE_RELEASE; type = VersionType.PRE_RELEASE;
break; break;

11
SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Version/VersionType.java
View File

@ -1,11 +1,12 @@
package net.ME1312.SubServers.Sync.Library.Version; package net.ME1312.SubServers.Sync.Library.Version;
public enum VersionType { public enum VersionType {
PRE_ALPHA(-5, "pa", "pre-alpha"), PRE_ALPHA(-6, "pa", "pre-alpha"),
ALPHA(-4, "a", "alpha"), ALPHA(-5, "a", "alpha"),
PREVIEW(-3, "pv", "preview"), PREVIEW(-4, "pv", "preview"),
PRE_BETA(-3, "pb", "pre-beta"), PRE_BETA(-4, "pb", "pre-beta"),
BETA(-2, "b", "beta"), BETA(-3, "b", "beta"),
SNAPSHOT(-2, "s", "snapshot"),
PRE_RELEASE(-1, "pr", "pre-release"), PRE_RELEASE(-1, "pr", "pre-release"),
RELEASE(0, "r", "release"), RELEASE(0, "r", "release"),
REVISION(0, "rv", "revision"), REVISION(0, "rv", "revision"),

3
SubServers.Sync/src/net/ME1312/SubServers/Sync/SubPlugin.java
View File

@ -50,7 +50,8 @@ public final class SubPlugin extends BungeeCord implements Listener {
public SubDataClient subdata = null; public SubDataClient subdata = null;
//public static final Version version = new Version("2.13a"); //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.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 final boolean isPatched;
public long lastReload = -1; public long lastReload = -1;