Merge remote-tracking branch 'refs/remotes/origin/main'

server/.jabbarc

@@ -1 +1 @@
-adopt-openj9@1.11.0-11
+openjdk@1.11.0-2

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()
@@ -43,6 +45,7 @@ def launch():
     subprocess.run(
         [
             "java",
+            "--illegal-access=permit",
             "-Xmx30720M",
             "-Xms1024M",
             "-jar",
@@ -69,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)
@@ -126,6 +109,7 @@ 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", "*")):
+        if file.endswith(".jar"):
             os.remove(file)
 
     for file in glob.glob(os.path.join(SERVER_DIR, "plugins", "*")):

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