diff --git a/server/plugins/Dynmap-3.6-beta-2-spigot.jar b/server/plugins/Dynmap-3.5-spigot.jar similarity index 92% rename from server/plugins/Dynmap-3.6-beta-2-spigot.jar rename to server/plugins/Dynmap-3.5-spigot.jar index d798eac..4ded8cc 100644 Binary files a/server/plugins/Dynmap-3.6-beta-2-spigot.jar and b/server/plugins/Dynmap-3.5-spigot.jar differ diff --git a/server/plugins/EverNifeCore-2.0.3.3.jar b/server/plugins/EverNifeCore-2.0.3.3.jar new file mode 100644 index 0000000..0e267e3 Binary files /dev/null and b/server/plugins/EverNifeCore-2.0.3.3.jar differ diff --git a/server/plugins/FastAsyncWorldEdit-Bukkit-2.6.4-SNAPSHOT-493.jar b/server/plugins/FastAsyncWorldEdit-Bukkit-2.6.4-SNAPSHOT-493.jar deleted file mode 100644 index 28b369c..0000000 Binary files a/server/plugins/FastAsyncWorldEdit-Bukkit-2.6.4-SNAPSHOT-493.jar and /dev/null differ diff --git a/server/plugins/worldedit-bukkit-7.2.15.jar b/server/plugins/worldedit-bukkit-7.2.15.jar new file mode 100644 index 0000000..4402890 Binary files /dev/null and b/server/plugins/worldedit-bukkit-7.2.15.jar differ diff --git a/server/server.py b/server/server.py index d1ac0f0..d5599d7 100644 --- a/server/server.py +++ b/server/server.py @@ -1,18 +1,19 @@ #!/usr/bin/env python3 -import os, sys, shutil, requests, tempfile, glob, subprocess +import os, sys, shutil, requests, tempfile, glob, subprocess, argparse from termcolor import cprint from typing import Any +parser = argparse.ArgumentParser(description="server script for FishPogPixelmon") +parser.add_argument("--plugins", "-p", help="refreshes plugins", action="store_true") +args = parser.parse_args() + OS = sys.platform SERVER_DIR = os.getcwd() MOD_DOWNLOADER_URL = "https://github.com/Joshyx/ModpackDownloader/releases/download/v1.3/ModpackDownloader-1.3.jar" -FORGE_URL = ( - "https://maven.minecraftforge.net/net/minecraftforge/forge/1.16.5-36.2.34/forge-1.16.5-36.2.34-installer.jar" -) -FORGE_JAR = "forge-1.16.5-36.2.34.jar" + MODPACK_RELEASES_URL = "https://git.233hfd.com/api/v1/repos/joey/FishPogPixelmon/releases?limit=1" ARCLIGHT_URL = "https://github.com/IzzelAliz/Arclight/releases/download/1.16%2F1.0.24/arclight-forge-1.16.5-1.0.24.jar" @@ -29,6 +30,7 @@ def __main__(): needs_mods_plugins = instance() if needs_mods_plugins: mods() + if args.plugins: plugins() arclight() launch() @@ -70,26 +72,6 @@ def arclight(): f.close() -# forge -def forge(): - os.makedirs(f"{INSTANCE_DIR}/.minecraft", exist_ok=True) - os.chdir(f"{INSTANCE_DIR}/.minecraft") - - if os.path.exists(os.path.join(f"{INSTANCE_DIR}/.minecraft", "forge-installer.jar")): - return - - cprint("forge-installer.jar not found - downloading", "yellow") - r = requests.get(FORGE_URL, allow_redirects=True) - open("forge-installer.jar", "wb").write(r.content) - cprint("installing forge", "green") - - subprocess.run(["java", "-jar", "forge-installer.jar", "--installServer"]) - - f = open("eula.txt", "w") - f.write("eula=true") - f.close() - - # mods def mods(): os.chdir(INSTANCE_DIR) @@ -127,7 +109,8 @@ def plugins(): os.makedirs(os.path.join(INSTANCE_DIR, ".minecraft", "plugins"), exist_ok=True) for file in glob.glob(os.path.join(INSTANCE_DIR, ".minecraft", "plugins", "*")): - os.remove(file) + if file.endswith(".jar"): + os.remove(file) for file in glob.glob(os.path.join(SERVER_DIR, "plugins", "*")): shutil.copy(file, os.path.join(INSTANCE_DIR, ".minecraft", "plugins", os.path.basename(file))) diff --git a/server/server.sh b/server/server.sh index 58e4e28..f184eee 100755 --- a/server/server.sh +++ b/server/server.sh @@ -19,4 +19,4 @@ source .venv/bin/activate &>/dev/null python -m pip install --upgrade pip &>/dev/null python -m pip install -r ../client/requirements.txt &>/dev/null -python ./server.py +python ./server.py $1