From 8fc90714499586f4b10976daf7560b365ebf7d96 Mon Sep 17 00:00:00 2001
From: Benjo <benjamin.kraft@online.de>
Date: Sat, 29 May 2021 23:52:12 +0200
Subject: [PATCH] better start scripts, requires test servers location to be in
 project folder under "/server/"

---
 .gitignore                                 |  1 +
 .idea/codeStyles/Project.xml               | 15 +++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml       |  5 +++++
 Sharehealth.iml                            |  1 +
 deploy.bat                                 |  1 -
 scripts/deploy.bat                         |  1 +
 deploy.sh => scripts/deploy.sh             |  0
 scripts/start_server.bat                   |  2 ++
 start_server.sh => scripts/start_server.sh |  0
 start_server.bat                           |  2 --
 10 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 deploy.bat
 create mode 100644 scripts/deploy.bat
 rename deploy.sh => scripts/deploy.sh (100%)
 create mode 100644 scripts/start_server.bat
 rename start_server.sh => scripts/start_server.sh (100%)
 delete mode 100644 start_server.bat

diff --git a/.gitignore b/.gitignore
index 39ac633..59f6603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,7 @@ $RECYCLE.BIN/
 *.lnk
 
 target/
+server/
 
 pom.xml.tag
 pom.xml.releaseBackup
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..1cbe3cf
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,15 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+    <codeStyleSettings language="Scala">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/Sharehealth.iml b/Sharehealth.iml
index f29c944..4e5b39a 100644
--- a/Sharehealth.iml
+++ b/Sharehealth.iml
@@ -15,6 +15,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
+      <excludeFolder url="file://$MODULE_DIR$/server" />
     </content>
     <orderEntry type="jdk" jdkName="openjdk-13" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/deploy.bat b/deploy.bat
deleted file mode 100644
index 661b3b9..0000000
--- a/deploy.bat
+++ /dev/null
@@ -1 +0,0 @@
-xcopy IntelliJ_IDEA\Sharehealth\target\Sharehealth.jar Minecraft_Servers\Server_1.16.1\plugins\ /Y
\ No newline at end of file
diff --git a/scripts/deploy.bat b/scripts/deploy.bat
new file mode 100644
index 0000000..9de01ca
--- /dev/null
+++ b/scripts/deploy.bat
@@ -0,0 +1 @@
+xcopy target\Sharehealth.jar server\plugins\ /Y
\ No newline at end of file
diff --git a/deploy.sh b/scripts/deploy.sh
similarity index 100%
rename from deploy.sh
rename to scripts/deploy.sh
diff --git a/scripts/start_server.bat b/scripts/start_server.bat
new file mode 100644
index 0000000..004f355
--- /dev/null
+++ b/scripts/start_server.bat
@@ -0,0 +1,2 @@
+cd server
+java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar spigot-1.16.5.jar nogui
\ No newline at end of file
diff --git a/start_server.sh b/scripts/start_server.sh
similarity index 100%
rename from start_server.sh
rename to scripts/start_server.sh
diff --git a/start_server.bat b/start_server.bat
deleted file mode 100644
index 16a4d5f..0000000
--- a/start_server.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd Server_1.16.1
-call start.bat
\ No newline at end of file