aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Cao <70191398+ryanccn@users.noreply.github.com>2022-11-21 23:19:50 +0800
committerRyan Cao <70191398+ryanccn@users.noreply.github.com>2022-11-21 23:19:50 +0800
commitf916ce875266ea2070c10f80ded35b66d315418c (patch)
tree5aa0caaac52847222a23482ff5fba7b41fca0f26
parent7096f02b88e982df6c770113146a07874a1e9d0f (diff)
parent5cc91965d09070437af8c17113c5740401b127dd (diff)
downloadPrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.tar.gz
PrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.tar.bz2
PrismLauncher-f916ce875266ea2070c10f80ded35b66d315418c.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import-resource-pack-dialog-uwu
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--COPYING.md17
-rw-r--r--launcher/Application.cpp119
-rw-r--r--launcher/Application.h1
-rw-r--r--launcher/CMakeLists.txt7
-rw-r--r--launcher/DataMigrationTask.cpp96
-rw-r--r--launcher/DataMigrationTask.h42
-rw-r--r--launcher/FileSystem.cpp12
-rw-r--r--launcher/FileSystem.h30
-rw-r--r--launcher/InstanceCopyTask.cpp6
-rw-r--r--launcher/main.cpp2
-rw-r--r--launcher/minecraft/MinecraftInstance.cpp35
-rw-r--r--launcher/minecraft/MinecraftInstance.h4
-rw-r--r--launcher/pathmatcher/SimplePrefixMatcher.h25
-rw-r--r--launcher/resources/breeze_dark/breeze_dark.qrc43
-rw-r--r--launcher/resources/breeze_dark/index.theme11
-rw-r--r--launcher/resources/breeze_dark/scalable/about.svg12
-rw-r--r--launcher/resources/breeze_dark/scalable/accounts.svg17
-rw-r--r--launcher/resources/breeze_dark/scalable/bug.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/centralmods.svg1
-rw-r--r--launcher/resources/breeze_dark/scalable/checkupdate.svg14
-rw-r--r--launcher/resources/breeze_dark/scalable/copy.svg11
-rw-r--r--launcher/resources/breeze_dark/scalable/coremods.svg1
-rw-r--r--launcher/resources/breeze_dark/scalable/custom-commands.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/delete.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/discord.svg1
-rw-r--r--launcher/resources/breeze_dark/scalable/export.svg11
-rw-r--r--launcher/resources/breeze_dark/scalable/externaltools.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/help.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/instance-settings.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/jarmods.svg1
-rw-r--r--launcher/resources/breeze_dark/scalable/java.svg10
-rw-r--r--launcher/resources/breeze_dark/scalable/language.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/launch.svg8
-rw-r--r--launcher/resources/breeze_dark/scalable/launcher.svg57
-rw-r--r--launcher/resources/breeze_dark/scalable/loadermods.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/log.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/matrix.svg9
-rw-r--r--launcher/resources/breeze_dark/scalable/minecraft.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/new.svg18
-rw-r--r--launcher/resources/breeze_dark/scalable/news.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/notes.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/patreon.svg3
-rw-r--r--launcher/resources/breeze_dark/scalable/proxy.svg14
-rw-r--r--launcher/resources/breeze_dark/scalable/reddit-alien.svg3
-rw-r--r--launcher/resources/breeze_dark/scalable/refresh.svg8
-rw-r--r--launcher/resources/breeze_dark/scalable/rename.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/resourcepacks.svg11
-rw-r--r--launcher/resources/breeze_dark/scalable/screenshots.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/settings.svg17
-rw-r--r--launcher/resources/breeze_dark/scalable/shaderpacks.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/status-bad.svg9
-rw-r--r--launcher/resources/breeze_dark/scalable/status-good.svg10
-rw-r--r--launcher/resources/breeze_dark/scalable/status-yellow.svg9
-rw-r--r--launcher/resources/breeze_dark/scalable/tag.svg17
-rw-r--r--launcher/resources/breeze_dark/scalable/viewfolder.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/worlds.svg16
-rw-r--r--launcher/resources/breeze_light/breeze_light.qrc43
-rw-r--r--launcher/resources/breeze_light/index.theme11
-rw-r--r--launcher/resources/breeze_light/scalable/about.svg12
-rw-r--r--launcher/resources/breeze_light/scalable/accounts.svg17
-rw-r--r--launcher/resources/breeze_light/scalable/bug.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/centralmods.svg1
-rw-r--r--launcher/resources/breeze_light/scalable/checkupdate.svg14
-rw-r--r--launcher/resources/breeze_light/scalable/copy.svg11
-rw-r--r--launcher/resources/breeze_light/scalable/coremods.svg1
-rw-r--r--launcher/resources/breeze_light/scalable/custom-commands.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/delete.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/discord.svg1
-rw-r--r--launcher/resources/breeze_light/scalable/export.svg11
-rw-r--r--launcher/resources/breeze_light/scalable/externaltools.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/help.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/instance-settings.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/jarmods.svg1
-rw-r--r--launcher/resources/breeze_light/scalable/java.svg10
-rw-r--r--launcher/resources/breeze_light/scalable/language.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/launch.svg8
-rw-r--r--launcher/resources/breeze_light/scalable/loadermods.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/log.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/matrix.svg9
-rw-r--r--launcher/resources/breeze_light/scalable/minecraft.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/new.svg18
-rw-r--r--launcher/resources/breeze_light/scalable/news.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/notes.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/patreon.svg3
-rw-r--r--launcher/resources/breeze_light/scalable/proxy.svg14
-rw-r--r--launcher/resources/breeze_light/scalable/reddit-alien.svg3
-rw-r--r--launcher/resources/breeze_light/scalable/refresh.svg8
-rw-r--r--launcher/resources/breeze_light/scalable/rename.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/resourcepacks.svg11
-rw-r--r--launcher/resources/breeze_light/scalable/screenshots.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/settings.svg17
-rw-r--r--launcher/resources/breeze_light/scalable/shaderpacks.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/status-bad.svg9
-rw-r--r--launcher/resources/breeze_light/scalable/status-good.svg10
-rw-r--r--launcher/resources/breeze_light/scalable/status-yellow.svg9
-rw-r--r--launcher/resources/breeze_light/scalable/tag.svg17
-rw-r--r--launcher/resources/breeze_light/scalable/viewfolder.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/worlds.svg16
-rw-r--r--launcher/translations/TranslationsModel.cpp3
-rw-r--r--launcher/ui/dialogs/ProgressDialog.cpp3
-rw-r--r--launcher/ui/pages/global/LauncherPage.cpp29
-rw-r--r--launcher/ui/pages/global/LauncherPage.ui10
-rw-r--r--libraries/README.md68
-rw-r--r--libraries/launcher/.gitignore1
-rw-r--r--libraries/launcher/CMakeLists.txt15
-rw-r--r--libraries/launcher/net/minecraft/Launcher.java181
-rw-r--r--libraries/launcher/org/prismlauncher/EntryPoint.java160
-rw-r--r--libraries/launcher/org/prismlauncher/Launcher.java23
-rw-r--r--libraries/launcher/org/prismlauncher/applet/LegacyFrame.java163
-rw-r--r--libraries/launcher/org/prismlauncher/exception/ParameterNotFoundException.java45
-rw-r--r--libraries/launcher/org/prismlauncher/exception/ParseException.java47
-rw-r--r--libraries/launcher/org/prismlauncher/impl/OneSixLauncher.java190
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/Launcher.java44
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java110
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java91
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyFrame.java190
-rw-r--r--libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyLauncher.java126
-rw-r--r--libraries/launcher/org/prismlauncher/utils/Parameters.java84
-rw-r--r--libraries/launcher/org/prismlauncher/utils/ReflectionUtils.java154
-rw-r--r--libraries/launcher/org/prismlauncher/utils/Utils.java49
-rw-r--r--libraries/launcher/org/prismlauncher/utils/logging/Level.java (renamed from libraries/launcher/org/prismlauncher/LauncherFactory.java)57
-rw-r--r--libraries/launcher/org/prismlauncher/utils/logging/Log.java104
-rw-r--r--tests/FileSystem_test.cpp37
1