From 29916d16eaf5ad1c227017ddface0888ce214b23 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Wed, 31 Jan 2018 20:28:51 +0000 Subject: [PATCH 1/6] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b05f0a..e9526b0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # Minecraft-Server-Launcher I originally created this software in 2013 using AutoIt. Since I am now learning Java, and I have wanted to rewrite it for a long time, I am trying to recreate it in Java. It is currently missing mostly everything, but it's nothing a lot of work can't fix. The original version can be found at: https://knarcraft.net/Downloads/Bungeeminecraftserverlauncher/ -Its goal is to do everything the original does, just better. The original is 1595 lines of code repetition and dirty code. I had no prior programming experience when I first started working on the original, which is why it became such a mess. \ No newline at end of file +Its goal is to do everything the original does, just better. The original is 1595 lines of code repetition and dirty code. I had no prior programming experience when I first started working on the original, which is why it became such a mess. + +The code is currently in a half-finished state. A lot is finished, but the software is still missing some key components. From d8d770ddbeb17f308e06734d158a6b8bdf7b4c9c Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Wed, 31 Jan 2018 22:31:09 +0000 Subject: [PATCH 2/6] Create CONTRIBUTING.md --- docs/CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 docs/CONTRIBUTING.md diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md new file mode 100644 index 0000000..ed8fc89 --- /dev/null +++ b/docs/CONTRIBUTING.md @@ -0,0 +1,3 @@ +As this is a personal one-man project, I prefer to stay in charge of the code. +I appreciate code fixing mistakes, or code improvements, but the software's functionality or purpose, should not be changed. +I might change anything at any time, so you might want to keep that in mind before doing big changes yourself. From b15177b8aae43568046877f15fcfd8ebeaf49c35 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Wed, 31 Jan 2018 22:32:02 +0000 Subject: [PATCH 3/6] Delete MANIFEST.MF --- out/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 out/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF diff --git a/out/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF b/out/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF deleted file mode 100644 index 5ee19cb..0000000 --- a/out/production/Minecraft-Server-Launcher/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: Main - From 322d66e0c7f6491f86bf8a7226c4bd3b3451eb41 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Wed, 31 Jan 2018 22:32:24 +0000 Subject: [PATCH 4/6] Delete ServerTest.java --- test/ServerTest.java | 65 -------------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 test/ServerTest.java diff --git a/test/ServerTest.java b/test/ServerTest.java deleted file mode 100644 index 5538edd..0000000 --- a/test/ServerTest.java +++ /dev/null @@ -1,65 +0,0 @@ -import javax.naming.ConfigurationException; - -import net.knarcraft.serverlauncher.server.*; -import net.knarcraft.serverlauncher.userinterface.GUI; -import net.knarcraft.serverlauncher.userinterface.ServerTab; - -import java.awt.*; -import java.io.*; - -/** - * A class for testing new and existing features. - * - * @author Kristian Knarvik - * @version 0.0.0.1 - * @since 0.0.0.1 - */ -class ServerTest { - public static void main(String[] args) { - EventQueue.invokeLater(() -> { - try { - setup(); - GUI window = new GUI(); - window.getFrame().setVisible(true); - - - - Server server1 = new Server("Server1", window, new ServerTab("Server1")); - server1.toggle(); - server1.setPath("C:\\Users\\Kristian\\Desktop\\Test"); - server1.setType(ServerType.getServerTypes().get(4)); - server1.setServerVersion("1.12.2"); - server1.setMaxRam("1G"); - Server.startServers(); - - - InputStream stdout = server1.getProcess().getInputStream (); - - BufferedReader reader = new BufferedReader (new InputStreamReader(stdout)); - - OutputStream stdin = server1.getProcess().getOutputStream (); - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(stdin)); - - String line; - while ((line = reader.readLine ()) != null) { - System.out.println ("Stdout: " + line); - writer.write("stop\n"); - writer.flush(); - } - //writer.close(); - - } catch (Exception e) { - e.printStackTrace(); - } - }); - } - - private static void setup() { - try { - ServerType.loadServerTypes(); - } catch (ConfigurationException e) { - e.printStackTrace(); - System.exit(1); - } - } -} From 68d4118f0f4bf955a16e9ce6b664b234d761e74d Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Wed, 31 Jan 2018 22:36:22 +0000 Subject: [PATCH 5/6] Create ISSUE_TEMPLATE.md --- docs/ISSUE_TEMPLATE.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 docs/ISSUE_TEMPLATE.md diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2db2e66 --- /dev/null +++ b/docs/ISSUE_TEMPLATE.md @@ -0,0 +1,7 @@ +### What were you trying to do? + +### What were you expecting? + +### What happened? + +### Is there any additional info that might be relevant? From 64eb4ef2ce6d344b3a5dd1786b747ba829a01460 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Wed, 31 Jan 2018 22:40:49 +0000 Subject: [PATCH 6/6] Create pull_request_template.md --- docs/pull_request_template.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docs/pull_request_template.md diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md new file mode 100644 index 0000000..21e567d --- /dev/null +++ b/docs/pull_request_template.md @@ -0,0 +1,8 @@ +Fixes # . + +Proposed changes: +- +- +- + +@author