diff --git a/.idea/misc.xml b/.idea/misc.xml index f6e69a1..8e5e946 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/.idea/sshConfigs.xml b/.idea/sshConfigs.xml deleted file mode 100644 index 8e3ed79..0000000 --- a/.idea/sshConfigs.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Sharehealth.iml b/Sharehealth.iml index 3d59562..37e9b57 100644 --- a/Sharehealth.iml +++ b/Sharehealth.iml @@ -9,7 +9,7 @@ - + @@ -43,6 +43,6 @@ - + \ No newline at end of file diff --git a/poetry.lock b/poetry.lock new file mode 100644 index 0000000..6a81937 --- /dev/null +++ b/poetry.lock @@ -0,0 +1,69 @@ +[[package]] +name = "certifi" +version = "2022.6.15.1" +description = "Python package for providing Mozilla's CA Bundle." +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "charset-normalizer" +version = "2.1.1" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." +category = "main" +optional = false +python-versions = ">=3.6.0" + +[package.extras] +unicode_backport = ["unicodedata2"] + +[[package]] +name = "idna" +version = "3.3" +description = "Internationalized Domain Names in Applications (IDNA)" +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "requests" +version = "2.28.1" +description = "Python HTTP for Humans." +category = "main" +optional = false +python-versions = ">=3.7, <4" + +[package.dependencies] +certifi = ">=2017.4.17" +charset-normalizer = ">=2,<3" +idna = ">=2.5,<4" +urllib3 = ">=1.21.1,<1.27" + +[package.extras] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"] + +[[package]] +name = "urllib3" +version = "1.26.12" +description = "HTTP library with thread-safe connection pooling, file post, and more." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4" + +[package.extras] +brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"] +secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] + +[metadata] +lock-version = "1.1" +python-versions = "^3.10" +content-hash = "85c733ed2e30b2fa419bcfed233b1bbd86d4dced07ae54f97e4f90d17b1993ad" + +[metadata.files] +certifi = [] +charset-normalizer = [] +idna = [] +requests = [] +urllib3 = [] diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..63b35e1 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,15 @@ +[tool.poetry] +name = "sharehealth" +version = "0.1.0" +description = "" +authors = ["Benjamin Kraft "] + +[tool.poetry.dependencies] +python = "^3.10" +requests = "^2.28.1" + +[tool.poetry.dev-dependencies] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" diff --git a/scripts/deploy.py b/scripts/deploy.py deleted file mode 100644 index 48b720b..0000000 --- a/scripts/deploy.py +++ /dev/null @@ -1,11 +0,0 @@ -import shutil -import subprocess - -pluginPath = "out/artifacts/Sharehealth/Sharehealth.jar" - -# local server -shutil.copy2(pluginPath, "server/plugins") - -# remote server -subprocess.run(["scp", pluginPath, "minecraft@130.61.179.201:/home/minecraft/servers/flattest/plugins"]) - diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100644 index 0000000..0df8a0b --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,4 @@ +#!/usr/bin/bash + +cp out/artifacts/Sharehealth/Sharehealth.jar server/plugins +scp out/artifacts/Sharehealth/Sharehealth.jar minecraft@130.61.179.201:/home/minecraft/servers/flattest/plugins \ No newline at end of file diff --git a/scripts/get_paper.py b/scripts/get_paper.py old mode 100644 new mode 100755 index e11d36d..62356ad --- a/scripts/get_paper.py +++ b/scripts/get_paper.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + import requests import sys diff --git a/scripts/start_local.py b/scripts/start_local.py deleted file mode 100644 index 8b5ac6b..0000000 --- a/scripts/start_local.py +++ /dev/null @@ -1,3 +0,0 @@ -import os - -os.system("cd server && java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar paper.jar nogui") diff --git a/scripts/start_local.sh b/scripts/start_local.sh new file mode 100644 index 0000000..aa9dc42 --- /dev/null +++ b/scripts/start_local.sh @@ -0,0 +1,4 @@ +#!/usr/bin/bash + +cd server && +java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -jar paper.jar nogui \ No newline at end of file diff --git a/scripts/start_remote.py b/scripts/start_remote.py deleted file mode 100644 index e74dc45..0000000 --- a/scripts/start_remote.py +++ /dev/null @@ -1,3 +0,0 @@ -import os - -os.system('ssh minecraft@130.61.179.201 "cd servers/flattest; ./start.sh"') diff --git a/scripts/start_remote.sh b/scripts/start_remote.sh new file mode 100644 index 0000000..1b00aed --- /dev/null +++ b/scripts/start_remote.sh @@ -0,0 +1,3 @@ +#!/usr/bin/bash + +ssh minecraft@130.61.179.201 "cd servers/flattest && ./start.sh" \ No newline at end of file