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

Use the VanillaCord repo for vanilla builds

Browse Source
This commit is contained in:
ME1312 2018-06-19 21:24:16 -04:00
parent 2cabdf85ab
commit 15713d58b4
No known key found for this signature in database
GPG Key ID: FEFFE2F698E88FA8
24 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.

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

Binary file not shown.

BIN
Javadoc/SubServers.Host.jar
View File

Binary file not shown.

BIN
Javadoc/SubServers.Sync.jar
View File

Binary file not shown.

BIN
SubServers.Bungee/src.jar
View File

Binary file not shown.

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

@ -2,4 +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: 18w23a Specification-Title: 18w25a

8
SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
View File

@ -90,13 +90,13 @@ public class InternalSubCreator extends SubCreator {
System.out.println(name + File.separator + "Creator > Loading Template: " + template.getDisplayName()); System.out.println(name + File.separator + "Creator > Loading Template: " + template.getDisplayName());
Util.copyDirectory(template.getDirectory(), dir); Util.copyDirectory(template.getDirectory(), dir);
if (template.getType() == ServerType.VANILLA) { if (template.getType() == ServerType.VANILLA) {
String commit; String branch;
if (version.compareTo(new Version("1.12")) >= 0) { if (version.compareTo(new Version("1.12")) >= 0) {
commit = "6c29bc48854f75fae6e8c16bbbdb47bd53a8e082"; branch = "1.12";
} else { } else {
commit = "339144e5cc406c3bc71aed66b636cbb348932eb0"; branch = "1.7.10";
} }
version = new Version(version.toString() + " " + commit); version = new Version(version.toString() + " " + branch);
} else if (template.getType() == ServerType.SPONGE) { } else if (template.getType() == ServerType.SPONGE) {
System.out.println(name + File.separator + "Creator > Searching Versions..."); System.out.println(name + File.separator + "Creator > Searching Versions...");
Document spongexml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(Util.readAll(new BufferedReader(new InputStreamReader(new URL("http://files.minecraftforge.net/maven/org/spongepowered/spongeforge/maven-metadata.xml").openStream(), Charset.forName("UTF-8"))))))); Document spongexml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(Util.readAll(new BufferedReader(new InputStreamReader(new URL("http://files.minecraftforge.net/maven/org/spongepowered/spongeforge/maven-metadata.xml").openStream(), Charset.forName("UTF-8")))))));

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

Binary file not shown.

2
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|s|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); Matcher regex = Pattern.compile("(rv|p?[abrv]|[su])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string);
Version current = null; Version current = null;
while (regex.find()) { while (regex.find()) {
try { try {

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

@ -119,7 +119,7 @@ public final class SubPlugin extends BungeeCord implements Listener {
Util.unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip"), new UniversalFile(dir, "Templates")); Util.unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/sponge.zip"), new UniversalFile(dir, "Templates"));
System.out.println("SubServers > Created ~/SubServers/Templates/Sponge"); System.out.println("SubServers > Created ~/SubServers/Templates/Sponge");
} else { } else {
if (new UniversalFile(dir, "Templates:Vanilla:template.yml").exists() && (new Version((new YAMLConfig(new UniversalFile(dir, "Templates:Vanilla:template.yml"))).get().getString("Version", "0")).compareTo(new Version("2.13a+"))) != 0) { if (new UniversalFile(dir, "Templates:Vanilla:template.yml").exists() && (new Version((new YAMLConfig(new UniversalFile(dir, "Templates:Vanilla:template.yml"))).get().getString("Version", "0")).compareTo(new Version("2.13b+"))) != 0) {
Files.move(new UniversalFile(dir, "Templates:Vanilla").toPath(), new UniversalFile(dir, "Templates:Vanilla.old" + Math.round(Math.random() * 100000)).toPath()); Files.move(new UniversalFile(dir, "Templates:Vanilla").toPath(), new UniversalFile(dir, "Templates:Vanilla.old" + Math.round(Math.random() * 100000)).toPath());
Util.unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip"), new UniversalFile(dir, "Templates")); Util.unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Bungee/Library/Files/Templates/vanilla.zip"), new UniversalFile(dir, "Templates"));
System.out.println("SubServers > Updated ~/SubServers/Templates/Vanilla"); System.out.println("SubServers > Updated ~/SubServers/Templates/Vanilla");

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

Binary file not shown.

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

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

2
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|s|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); Matcher regex = Pattern.compile("(rv|p?[abrv]|[su])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string);
Version current = null; Version current = null;
while (regex.find()) { while (regex.find()) {
try { try {

BIN
SubServers.Host/src.jar
View File

Binary file not shown.

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

@ -1,4 +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 Implementation-Title: SubServers.Host
Specification-Title: 18w23a Specification-Title: 18w25a

8
SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
View File

@ -213,13 +213,13 @@ public class SubCreator {
host.subdata.sendPacket(new PacketOutExLogMessage(address, "Loading Template: " + template.getDisplayName())); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Loading Template: " + template.getDisplayName()));
Util.copyDirectory(template.getDirectory(), dir); Util.copyDirectory(template.getDirectory(), dir);
if (template.getType() == ServerType.VANILLA) { if (template.getType() == ServerType.VANILLA) {
String commit; String branch;
if (version.compareTo(new Version("1.12")) >= 0) { if (version.compareTo(new Version("1.12")) >= 0) {
commit = "6c29bc48854f75fae6e8c16bbbdb47bd53a8e082"; branch = "1.12";
} else { } else {
commit = "339144e5cc406c3bc71aed66b636cbb348932eb0"; branch = "1.7.10";
} }
version = new Version(version.toString() + " " + commit); version = new Version(version.toString() + " " + branch);
} else if (template.getType() == ServerType.SPONGE) { } else if (template.getType() == ServerType.SPONGE) {
thread.name().logger.info.println("Searching Versions..."); thread.name().logger.info.println("Searching Versions...");
host.subdata.sendPacket(new PacketOutExLogMessage(address, "Searching Versions...")); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Searching Versions..."));

2
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|s|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); Matcher regex = Pattern.compile("(rv|p?[abrv]|[su])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string);
Version current = null; Version current = null;
while (regex.find()) { while (regex.find()) {
try { try {

BIN
SubServers.Sync/src.jar
View File

Binary file not shown.

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

@ -2,4 +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: 18w23a Specification-Title: 18w25a

2
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|s|(?:p?[abrv])|[u])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string); Matcher regex = Pattern.compile("(rv|p?[abrv]|[su])?([^/]+)", Pattern.CASE_INSENSITIVE).matcher(string);
Version current = null; Version current = null;
while (regex.find()) { while (regex.find()) {
try { try {