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

server/.jabbarc

@@ -0,0 +1 @@
+openjdk@1.11.0-2

server/server.py

@@ -10,6 +10,7 @@ MOD_DOWNLOADER_URL = "https://github.com/Joshyx/ModpackDownloader/releases/downl
 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"
 
 INSTANCE_DIR = os.path.join(str(os.getenv("HOME")), "pixelmon")
@@ -18,24 +19,38 @@ INSTANCE_DIR = os.path.join(str(os.getenv("HOME")), "pixelmon")
 # main
 def __main__():
     header()
-    forge()
     needs_mods = instance()
     if needs_mods:
         mods()
+    forge()
+    launch()
 
+# launcher
+def launch():
+    if input("launch server? [Y/n] ").lower() == "n":
+        exit(0)
+
+    os.chdir(f"{INSTANCE_DIR}/.minecraft")
+    subprocess.run(["java", "-Xmx30720M", "-Xms1024M", "-jar", FORGE_JAR, "--nogui"])
 
 # forge
 def forge():
-    os.chdir(INSTANCE_DIR)
+    os.makedirs(f"{INSTANCE_DIR}/.minecraft", exist_ok=True)
+    os.chdir(f"{INSTANCE_DIR}/.minecraft")
 
-    if not os.path.exists(os.path.join(INSTANCE_DIR, "forge.jar")):
+    if os.path.exists(os.path.join(f"{INSTANCE_DIR}/.minecraft", "forge-installer.jar")):
-        cprint("forge.jar not found - downloading", "yellow")
+        return
-        r = requests.get(FORGE_URL, allow_redirects=True)
-        open("forge.jar", "wb").write(r.content)
 
+    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.jar", "--installServer"])
+    subprocess.run(["java", "-jar", "forge-installer.jar", "--installServer"])
+
+    f = open("eula.txt", "w")
+    f.write("eula=true")
+    f.close()
 
 
 # mods