aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-10-13 01:59:25 +0200
committerPetr Mrázek <peterix@gmail.com>2021-10-21 00:47:53 +0200
commit441ab7eedcb8fe120a7f934684ed5545cdd7a4b6 (patch)
tree5a1a93e871f5172b3f087e9eb04bf6918bd34ec7
parent6a4130c9149deb029b496c81e3b874ad834c54b7 (diff)
downloadPrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.tar.gz
PrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.tar.bz2
PrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.zip
NOISSUE debranding for real, initial work
This is probably very broken on macOS and Windows and will need a lot of work to complete fully.
-rw-r--r--.gitignore4
-rw-r--r--.gitmodules2
-rw-r--r--BUILD.md2
-rw-r--r--CMakeLists.txt165
-rw-r--r--README.md32
-rw-r--r--buildconfig/BuildConfig.cpp.in42
-rw-r--r--changelog.md4
-rw-r--r--launcher/BaseInstance.h2
-rw-r--r--launcher/CMakeLists.txt78
-rw-r--r--launcher/Env.h2
-rw-r--r--launcher/GuiUtil.cpp4
-rw-r--r--launcher/InstanceList.cpp2
-rw-r--r--launcher/InstanceProxyModel.cpp6
-rw-r--r--launcher/InstanceWindow.cpp18
-rw-r--r--launcher/LaunchController.cpp10
-rw-r--r--launcher/Launcher.cpp (renamed from launcher/MultiMC.cpp)108
-rw-r--r--launcher/Launcher.h (renamed from launcher/MultiMC.h)14
-rwxr-xr-xlauncher/Launcher.in (renamed from launcher/package/linux/MultiMC)37
-rw-r--r--launcher/MainWindow.cpp198
-rw-r--r--launcher/VersionProxyModel.cpp8
-rw-r--r--launcher/dialogs/AboutDialog.cpp4
-rw-r--r--launcher/dialogs/CopyInstanceDialog.cpp10
-rw-r--r--launcher/dialogs/ExportInstanceDialog.cpp4
-rw-r--r--launcher/dialogs/IconPickerDialog.cpp12
-rw-r--r--launcher/dialogs/NewComponentDialog.cpp4
-rw-r--r--launcher/dialogs/NewInstanceDialog.cpp24
-rw-r--r--launcher/dialogs/ProfileSelectDialog.cpp4
-rw-r--r--launcher/dialogs/UpdateDialog.cpp12
-rw-r--r--launcher/dialogs/VersionSelectDialog.cpp2
-rw-r--r--launcher/main.cpp12
-rw-r--r--launcher/minecraft/OneSixVersionFormat.cpp18
-rwxr-xr-xlauncher/package/linux/multimc.desktop11
-rw-r--r--launcher/pagedialog/PageDialog.cpp6
-rw-r--r--launcher/pages/global/AccountListPage.cpp4
-rw-r--r--launcher/pages/global/AccountListPage.h6
-rw-r--r--launcher/pages/global/CustomCommandsPage.cpp4
-rw-r--r--launcher/pages/global/CustomCommandsPage.h4
-rw-r--r--launcher/pages/global/ExternalToolsPage.cpp18
-rw-r--r--launcher/pages/global/ExternalToolsPage.h6
-rw-r--r--launcher/pages/global/JavaPage.cpp8
-rw-r--r--launcher/pages/global/JavaPage.h4
-rw-r--r--launcher/pages/global/LanguagePage.cpp2
-rw-r--r--launcher/pages/global/LanguagePage.h4
-rw-r--r--launcher/pages/global/LauncherPage.cpp (renamed from launcher/pages/global/MultiMCPage.cpp)58
-rw-r--r--launcher/pages/global/LauncherPage.h (renamed from launcher/pages/global/MultiMCPage.h)14
-rw-r--r--launcher/pages/global/LauncherPage.ui (renamed from launcher/pages/global/MultiMCPage.ui)4
-rw-r--r--launcher/pages/global/MinecraftPage.cpp6
-rw-r--r--launcher/pages/global/MinecraftPage.h4
-rw-r--r--launcher/pages/global/PasteEEPage.cpp6
-rw-r--r--launcher/pages/global/PasteEEPage.h4
-rw-r--r--launcher/pages/global/ProxyPage.cpp6
-rw-r--r--launcher/pages/global/ProxyPage.h4
-rw-r--r--launcher/pages/instance/GameOptionsPage.h4
-rw-r--r--launcher/pages/instance/InstanceSettingsPage.cpp14
-rw-r--r--launcher/pages/instance/InstanceSettingsPage.h4
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.cpp6
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.h4
-rw-r--r--launcher/pages/instance/LogPage.cpp6
-rw-r--r--launcher/pages/instance/LogPage.h4
-rw-r--r--launcher/pages/instance/ModFolderPage.cpp4
-rw-r--r--launcher/pages/instance/ModFolderPage.h4
-rw-r--r--launcher/pages/instance/NotesPage.h6
-rw-r--r--launcher/pages/instance/OtherLogsPage.cpp4
-rw-r--r--launcher/pages/instance/OtherLogsPage.h4
-rw-r--r--launcher/pages/instance/ScreenshotsPage.cpp4
-rw-r--r--launcher/pages/instance/ScreenshotsPage.h4
-rw-r--r--launcher/pages/instance/ServersPage.cpp4
-rw-r--r--launcher/pages/instance/ServersPage.h4
-rw-r--r--launcher/pages/instance/VersionPage.cpp18
-rw-r--r--launcher/pages/instance/WorldListPage.cpp8
-rw-r--r--launcher/pages/instance/WorldListPage.h4
-rw-r--r--launcher/pages/modplatform/ImportPage.cpp2
-rw-r--r--launcher/pages/modplatform/ImportPage.h4
-rw-r--r--launcher/pages/modplatform/VanillaPage.cpp2
-rw-r--r--launcher/pages/modplatform/VanillaPage.h4
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlListModel.cpp4
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlPage.cpp2
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlPage.h4
-rw-r--r--launcher/pages/modplatform/flame/FlameModel.cpp4
-rw-r--r--launcher/pages/modplatform/flame/FlamePage.cpp2
-rw-r--r--launcher/pages/modplatform/flame/FlamePage.h4
-rw-r--r--launcher/pages/modplatform/ftb/FtbListModel.cpp4
-rw-r--r--launcher/pages/modplatform/ftb/FtbPage.h4
-rw-r--r--launcher/pages/modplatform/legacy_ftb/ListModel.cpp4
-rw-r--r--launcher/pages/modplatform/legacy_ftb/Page.cpp2
-rw-r--r--launcher/pages/modplatform/legacy_ftb/Page.h4
-rw-r--r--launcher/pages/modplatform/technic/TechnicModel.cpp4
-rw-r--r--launcher/pages/modplatform/technic/TechnicPage.cpp2
-rw-r--r--launcher/pages/modplatform/technic/TechnicPage.h4
-rw-r--r--launcher/resources/MultiMC.icnsbin782703 -> 0 bytes
-rw-r--r--launcher/resources/MultiMC.icobin55224 -> 0 bytes
-rw-r--r--launcher/setupwizard/AnalyticsWizardPage.cpp6
-rw-r--r--launcher/setupwizard/JavaWizardPage.cpp6
-rw-r--r--launcher/setupwizard/LanguageWizardPage.cpp6
-rw-r--r--launcher/setupwizard/SetupWizard.cpp2
-rw-r--r--launcher/themes/ITheme.cpp6
-rw-r--r--launcher/translations/TranslationsModel.cpp2
-rw-r--r--launcher/widgets/JavaSettingsWidget.cpp12
-rw-r--r--launcher/widgets/LanguageSelectionWidget.cpp8
-rw-r--r--launcher/widgets/PageContainer.cpp10
-rw-r--r--libraries/classparser/CMakeLists.txt6
-rw-r--r--libraries/iconfix/CMakeLists.txt12
m---------libraries/quazip0
-rw-r--r--libraries/rainbow/CMakeLists.txt8
-rw-r--r--notsecrets/CMakeLists.txt5
-rw-r--r--notsecrets/Launcher.icnsbin0 -> 304757 bytes
-rw-r--r--notsecrets/Launcher.icobin0 -> 102134 bytes
-rw-r--r--notsecrets/Launcher.manifest (renamed from launcher/resources/MultiMC.manifest)2
-rwxr-xr-xnotsecrets/genicons.sh18
-rw-r--r--notsecrets/launcher.rc29
-rw-r--r--notsecrets/logo.svg274
-rw-r--r--secrets/multimc.rc (renamed from launcher/resources/multimc.rc)0
112 files changed, 945 insertions, 664 deletions
diff --git a/.gitignore b/.gitignore
index 6b716252..84bf1676 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,5 +31,5 @@ tags
#OSX Stuff
.DS_Store
-branding
-secrets
+branding/
+secrets/
diff --git a/.gitmodules b/.gitmodules
index bd51ef80..04a561c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,8 @@
[submodule "depends/libnbtplusplus"]
path = libraries/libnbtplusplus
url = https://github.com/MultiMC/libnbtplusplus.git
+ pushurl = git@github.com:MultiMC/libnbtplusplus.git
[submodule "libraries/quazip"]
path = libraries/quazip
url = https://github.com/MultiMC/quazip.git
+ pushurl = git@github.com:MultiMC/quazip.git
diff --git a/BUILD.md b/BUILD.md
index de97433b..faa9fa85 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -197,7 +197,7 @@ cmake \
-DCMAKE_INSTALL_PREFIX:PATH="../dist/" \
-DCMAKE_PREFIX_PATH="/path/to/Qt5.6/" \
-DQt5_DIR="/path/to/Qt5.6/" \
- -DMultiMC_LAYOUT=mac-bundle \
+ -DLauncher_LAYOUT=mac-bundle \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \
..
make install
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44028f76..e4aae98b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.1)
string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BUILD_DIR}" IS_IN_SOURCE_BUILD)
if(IS_IN_SOURCE_BUILD)
- message(FATAL_ERROR "You are building MultiMC in-source. Please separate the build tree from the source tree.")
+ message(FATAL_ERROR "You are building the Launcher in-source. Please separate the build tree from the source tree.")
endif()
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
if(CMAKE_HOST_SYSTEM_VERSION MATCHES ".*[Mm]icrosoft.*" OR
CMAKE_HOST_SYSTEM_VERSION MATCHES ".*WSL.*"
)
- message(FATAL_ERROR "Building MultiMC is not supported in Linux-on-Windows distributions.")
+ message(FATAL_ERROR "Building the Launcher is not supported in Linux-on-Windows distributions.")
endif()
endif()
@@ -18,7 +18,7 @@ if(WIN32)
cmake_policy(SET CMP0020 OLD)
endif()
-project(MultiMC)
+project(Launcher)
enable_testing()
@@ -50,61 +50,61 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
##################################### Set Application options #####################################
######## Set URLs ########
-set(MultiMC_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetch MultiMC's news RSS feed from.")
+set(Launcher_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetch Launcher's news RSS feed from.")
######## Set version numbers ########
-set(MultiMC_VERSION_MAJOR 0)
-set(MultiMC_VERSION_MINOR 6)
-set(MultiMC_VERSION_HOTFIX 13)
+set(Launcher_VERSION_MAJOR 0)
+set(Launcher_VERSION_MINOR 6)
+set(Launcher_VERSION_HOTFIX 13)
# Build number
-set(MultiMC_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
+set(Launcher_VERSION_BUILD -1 CACHE STRING "Build number. -1 for no build number.")
# Build platform.
-set(MultiMC_BUILD_PLATFORM "" CACHE STRING "A short string identifying the platform that this build was built for. Only used by the notification system and to display in the about dialog.")
+set(Launcher_BUILD_PLATFORM "" CACHE STRING "A short string identifying the platform that this build was built for. Only used by the notification system and to display in the about dialog.")
# Channel list URL
-set(MultiMC_UPDATER_BASE "" CACHE STRING "Base URL for the updater.")
+set(Launcher_UPDATER_BASE "" CACHE STRING "Base URL for the updater.")
# Notification URL
-set(MultiMC_NOTIFICATION_URL "" CACHE STRING "URL for checking for notifications.")
+set(Launcher_NOTIFICATION_URL "" CACHE STRING "URL for checking for notifications.")
# The metadata server
-set(MultiMC_META_URL "https://meta.multimc.org/v1/" CACHE STRING "URL to fetch MultiMC's meta files from.")
+set(Launcher_META_URL "https://meta.multimc.org/v1/" CACHE STRING "URL to fetch Launcher's meta files from.")
# paste.ee API key
-set(MultiMC_PASTE_EE_API_KEY "utLvciUouSURFzfjPxLBf5W4ISsUX4pwBDF7N1AfZ" CACHE STRING "API key you can get from paste.ee when you register an account")
+set(Launcher_PASTE_EE_API_KEY "utLvciUouSURFzfjPxLBf5W4ISsUX4pwBDF7N1AfZ" CACHE STRING "API key you can get from paste.ee when you register an account")
# Imgur API Client ID
-set(MultiMC_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
+set(Launcher_IMGUR_CLIENT_ID "5b97b0713fba4a3" CACHE STRING "Client ID you can get from Imgur when you register an application")
# Google analytics ID
-set(MultiMC_ANALYTICS_ID "UA-87731965-2" CACHE STRING "ID you can get from Google analytics")
+set(Launcher_ANALYTICS_ID "UA-87731965-2" CACHE STRING "ID you can get from Google analytics")
# Bug tracker URL
-set(MultiMC_BUG_TRACKER_URL "" CACHE STRING "URL for the bug tracker.")
+set(Launcher_BUG_TRACKER_URL "" CACHE STRING "URL for the bug tracker.")
# Discord URL
-set(MultiMC_DISCORD_URL "" CACHE STRING "URL for the Discord guild.")
+set(Launcher_DISCORD_URL "" CACHE STRING "URL for the Discord guild.")
# Subreddit URL
-set(MultiMC_SUBREDDIT_URL "" CACHE STRING "URL for the subreddit.")
+set(Launcher_SUBREDDIT_URL "" CACHE STRING "URL for the subreddit.")
-
-option(MultiMC_EMBED_SECRETS "Determines whether to embed secrets. Secrets are separate and non-public." OFF)
+# Use the secrets library or a public stub?
+option(Launcher_EMBED_SECRETS "Determines whether to embed secrets. Secrets are separate and non-public." OFF)
#### Check the current Git commit and branch
include(GetGitRevisionDescription)
-get_git_head_revision(MultiMC_GIT_REFSPEC MultiMC_GIT_COMMIT)
+get_git_head_revision(Launcher_GIT_REFSPEC Launcher_GIT_COMMIT)
-message(STATUS "Git commit: ${MultiMC_GIT_COMMIT}")
-message(STATUS "Git refspec: ${MultiMC_GIT_REFSPEC}")
+message(STATUS "Git commit: ${Launcher_GIT_COMMIT}")
+message(STATUS "Git refspec: ${Launcher_GIT_REFSPEC}")