From 3048b3bf50e03aaa2c3a00d353853005badc38d4 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Mon, 14 Mar 2022 20:49:56 -0400 Subject: [PATCH] Load Custom Mods First --- docs/CHANGELOG.md | 1 + launcher/src/bootstrap.c | 8 ++++---- scripts/generate-appimage-builder-yaml.js | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b8e69b19d..7956afa7a 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,7 @@ **2.3.1** * Internal Refactor Of ``libreborn`` * Remove Use Of ``/bin/sh`` +* Load Custom Mods First **2.3.0** * Switch To AppImage For Packaging diff --git a/launcher/src/bootstrap.c b/launcher/src/bootstrap.c index 48d72648a..57ea68a1d 100644 --- a/launcher/src/bootstrap.c +++ b/launcher/src/bootstrap.c @@ -242,22 +242,22 @@ void bootstrap(int argc, char *argv[]) { PRESERVE_ENVIRONMENTAL_VARIABLE("LD_PRELOAD"); char *new_ld_preload = NULL; - // Built-In Mods + // ~/.minecraft-pi/mods { // Get Mods Folder char *mods_folder = NULL; - safe_asprintf(&mods_folder, "%s/mods/", binary_directory); + safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/mods/", getenv("HOME")); // Load Mods From ./mods load(&new_ld_preload, mods_folder); // Free Mods Folder free(mods_folder); } - // ~/.minecraft-pi/mods + // Built-In Mods { // Get Mods Folder char *mods_folder = NULL; - safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/mods/", getenv("HOME")); + safe_asprintf(&mods_folder, "%s/mods/", binary_directory); // Load Mods From ./mods load(&new_ld_preload, mods_folder); // Free Mods Folder diff --git a/scripts/generate-appimage-builder-yaml.js b/scripts/generate-appimage-builder-yaml.js index 168d29c54..7c780afd0 100755 --- a/scripts/generate-appimage-builder-yaml.js +++ b/scripts/generate-appimage-builder-yaml.js @@ -55,7 +55,6 @@ const packageExclusions = [ '*systemd*', 'dconf-service', 'dconf-gsettings-backend', - 'libgnutls*', 'librest-*', 'libcups2', 'libcolord2',