dynmap and sleep

modpack/manifest.json

@@ -3,7 +3,7 @@
     "version": "1.16.5",
     "modLoaders": [
       {
-        "id": "forge-36.2.34",
+        "id": "forge-36.2.39",
         "primary": true
       }
     ]
@@ -31,6 +31,14 @@
         "name": "MrCrayfish's Furniture Mod"
       }
     },
+    {
+      "projectID": 60089,
+      "fileID": 3202662,
+      "required": true,
+      "__meta": {
+        "name": "Mouse Tweaks"
+      }
+    },
     {
       "projectID": 74072,
       "fileID": 3695126,
@@ -126,6 +134,14 @@
         "name": "Nature's Compass"
       }
     },
+    {
+      "projectID": 253449,
+      "fileID": 3033593,
+      "required": true,
+      "__meta": {
+        "name": "Hwyla"
+      }
+    },
     {
       "projectID": 267602,
       "fileID": 3137659,
@@ -142,6 +158,15 @@
         "name": "Simple Storage Network"
       }
     },
+    {
+      "projectID": 309927,
+      "fileID": 4419403,
+      "required": true,
+      "__meta": {
+        "name": "Curios API (Forge)",
+        "explicit": false
+      }
+    },
     {
       "projectID": 328085,
       "fileID": 3536025,
@@ -169,6 +194,14 @@
         "name": "Pam's HarvestCraft 2 - Crops"
       }
     },
+    {
+      "projectID": 361579,
+      "fileID": 3767277,
+      "required": true,
+      "__meta": {
+        "name": "spark"
+      }
+    },
     {
       "projectID": 365460,
       "fileID": 3281234,
@@ -241,6 +274,14 @@
         "explicit": false
       }
     },
+    {
+      "projectID": 422301,
+      "fileID": 4167327,
+      "required": true,
+      "__meta": {
+        "name": "Sophisticated Backpacks"
+      }
+    },
     {
       "projectID": 439870,
       "fileID": 4576329,

modpack/mmc-pack.json

@@ -29,10 +29,10 @@
                     "uid": "net.minecraft"
                 }
             ],
-            "cachedVersion": "36.2.34",
+            "cachedVersion": "36.2.39",
             "uid": "net.minecraftforge",
-            "version": "36.2.34"
+            "version": "36.2.39"
         }
     ],
     "formatVersion": 1
-}
+}

server/.jabbarc

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

server/server.py

@@ -1,21 +1,23 @@
 #!/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"
+ARCLIGHT_JAR = "arclight.jar"
 
 INSTANCE_DIR = os.path.join(str(os.getenv("HOME")), "pixelmon")
 
@@ -28,6 +30,7 @@ def __main__():
     needs_mods_plugins = instance()
     if needs_mods_plugins:
         mods()
+    if args.plugins:
         plugins()
     arclight()
     launch()
@@ -42,10 +45,11 @@ def launch():
     subprocess.run(
         [
             "java",
+            "--illegal-access=permit",
             "-Xmx30720M",
             "-Xms1024M",
             "-jar",
-            FORGE_JAR,
+            ARCLIGHT_JAR,
             "--nogui",
         ]
     )
@@ -60,31 +64,8 @@ def arclight():
         return
 
     cprint("arclight.jar not found - downloading", "yellow")
-    r = requests.get(FORGE_URL, allow_redirects=True)
+    r = requests.get(ARCLIGHT_URL, allow_redirects=True)
     open("arclight.jar", "wb").write(r.content)
-    cprint("installing forge via arclight", "green")
-
-    subprocess.run(["java", "-jar", "arclight.jar", "--installServer"])
-
-    f = open("eula.txt", "w")
-    f.write("eula=true")
-    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")
@@ -128,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)))

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