1.13+ support and updates

Puyodead1 · Dec 10, 2018 · 6cf1f9b · 6cf1f9b
1 parent 3c783c9
commit 6cf1f9b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/io/github/puyodead1/SSB/MainGUI.java b/src/io/github/puyodead1/SSB/MainGUI.java
@@ -22,7 +22,7 @@ public class MainGUI {
 	public static String outputPath;
 	public static String version;
 	public static Text console;
-	
+
 	public static void Rev() {
 		switch (version) {
 		case "latest":
@@ -117,6 +117,12 @@ public void mouseDown(MouseEvent arg0) {
 				case "[latest]":
 					version = "latest";
 					break;
+				case "[1.13.2]":
+					version = "1.13.2";
+					break;
+				case "[1.13.1]":
+					version = "1.13.1";
+					break;
 				case "[1.13]":
 					version = "1.13";
 					break;
@@ -169,14 +175,14 @@ public void mouseDown(MouseEvent arg0) {
 		Label lblChooseOutputPath = new Label(shlSpigotServerBuilder, SWT.NONE);
 		lblChooseOutputPath.setBounds(150, 10, 167, 15);
 		lblChooseOutputPath.setText("Enter Path to output directory:");
-		
+
 		Label lblCopyright = new Label(shlSpigotServerBuilder, SWT.NONE);
 		lblCopyright.setBounds(15, 250, 300, 15);
 		lblCopyright.setText("Copyright 2018 Puyodead1 and Puyodead1 Development");
-		
+
 		Label lblCompiledOn = new Label(shlSpigotServerBuilder, SWT.NONE);
 		lblCompiledOn.setBounds(15, 300, 300, 15);
-		lblCompiledOn.setText("Compiled on 12/10/2018 at 11:11AM EST");
+		lblCompiledOn.setText("Compiled on 12/10/2018 at 2:53PM EST");
 
 		txtOut = new Text(shlSpigotServerBuilder, SWT.BORDER);
 		txtOut.addKeyListener(new KeyAdapter() {
@@ -235,8 +241,8 @@ public void mouseDown(MouseEvent e1) {
 		console.setEditable(false);
 		scrolledComposite.setContent(console);
 		scrolledComposite.setMinSize(console.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		String[] versions = { "latest", "1.13", "1.12.2", "1.12.1", "1.12", "1.11", "1.10", "1.9.4", "1.9.2", "1.9",
-				"1.8.8", "1.8.7", "1.8.3", "1.8" };
+		String[] versions = { "latest", "1.13", "1.13.2", "1.13.1", "1.12.2", "1.12.1", "1.12", "1.11", "1.10", "1.9.4",
+				"1.9.2", "1.9", "1.8.8", "1.8.7", "1.8.3", "1.8" };
 		for (int i = 0; i < versions.length; i++) {
 			list.add(versions[i]);
 		}

diff --git a/src/io/github/puyodead1/SSB/utils/Utils.java b/src/io/github/puyodead1/SSB/utils/Utils.java
@@ -21,6 +21,7 @@ public static void Complete() {
 		SSB.Log(">>>>>>> Complete! Please use the Launcher.bat file to start your new server! Enjoy! <<<<<<<");
 		SSB.Log(">>>>>>> --------------------------------------------------------------------------- <<<<<<<");
 	}
+
 	public static boolean CreateEULA() {
 		SSB.Log(">>>>>>> ------------------------------------------------------- <<<<<<<");
 		SSB.Log(">>>>>>> PLEASE MAKE SURE YOU READ AND AGREE TO THE Mojang EULA! <<<<<<<");
@@ -197,13 +198,14 @@ public static boolean DownloadBuildToolsLinux() {
 
 	public static void runBT() {
 		String[] command = { "CMD", "/C",
-				"cd " + MainGUI.outputPath + "\\BuildTools && start java -jar BuildTools.jar && exit && exit" };
+				"cd /d" + MainGUI.outputPath + "\\BuildTools && java -jar BuildTools.jar" };
 		try {
 			ProcessBuilder builder = new ProcessBuilder(command);
 			// builder.redirectErrorStream(true);
 			SSB.Log("Waiting...");
 			Process p = builder.start();
 			p.waitFor();
+			SSB.Log(p.getInputStream().toString());
 			System.out.println(p.getInputStream().read());
 			try {
 				int exitValue = p.waitFor();