diff --git a/modpack/manifest.json b/modpack/manifest.json index 0f6b989..ac9ba9c 100644 --- a/modpack/manifest.json +++ b/modpack/manifest.json @@ -169,14 +169,6 @@ "name": "Pam's HarvestCraft 2 - Crops" } }, - { - "projectID": 361579, - "fileID": 3767277, - "required": true, - "__meta": { - "name": "spark" - } - }, { "projectID": 365460, "fileID": 3281234, @@ -295,6 +287,17 @@ ] } }, + { + "projectID": 545905, + "fileID": 4584293, + "required": true, + "__meta": { + "name": "EnvySTS", + "dependencies": [ + 389487 + ] + } + }, { "projectID": 818696, "fileID": 4369234, @@ -302,6 +305,14 @@ "__meta": { "name": "PokeFactory Compatibility" } + }, + { + "projectID": 861884, + "fileID": 4559794, + "required": true, + "__meta": { + "name": "Universal Pokeloot" + } } ] } \ No newline at end of file diff --git a/server/.jabbarc b/server/.jabbarc index 48ecb7d..0bff6aa 100644 --- a/server/.jabbarc +++ b/server/.jabbarc @@ -1 +1 @@ -openjdk@1.11.0-2 \ No newline at end of file +adopt-openj9@1.11.0-11 \ No newline at end of file diff --git a/server/plugins/BukkitPixelmonPlaceholders-1.1.1.jar b/server/plugins/BukkitPixelmonPlaceholders-1.1.1.jar new file mode 100644 index 0000000..5878135 Binary files /dev/null and b/server/plugins/BukkitPixelmonPlaceholders-1.1.1.jar differ diff --git a/server/plugins/Dynmap-3.6-beta-2-spigot.jar b/server/plugins/Dynmap-3.6-beta-2-spigot.jar new file mode 100644 index 0000000..d798eac Binary files /dev/null and b/server/plugins/Dynmap-3.6-beta-2-spigot.jar differ diff --git a/server/plugins/EssentialsX-2.20.0.jar b/server/plugins/EssentialsX-2.20.0.jar new file mode 100644 index 0000000..d38bcef Binary files /dev/null and b/server/plugins/EssentialsX-2.20.0.jar differ diff --git a/server/plugins/EssentialsXChat-2.20.0.jar b/server/plugins/EssentialsXChat-2.20.0.jar new file mode 100644 index 0000000..a709fc2 Binary files /dev/null and b/server/plugins/EssentialsXChat-2.20.0.jar differ diff --git a/server/plugins/EssentialsXGeoIP-2.20.0.jar b/server/plugins/EssentialsXGeoIP-2.20.0.jar new file mode 100644 index 0000000..b7fda0a Binary files /dev/null and b/server/plugins/EssentialsXGeoIP-2.20.0.jar differ diff --git a/server/plugins/EssentialsXProtect-2.20.0.jar b/server/plugins/EssentialsXProtect-2.20.0.jar new file mode 100644 index 0000000..d582384 Binary files /dev/null and b/server/plugins/EssentialsXProtect-2.20.0.jar differ diff --git a/server/plugins/EssentialsXSpawn-2.20.0.jar b/server/plugins/EssentialsXSpawn-2.20.0.jar new file mode 100644 index 0000000..ce1be4d Binary files /dev/null and b/server/plugins/EssentialsXSpawn-2.20.0.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 new file mode 100644 index 0000000..28b369c Binary files /dev/null and b/server/plugins/FastAsyncWorldEdit-Bukkit-2.6.4-SNAPSHOT-493.jar differ diff --git a/server/plugins/LuckPerms-Bukkit-5.4.89.jar b/server/plugins/LuckPerms-Bukkit-5.4.89.jar new file mode 100644 index 0000000..fb0bfcb Binary files /dev/null and b/server/plugins/LuckPerms-Bukkit-5.4.89.jar differ diff --git a/server/plugins/Multiverse-Core-4.3.1.jar b/server/plugins/Multiverse-Core-4.3.1.jar new file mode 100644 index 0000000..09b0895 Binary files /dev/null and b/server/plugins/Multiverse-Core-4.3.1.jar differ diff --git a/server/plugins/PixelmonEconomyBridge-1.0.9.jar b/server/plugins/PixelmonEconomyBridge-1.0.9.jar new file mode 100644 index 0000000..03b8b88 Binary files /dev/null and b/server/plugins/PixelmonEconomyBridge-1.0.9.jar differ diff --git a/server/plugins/Vault.jar b/server/plugins/Vault.jar new file mode 100644 index 0000000..4bcaa89 Binary files /dev/null and b/server/plugins/Vault.jar differ diff --git a/server/server.py b/server/server.py index a2c9f8b..094c0b5 100644 --- a/server/server.py +++ b/server/server.py @@ -6,6 +6,8 @@ from typing import Any 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" @@ -14,20 +16,19 @@ 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"] +DELETION_EXEMPTED_MODS = ["TrainerCommands-1.16.5-2.6.0.jar"] # main def __main__(): header() - needs_mods = instance() - if needs_mods: + needs_mods_plugins = instance() + if needs_mods_plugins: mods() - forge() + plugins() arclight() launch() @@ -38,7 +39,16 @@ def launch(): exit(0) os.chdir(f"{INSTANCE_DIR}/.minecraft") - subprocess.run(["java", "-Xmx30720M", "-Xms1024M", "-jar", ARCLIGHT_JAR, "--nogui"]) + subprocess.run( + [ + "java", + "-Xmx30720M", + "-Xms1024M", + "-jar", + FORGE_JAR, + "--nogui", + ] + ) # arclight @@ -52,6 +62,13 @@ def arclight(): cprint("arclight.jar not found - downloading", "yellow") r = requests.get(FORGE_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 @@ -104,6 +121,21 @@ def mods(): cprint("mods downloaded successfully", "green") +# plugins +def plugins(): + os.chdir(INSTANCE_DIR) + + 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) + + 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))) + + cprint("plugins copied successfully", "green") + + # multimc def instance(): unclean = False