arclight and another client tweak

README.md

@@ -8,7 +8,7 @@ This is the repo for FishPog Pixelmon, and a bit of experimental tooling to make
 git clone https://git.233hfd.com/joey/FishPogPixelmon.git
 cd FishPogPixelmon
 
-source ./venv.sh # or just venv.bat on windows
+source ./venv.sh # or just venv.ps1 on windows
 
 python tooling.py --setup
 ```
@@ -21,4 +21,8 @@ now, pax will be installed, which will allow you to edit the modpack. refer to t
 python tooling.py --export
 ```
 
-this command will package up the pack with pax, then bundle some scripts with it that allows for auto-updating and automatically downloading the mods from curseforge, rather than having to distribute a large zip file.
+## exporting the modpack client
+
+```bash
+python tooling.py --client
+```

client/client.ps1

@@ -1,43 +1,30 @@
+# got to the directory where the script is located
+Push-Location $PSScriptRoot
+
 # check if winget is installed and if so, set a flag to true
 $winget = Get-Command winget -ErrorAction SilentlyContinue
 
+# trust desktop-shortcut.ps1 for good measure
+Unblock-File .\desktop-shortcut.ps1
+
 if (!$winget) {
   Write-Host "Error: winget is not installed." -Foreground Red
-  Write-Host "This script probably will not work without winget." -Foreground Red
-  Write-Host "Run 'Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe' in to install winget." -Foreground Red
-  Write-Host "If you do install winget, this script should handle the rest." -Foreground Red
-}
-
-# Check that python is installed
-if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
-  Write-Host "Error: python is not installed." -Foreground Red
-
-  if ($winget) {
-    Write-Host "Attempting to install python."
-    (winget install --id=Python.Python.3.11  -e) | Out-Null
-  }
-  else {
-    Write-Host "Please install python to continue." -Foreground Red
+  Write-Host "This script will not work without winget." -Foreground Red
+  Write-Host "Please install winget - trying to open Microsoft Store" -Foreground Yellow
+  Add-AppxPackage -RegisterByFamilyName -MainPackage Microsoft.DesktopAppInstaller_8wekyb3d8bbwe
+  Start-Process "ms-windows-store://pdp/?ProductId=9NBLGGH4NNS1"
   exit 1
-  }
 }
 
 # Check that java is installed
 if (-not (Get-Command "C:\Program Files\AdoptOpenJDK\jdk-11.0.11.9-hotspot\bin\java" -ErrorAction SilentlyContinue)) {
   Write-Host "Error: java is not installed." -Foreground Red
 
-  if ($winget) {
   Write-Host "Attempting to install java."
-    (winget install AdoptOpenJDK.OpenJDK.11) | Out-Null
-  }
-  else {
-    Write-Host "Please install java to continue." -Foreground Red
-    exit 1
-  }
-
+  winget install AdoptOpenJDK.OpenJDK.11
 }
 
-if (Test-Path ".venv") {  } else { python -m venv .venv }
+if (-not (Test-Path ".venv")) { python -m venv .venv }
 
 . .\.venv\Scripts\Activate.ps1
 

client/client.py

@@ -10,14 +10,17 @@ MOD_DOWNLOADER_URL = "https://github.com/Joshyx/ModpackDownloader/releases/downl
 
 MODPACK_RELEASES_URL = "https://git.233hfd.com/api/v1/repos/joey/FishPogPixelmon/releases?limit=1"
 
+DELETION_EXEMPTED_MODS = ["TrainerCommands-1.16.5-2.6.0.jar", "OptiFine_1.16.5_HD_U_G8.jar"]
+
 MULTIMC_DOWNLOAD_URL_WINDOWS = "https://files.multimc.org/downloads/mmc-develop-win32.zip"
 MULTIMC_PARENT_DIR = ""
 MULTIMC_DIR = ""
 INSTANCE_DIR = ""
 
 if OS == "darwin":
-    cprint("no support for macos yet", "red")
-    exit(1)
+    MULTIMC_PARENT_DIR = "/Applications/MultiMC.app"
+    MULTIMC_DIR = f"{MULTIMC_PARENT_DIR}/Data"
+    INSTANCE_DIR = f"{MULTIMC_DIR}/instances/FishPogPixelmon"
 
 if OS == "linux":
     MULTIMC_PARENT_DIR = f"{os.getenv('HOME')}/.local/share"
@@ -25,7 +28,7 @@ if OS == "linux":
     INSTANCE_DIR = f"{MULTIMC_DIR}/instances/FishPogPixelmon"
 
 if OS == "win32":
-    MULTIMC_PARENT_DIR = f"{os.getenv('APPDATA')}\\FishPog"
+    MULTIMC_PARENT_DIR = os.getcwd()
     MULTIMC_DIR = f"{MULTIMC_PARENT_DIR}\\MultiMC"
     INSTANCE_DIR = f"{MULTIMC_DIR}\\instances\\FishPogPixelmon"
 
@@ -51,21 +54,27 @@ def run_mmc():
     if OS == "linux":
         subprocess.Popen(["./MultiMC"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
+    if OS == "darwin":
+        subprocess.Popen(["open", "-a", "MultiMC"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+
 
 # mods
 def mods():
     os.chdir(INSTANCE_DIR)
 
-    if not os.path.exists(os.path.join(INSTANCE_DIR, "downloader.zip")):
+    if not os.path.exists(os.path.join(INSTANCE_DIR, "downloader.jar")):
         cprint("downloader.jar not found - downloading", "yellow")
         r = requests.get(MOD_DOWNLOADER_URL, allow_redirects=True)
         open("downloader.jar", "wb").write(r.content)
 
     cprint("downloading mods. this may take a while, please wait.", "green")
 
+    my_env = os.environ.copy()
+    my_env["CURSEFORGE_API_KEY"] = "$2a$10$QbCxI6f4KxEs50QKwE2piu1t6oOA8ayOw27H9N/eaH3Sdp5NTWwvO"
+
     os.makedirs(os.path.join(INSTANCE_DIR, "mods"))
     if OS != "win32":
-        subprocess.run(["java", "-jar", "downloader.jar", ".", "mods"])
+        subprocess.run(["java", "-jar", "downloader.jar", ".", "mods"], env=my_env)
     else:
         subprocess.run(
             [
@@ -74,11 +83,12 @@ def mods():
                 "downloader.jar",
                 ".",
                 "mods",
-            ]
+            ],
+            env=my_env,
         )
 
     for file in glob.glob(os.path.join(INSTANCE_DIR, ".minecraft", "mods", "*")):
-        if os.path.basename(file) == "OptiFine_1.16.5_HD_U_G8.jar":
+        if os.path.basename(file) in DELETION_EXEMPTED_MODS:
             continue
         os.remove(file)
 

client/client.sh

@@ -12,10 +12,19 @@ if ! [ -x "$(command -v java)" ]; then
   exit 1
 fi
 
-# check that multimc is installed
-if ! [ -x "$(command -v multimc)" ]; then
+# check if is macos or linux
+if [[ "$OSTYPE" == "linux"* ]]; then
+  # check that multimc is installed
+  if ! [ -x "$(command -v multimc)" ]; then
     echo 'Error: multimc is not installed. Please install it to continue.' >&2
     exit 1
+  fi
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  # check that MultiMC.app is in /Applications
+  if ! [ -d "/Applications/MultiMC.app" ]; then
+    echo 'Error: MultiMC.app is not installed. Please install it to continue.' >&2
+    exit 1
+  fi
 fi
 
 if ! [ -d .venv ]; then python -m venv .venv; fi

client/desktop-shortcut.ps1

@@ -0,0 +1,12 @@
+# creates a desktop shortcut to run client.ps1 in powershell
+
+$ClientFile = "$PSScriptRoot\client.ps1"
+$ShortcutPath = "$Home\Desktop\FishPog Pixelmon.lnk"
+$IconPath = "$PSScriptRoot\icon.ico"
+
+$WshShell = New-Object -comObject WScript.Shell
+$Shortcut = $WshShell.CreateShortcut($ShortcutPath)
+$Shortcut.TargetPath = "powershell.exe"
+$Shortcut.Arguments = "-ExecutionPolicy Bypass -File `"$ClientFile`""
+$Shortcut.IconLocation = $IconPath
+$Shortcut.Save()

modpack/manifest.json

@@ -23,6 +23,34 @@
         "name": "JourneyMap"
       }
     },
+    {
+      "projectID": 55438,
+      "fileID": 3346467,
+      "required": true,
+      "__meta": {
+        "name": "MrCrayfish's Furniture Mod"
+      }
+    },
+    {
+      "projectID": 74072,
+      "fileID": 3695126,
+      "required": true,
+      "__meta": {
+        "name": "Tinkers Construct",
+        "dependencies": [
+          74924
+        ]
+      }
+    },
+    {
+      "projectID": 74924,
+      "fileID": 3631982,
+      "required": true,
+      "__meta": {
+        "name": "Mantle",
+        "explicit": false
+      }
+    },
     {
       "projectID": 223852,
       "fileID": 3776277,
@@ -31,6 +59,14 @@
         "name": "Storage Drawers"
       }
     },
+    {
+      "projectID": 228756,
+      "fileID": 3543538,
+      "required": true,
+      "__meta": {
+        "name": "Iron Chests"
+      }
+    },
     {
       "projectID": 233342,
       "fileID": 3216206,
@@ -66,6 +102,14 @@
         "name": "Just Enough Items (JEI)"
       }
     },
+    {
+      "projectID": 245755,
+      "fileID": 3515707,
+      "required": true,
+      "__meta": {
+        "name": "Waystones"
+      }
+    },
     {
       "projectID": 247560,
       "fileID": 4024011,
@@ -109,6 +153,14 @@
         ]
       }
     },
+    {
+      "projectID": 361276,
+      "fileID": 4596216,
+      "required": true,
+      "__meta": {
+        "name": "Lootr (Forge)"
+      }
+    },
     {
       "projectID": 361385,
       "fileID": 3276350,
@@ -117,6 +169,14 @@
         "name": "Pam's HarvestCraft 2 - Crops"
       }
     },
+    {
+      "projectID": 361579,
+      "fileID": 3767277,
+      "required": true,
+      "__meta": {
+        "name": "spark"
+      }
+    },
     {
       "projectID": 365460,
       "fileID": 3281234,
@@ -180,6 +240,23 @@
         "explicit": false
       }
     },
+    {
+      "projectID": 419699,
+      "fileID": 4521290,
+      "required": true,
+      "__meta": {
+        "name": "Architectury API (Fabric/Forge)",
+        "explicit": false
+      }
+    },
+    {
+      "projectID": 439870,
+      "fileID": 4576329,
+      "required": true,
+      "__meta": {
+        "name": "Customizable Player Models"
+      }
+    },
     {
       "projectID": 486392,
       "fileID": 3535459,

server/.jabbarc

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

server/server.py

@@ -0,0 +1,212 @@
+#!/usr/bin/env python3
+
+import os, sys, shutil, requests, tempfile, glob, subprocess
+from termcolor import cprint
+from typing import Any
+
+OS = sys.platform
+
+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-forge-1.16.5-1.0.24.jar"
+
+INSTANCE_DIR = os.path.join(str(os.getenv("HOME")), "pixelmon")
+
+DELETION_EXEMPTED_MODS = ["TrainerCommands-1.16.5-2.6.0.jar", "spongeforge-1.16.5-36.2.5-8.1.0-RC1352-universal.jar"]
+
+
+# main
+def __main__():
+    header()
+    needs_mods = instance()
+    if needs_mods:
+        mods()
+    forge()
+    arclight()
+    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", ARCLIGHT_JAR, "--nogui"])
+
+
+# arclight
+def arclight():
+    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", "arclight.jar")):
+        return
+
+    cprint("arclight.jar not found - downloading", "yellow")
+    r = requests.get(FORGE_URL, allow_redirects=True)
+    open("arclight.jar", "wb").write(r.content)
+
+
+# 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)
+
+    if not os.path.exists(os.path.join(INSTANCE_DIR, "downloader.jar")):
+        cprint("downloader.jar not found - downloading", "yellow")
+        r = requests.get(MOD_DOWNLOADER_URL, allow_redirects=True)
+        open("downloader.jar", "wb").write(r.content)
+
+    cprint("downloading mods. this may take a while, please wait.", "green")
+
+    my_env = os.environ.copy()
+    my_env["CURSEFORGE_API_KEY"] = "$2a$10$QbCxI6f4KxEs50QKwE2piu1t6oOA8ayOw27H9N/eaH3Sdp5NTWwvO"
+
+    os.makedirs(os.path.join(INSTANCE_DIR, "mods"))
+    subprocess.run(["java", "-jar", "downloader.jar", ".", "mods"], env=my_env)
+
+    for file in glob.glob(os.path.join(INSTANCE_DIR, ".minecraft", "mods", "*")):
+        if os.path.basename(file) in DELETION_EXEMPTED_MODS:
+            continue
+        os.remove(file)
+
+    for file in glob.glob(os.path.join(INSTANCE_DIR, "mods", "mods", "*")):
+        shutil.move(file, os.path.join(INSTANCE_DIR, ".minecraft", "mods", os.path.basename(file)))
+
+    shutil.rmtree(os.path.join(INSTANCE_DIR, "mods"))
+
+    cprint("mods downloaded successfully", "green")
+
+
+# multimc
+def instance():
+    unclean = False
+    release = most_recent_release()
+
+    if not os.path.exists(INSTANCE_DIR):
+        unclean = True
+        cprint("instance not found - downloading", "yellow")
+        download_instance(release)
+
+    version = ""
+    if os.path.exists(f"{INSTANCE_DIR}/.version"):
+        f = open(f"{INSTANCE_DIR}/.version", "r")
+        version = f.read()
+
+    if version != release["tag_name"]:
+        unclean = True
+        cprint("new update available! - downloading", "green")
+        download_instance(release)
+
+    cprint("instance is up to date", "green")
+    return unclean
+
+
+def download_instance(release: dict[str, Any]):
+    os.makedirs(os.path.join(INSTANCE_DIR, ".minecraft"), exist_ok=True)
+
+    TMP = tempfile.mkdtemp()
+    os.chdir(TMP)
+
+    download_url = get_release_asset(release)
+    r = requests.get(download_url, allow_redirects=True)
+    open("instance.zip", "wb").write(r.content)
+    shutil.unpack_archive("instance.zip", ".")
+    os.remove("instance.zip")
+
+    for file in glob.glob(os.path.join(TMP, "overrides", "*")):
+        if file == os.path.join(TMP, "overrides", "options.txt") and os.path.exists(
+            os.path.join(INSTANCE_DIR, ".minecraft", "options.txt")
+        ):
+            continue
+        if os.path.exists(os.path.join(INSTANCE_DIR, ".minecraft", os.path.basename(file))):
+            if os.path.isdir(os.path.join(INSTANCE_DIR, ".minecraft", os.path.basename(file))):
+                shutil.rmtree(os.path.join(INSTANCE_DIR, ".minecraft", os.path.basename(file)))
+            else:
+                os.remove(os.path.join(INSTANCE_DIR, ".minecraft", os.path.basename(file)))
+        shutil.move(file, os.path.join(INSTANCE_DIR, ".minecraft", os.path.basename(file)))
+
+    shutil.rmtree(os.path.join(TMP, "overrides"))
+
+    for file in glob.glob(os.path.join(TMP, "*")):
+        if os.path.exists(os.path.join(INSTANCE_DIR, os.path.basename(file))):
+            if os.path.isdir(os.path.join(INSTANCE_DIR, os.path.basename(file))):
+                shutil.rmtree(os.path.join(INSTANCE_DIR, os.path.basename(file)))
+            else:
+                os.remove(os.path.join(INSTANCE_DIR, os.path.basename(file)))
+        shutil.move(file, os.path.join(INSTANCE_DIR, os.path.basename(file)))
+
+    os.chdir(INSTANCE_DIR)
+
+    f = open(".version", "w")
+    f.write(release["tag_name"])
+    f.close()
+
+
+# releases
+def most_recent_release() -> dict[str, Any]:
+    r = requests.get(MODPACK_RELEASES_URL)
+    releases: list[dict[str, Any]] = r.json()
+    return releases[0]
+
+
+def most_recent_version(release: dict[str, Any]) -> str:
+    return release["tag_name"]
+
+
+def get_release_asset(release: dict[str, Any]):
+    return release["assets"][0]["browser_download_url"]
+
+
+# ascii art lol
+def header():
+    cprint(
+        """
+ _______  __         __     _______
+|   _   ||__|.-----.|  |--.|   _   |.-----..-----.
+|.  1___||  ||__ --||     ||.  1   ||  _  ||  _  |
+|.  __)  |__||_____||__|__||.  ____||_____||___  |
+|:  |                      |:  |           |_____|
+|::.|                      |::.|
+`---'                      `---'
+
+ _______  __                __
+|   _   ||__|.--.--..-----.|  |.--------..-----..-----.
+|.  1   ||  ||_   _||  -__||  ||        ||  _  ||     |
+|.  ____||__||__.__||_____||__||__|__|__||_____||__|__|
+|:  |
+|::.|
+`---'
+        """,
+        "green",
+    )
+
+
+# run app
+__main__()

server/server.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# check that python is installed
+if ! [ -x "$(command -v python)" ]; then
+  echo 'Error: python is not installed. Please install it to continue.' >&2
+  exit 1
+fi
+
+# check that java is installed
+if ! [ -x "$(command -v java)" ]; then
+  echo 'Error: java is not installed. Please install it to continue.' >&2
+  exit 1
+fi
+
+if ! [ -d .venv ]; then python -m venv .venv; fi
+
+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

tooling.py

@@ -58,6 +58,8 @@ def export_client():
     z.write("client/client.sh", "client.sh")
     z.write("client/requirements.txt", "requirements.txt")
     z.write("client/client.py", "client.py")
+    z.write("client/icon.ico", "icon.ico")
+    z.write("client/desktop-shortcut.ps1", "desktop-shortcut.ps1")
     z.close()