diff --git a/client/client.py b/client/client.py index 6bc293f..0fab366 100644 --- a/client/client.py +++ b/client/client.py @@ -82,7 +82,10 @@ def mods(): ) 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) == "OptiFine_1.16.5_HD_U_G8.jar" + or os.path.basename(file) == "TrainerCommands-1.16.5-2.6.0.jar" + ): continue os.remove(file) diff --git a/modpack/manifest.json b/modpack/manifest.json index 9997f21..bd3b464 100644 --- a/modpack/manifest.json +++ b/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,22 @@ "name": "Storage Drawers" } }, + { + "projectID": 225608, + "fileID": 3172951, + "required": true, + "__meta": { + "name": "WorldEdit" + } + }, + { + "projectID": 228756, + "fileID": 3543538, + "required": true, + "__meta": { + "name": "Iron Chests" + } + }, { "projectID": 233342, "fileID": 3216206, @@ -66,6 +110,14 @@ "name": "Just Enough Items (JEI)" } }, + { + "projectID": 245755, + "fileID": 3515707, + "required": true, + "__meta": { + "name": "Waystones" + } + }, { "projectID": 247560, "fileID": 4024011, @@ -98,6 +150,18 @@ "name": "Simple Storage Network" } }, + { + "projectID": 314905, + "fileID": 3802698, + "required": true, + "__meta": { + "name": "FTB Ranks (Forge)", + "dependencies": [ + 404465, + 419699 + ] + } + }, { "projectID": 328085, "fileID": 3536025, @@ -117,6 +181,14 @@ "name": "Pam's HarvestCraft 2 - Crops" } }, + { + "projectID": 361579, + "fileID": 3767277, + "required": true, + "__meta": { + "name": "spark" + } + }, { "projectID": 365460, "fileID": 3281234, @@ -171,6 +243,18 @@ ] } }, + { + "projectID": 404465, + "fileID": 3553840, + "required": true, + "__meta": { + "name": "FTB Library (Forge)", + "explicit": false, + "dependencies": [ + 419699 + ] + } + }, { "projectID": 410295, "fileID": 4514901, @@ -180,6 +264,26 @@ "explicit": false } }, + { + "projectID": 410811, + "fileID": 3510643, + "required": true, + "__meta": { + "name": "FTB Essentials (Forge)", + "dependencies": [ + 404465 + ] + } + }, + { + "projectID": 419699, + "fileID": 4521290, + "required": true, + "__meta": { + "name": "Architectury API (Fabric/Forge)", + "explicit": false + } + }, { "projectID": 486392, "fileID": 3535459, diff --git a/modpack/overrides/mods/TrainerCommands-1.16.5-2.6.0.jar b/modpack/overrides/mods/TrainerCommands-1.16.5-2.6.0.jar new file mode 100644 index 0000000..002b0b1 Binary files /dev/null and b/modpack/overrides/mods/TrainerCommands-1.16.5-2.6.0.jar differ diff --git a/server/server.py b/server/server.py index bfd8a8e..b9cf67e 100644 --- a/server/server.py +++ b/server/server.py @@ -25,6 +25,7 @@ def __main__(): forge() launch() + # launcher def launch(): if input("launch server? [Y/n] ").lower() == "n": @@ -33,6 +34,7 @@ def launch(): os.chdir(f"{INSTANCE_DIR}/.minecraft") subprocess.run(["java", "-Xmx30720M", "-Xms1024M", "-jar", FORGE_JAR, "--nogui"]) + # forge def forge(): os.makedirs(f"{INSTANCE_DIR}/.minecraft", exist_ok=True) @@ -71,6 +73,8 @@ def 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) == "TrainerCommands-1.16.5-2.6.0.jar": + continue os.remove(file) for file in glob.glob(os.path.join(INSTANCE_DIR, "mods", "mods", "*")):