mirror of
https://github.com/PrismLauncher/PrismLauncher
synced 2026-04-23 09:05:03 +00:00
style: re-format tree with editorconfig
```
find $PWD \
-type f \
! -path '*/.git/*' ! -path '*/flatpak/shared-modules/*' \
! -path '*/libraries/*' ! -path '*/testdata/*' ! -name '*.patch' \
! -name '*.svg' ! -name '*.scd' ! -path '*/program_info/LICENSE' \
! -path '*/COPYING.md' ! -path '*/cmake/*' ! -name '.gitmodules' \
-exec eclint -fix {} \;
```
Signed-off-by: Seth Flynn <getchoo@tuta.io>
This commit is contained in:
Seth Flynn
parent
686ad72e03
commit
fd91f87c21
4
.github/ISSUE_TEMPLATE/rfc.yml
vendored
4
.github/ISSUE_TEMPLATE/rfc.yml
vendored
|
|
@ -44,8 +44,8 @@ body:
|
|||
attributes:
|
||||
label: Unresolved Questions
|
||||
description: |
|
||||
Are there any portions of your proposal which need to be discussed with the community before the RFC can proceed?
|
||||
Be careful here -- an RFC with a lot of remaining questions is likely to be stalled.
|
||||
Are there any portions of your proposal which need to be discussed with the community before the RFC can proceed?
|
||||
Be careful here -- an RFC with a lot of remaining questions is likely to be stalled.
|
||||
If your RFC is mostly unresolved questions and not too much substance, it may not be ready.
|
||||
placeholder: Do a lot of users care about the cat?
|
||||
validations:
|
||||
|
|
|
|||
20
.github/workflows/blocked-prs.yml
vendored
20
.github/workflows/blocked-prs.yml
vendored
|
|
@ -76,11 +76,11 @@ jobs:
|
|||
run: |
|
||||
prs=$(
|
||||
jq -c '
|
||||
.prBody as $body
|
||||
.prBody as $body
|
||||
| (
|
||||
$body |
|
||||
reduce (
|
||||
. | scan("[Bb]locked (?:[Bb]y|[Oo]n):? #([0-9]+)")
|
||||
$body |
|
||||
reduce (
|
||||
. | scan("[Bb]locked (?:[Bb]y|[Oo]n):? #([0-9]+)")
|
||||
| map({
|
||||
"type": "Blocked on",
|
||||
"number": ( . | tonumber )
|
||||
|
|
@ -88,8 +88,8 @@ jobs:
|
|||
) as $i ([]; . + [$i[]])
|
||||
) as $bprs
|
||||
| (
|
||||
$body |
|
||||
reduce (
|
||||
$body |
|
||||
reduce (
|
||||
. | scan("[Ss]tacked [Oo]n:? #([0-9]+)")
|
||||
| map({
|
||||
"type": "Stacked on",
|
||||
|
|
@ -97,8 +97,8 @@ jobs:
|
|||
})
|
||||
) as $i ([]; . + [$i[]])
|
||||
) as $sprs
|
||||
| ($bprs + $sprs) as $prs
|
||||
| {
|
||||
| ($bprs + $sprs) as $prs
|
||||
| {
|
||||
"blocking": $prs,
|
||||
"numBlocking": ( $prs | length),
|
||||
}
|
||||
|
|
@ -126,7 +126,7 @@ jobs:
|
|||
"number": .number,
|
||||
"merged": .merged,
|
||||
"state": (if .state == "open" then "Open" elif .merged then "Merged" else "Closed" end),
|
||||
"labels": (reduce .labels[].name as $l ([]; . + [$l])),
|
||||
"labels": (reduce .labels[].name as $l ([]; . + [$l])),
|
||||
"basePrUrl": .html_url,
|
||||
"baseRepoName": .head.repo.name,
|
||||
"baseRepoOwner": .head.repo.owner.login,
|
||||
|
|
@ -143,7 +143,7 @@ jobs:
|
|||
echo "current_blocking=$(jq -c 'map(
|
||||
select(
|
||||
(.type == "Stacked on" and (.merged | not)) or
|
||||
(.type == "Blocked on" and (.state == "Open"))
|
||||
(.type == "Blocked on" and (.state == "Open"))
|
||||
) | .number
|
||||
)' <<< "$blocked_pr_data" )";
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
|
|
|
|||
4
.github/workflows/merge-blocking-pr.yml
vendored
4
.github/workflows/merge-blocking-pr.yml
vendored
|
|
@ -38,7 +38,7 @@ jobs:
|
|||
gh -R ${{ github.repository }} pr list --label 'blocked' --json 'number,body' \
|
||||
| jq -c --argjson pr "$PR_NUMBER" '
|
||||
reduce ( .[] | select(
|
||||
.body |
|
||||
.body |
|
||||
scan("(?:blocked (?:by|on)|stacked on):? #([0-9]+)") |
|
||||
map(tonumber) |
|
||||
any(.[]; . == $pr)
|
||||
|
|
@ -47,7 +47,7 @@ jobs:
|
|||
)
|
||||
{
|
||||
echo "deps=$blocked_prs"
|
||||
echo "numdeps=$(jq -r '. | length' <<< "$blocked_prs")"
|
||||
echo "numdeps=$(jq -r '. | length' <<< "$blocked_prs")"
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Trigger Blocked PR Workflows for Dependants
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ if(UNIX AND APPLE)
|
|||
|
||||
else()
|
||||
message(WARNING "actool not found. Cannot compile macOS app icons.\n"
|
||||
"Install Xcode command line tools: 'xcode-select --install'")
|
||||
"Install Xcode command line tools: 'xcode-select --install'")
|
||||
endif()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,221 +1,221 @@
|
|||
{
|
||||
"$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json",
|
||||
"version": 8,
|
||||
"cmakeMinimumRequired": {
|
||||
"major": 3,
|
||||
"minor": 28
|
||||
},
|
||||
"configurePresets": [
|
||||
{
|
||||
"name": "base",
|
||||
"hidden": true,
|
||||
"binaryDir": "build",
|
||||
"installDir": "install",
|
||||
"generator": "Ninja Multi-Config",
|
||||
"cacheVariables": {
|
||||
"Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}",
|
||||
"Launcher_BUILD_PLATFORM": "$penv{BUILD_PLATFORM}",
|
||||
"Launcher_ENABLE_JAVA_DOWNLOADER": "ON",
|
||||
"ENABLE_LTO": "ON"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "linux",
|
||||
"displayName": "Linux",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Linux"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "macos",
|
||||
"displayName": "macOS",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
},
|
||||
"cacheVariables": {
|
||||
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "macos_universal",
|
||||
"displayName": "macOS (Universal Binary)",
|
||||
"inherits": [
|
||||
"macos"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||
"CMAKE_OSX_ARCHITECTURES": "x86_64;arm64",
|
||||
"VCPKG_TARGET_TRIPLET": "universal-osx"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "windows_mingw",
|
||||
"displayName": "Windows (MinGW)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "windows_msvc",
|
||||
"displayName": "Windows (MSVC)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"cacheVariables": {
|
||||
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
|
||||
}
|
||||
}
|
||||
],
|
||||
"buildPresets": [
|
||||
{
|
||||
"name": "linux",
|
||||
"displayName": "Linux",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Linux"
|
||||
},
|
||||
"configurePreset": "linux"
|
||||
},
|
||||
{
|
||||
"name": "macos",
|
||||
"displayName": "macOS",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
},
|
||||
"$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json",
|
||||
"version": 8,
|
||||
"cmakeMinimumRequired": {
|
||||
"major": 3,
|
||||
"minor": 28
|
||||
},
|
||||
"configurePresets": [
|
||||
{
|
||||
"name": "base",
|
||||
"hidden": true,
|
||||
"binaryDir": "build",
|
||||
"installDir": "install",
|
||||
"generator": "Ninja Multi-Config",
|
||||
"cacheVariables": {
|
||||
"Launcher_BUILD_ARTIFACT": "$penv{ARTIFACT_NAME}",
|
||||
"Launcher_BUILD_PLATFORM": "$penv{BUILD_PLATFORM}",
|
||||
"Launcher_ENABLE_JAVA_DOWNLOADER": "ON",
|
||||
"ENABLE_LTO": "ON"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "linux",
|
||||
"displayName": "Linux",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Linux"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "macos",
|
||||
"displayName": "macOS",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
},
|
||||
"cacheVariables": {
|
||||
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "macos_universal",
|
||||
"displayName": "macOS (Universal Binary)",
|
||||
"inherits": [
|
||||
"macos"
|
||||
],
|
||||
"cacheVariables": {
|
||||
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
|
||||
"CMAKE_OSX_ARCHITECTURES": "x86_64;arm64",
|
||||
"VCPKG_TARGET_TRIPLET": "universal-osx"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "windows_mingw",
|
||||
"displayName": "Windows (MinGW)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "windows_msvc",
|
||||
"displayName": "Windows (MSVC)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"cacheVariables": {
|
||||
"CMAKE_TOOLCHAIN_FILE": "$penv{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
|
||||
}
|
||||
}
|
||||
],
|
||||
"buildPresets": [
|
||||
{
|
||||
"name": "linux",
|
||||
"displayName": "Linux",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Linux"
|
||||
},
|
||||
"configurePreset": "linux"
|
||||
},
|
||||
{
|
||||
"name": "macos",
|
||||
"displayName": "macOS",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
},
|
||||
"configurePreset": "macos"
|
||||
},
|
||||
{
|
||||
"name": "macos_universal",
|
||||
"displayName": "macOS (Universal Binary)",
|
||||
"inherits": [
|
||||
"macos"
|
||||
],
|
||||
"configurePreset": "macos_universal"
|
||||
},
|
||||
{
|
||||
"name": "windows_mingw",
|
||||
"displayName": "Windows (MinGW)",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"configurePreset": "windows_mingw"
|
||||
},
|
||||
{
|
||||
"name": "windows_msvc",
|
||||
"displayName": "Windows (MSVC)",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"configurePreset": "windows_msvc"
|
||||
}
|
||||
],
|
||||
"testPresets": [
|
||||
{
|
||||
"name": "base",
|
||||
"hidden": true,
|
||||
"output": {
|
||||
"outputOnFailure": true
|
||||
},
|
||||
"execution": {
|
||||
"noTestsAction": "error"
|
||||
},
|
||||
"filter": {
|
||||
"exclude": {
|
||||
"name": "^example64|example$"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "linux",
|
||||
"displayName": "Linux",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Linux"
|
||||
},
|
||||
"configurePreset": "linux"
|
||||
},
|
||||
{
|
||||
"name": "macos",
|
||||
"displayName": "macOS",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
},
|
||||
"configurePreset": "macos"
|
||||
},
|
||||
{
|
||||
"name": "macos_universal",
|
||||
"displayName": "macOS (Universal Binary)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
},
|
||||
"configurePreset": "macos_universal"
|
||||
},
|
||||
{
|
||||
"name": "windows_mingw",
|
||||
"displayName": "Windows (MinGW)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"configurePreset": "windows_mingw"
|
||||
},
|
||||
{
|
||||
"name": "windows_msvc",
|
||||
"displayName": "Windows (MSVC)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"configurePreset": "windows_msvc"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "macos_universal",
|
||||
"displayName": "macOS (Universal Binary)",
|
||||
"inherits": [
|
||||
"macos"
|
||||
],
|
||||
"configurePreset": "macos_universal"
|
||||
},
|
||||
{
|
||||
"name": "windows_mingw",
|
||||
"displayName": "Windows (MinGW)",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"configurePreset": "windows_mingw"
|
||||
},
|
||||
{
|
||||
"name": "windows_msvc",
|
||||
"displayName": "Windows (MSVC)",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"configurePreset": "windows_msvc"
|
||||
}
|
||||
],
|
||||
"testPresets": [
|
||||
{
|
||||
"name": "base",
|
||||
"hidden": true,
|
||||
"output": {
|
||||
"outputOnFailure": true
|
||||
},
|
||||
"execution": {
|
||||
"noTestsAction": "error"
|
||||
},
|
||||
"filter": {
|
||||
"exclude": {
|
||||
"name": "^example64|example$"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "linux",
|
||||
"displayName": "Linux",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Linux"
|
||||
},
|
||||
"configurePreset": "linux"
|
||||
},
|
||||
{
|
||||
"name": "macos",
|
||||
"displayName": "macOS",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
},
|
||||
"configurePreset": "macos"
|
||||
},
|
||||
{
|
||||
"name": "macos_universal",
|
||||
"displayName": "macOS (Universal Binary)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Darwin"
|
||||
},
|
||||
"configurePreset": "macos_universal"
|
||||
},
|
||||
{
|
||||
"name": "windows_mingw",
|
||||
"displayName": "Windows (MinGW)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"configurePreset": "windows_mingw"
|
||||
},
|
||||
{
|
||||
"name": "windows_msvc",
|
||||
"displayName": "Windows (MSVC)",
|
||||
"inherits": [
|
||||
"base"
|
||||
],
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
"lhs": "${hostSystemName}",
|
||||
"rhs": "Windows"
|
||||
},
|
||||
"configurePreset": "windows_msvc"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,4 +44,4 @@ QIcon FastFileIconProvider::icon(const QFileInfo& info) const
|
|||
}
|
||||
|
||||
return QApplication::style()->standardIcon(icon);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@
|
|||
class FastFileIconProvider : public QFileIconProvider {
|
||||
public:
|
||||
QIcon icon(const QFileInfo& info) const override;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -215,4 +215,4 @@ QString GZip::readGzFileByBlocks(QFile* source, std::function<bool(const QByteAr
|
|||
{
|
||||
auto ret = inf(source, handleBlock);
|
||||
return zerr(ret);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -189,4 +189,4 @@ void InstanceCopyPrefs::enableDontLinkSaves(bool b)
|
|||
void InstanceCopyPrefs::enableUseClone(bool b)
|
||||
{
|
||||
useClone = b;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -197,4 +197,4 @@ bool InstanceCopyTask::abort()
|
|||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,4 +33,4 @@ fi
|
|||
ARGS+=("$@")
|
||||
|
||||
# Run the launcher
|
||||
exec -a "${ARGS[@]}"
|
||||
exec -a "${ARGS[@]}"
|
||||
|
|
|
|||
|
|
@ -98,4 +98,4 @@ QString Time::humanReadableDuration(double duration, int precision)
|
|||
os.flush();
|
||||
|
||||
return outStr;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,4 +28,4 @@ QString markdownToHTML(const QString& markdown)
|
|||
free(buffer);
|
||||
|
||||
return htmlStr;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@
|
|||
#include <cmark.h>
|
||||
#include <QString>
|
||||
|
||||
QString markdownToHTML(const QString& markdown);
|
||||
QString markdownToHTML(const QString& markdown);
|
||||
|
|
|
|||
|
|
@ -68,4 +68,4 @@ class PSaveFile : public QSaveFile {
|
|||
};
|
||||
#else
|
||||
#define PSaveFile QSaveFile
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -66,4 +66,4 @@ inline QVariant fromList(QList<T> val)
|
|||
return variantList;
|
||||
}
|
||||
|
||||
} // namespace QVariantUtils
|
||||
} // namespace QVariantUtils
|
||||
|
|
|
|||
|
|
@ -231,4 +231,4 @@ QString StringUtils::htmlListPatch(QString htmlStr)
|
|||
pos = htmlStr.indexOf(s_ulMatcher, pos);
|
||||
}
|
||||
return htmlStr;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,4 +69,4 @@ class ArchiveReader {
|
|||
|
||||
QStringList m_fileNames = {};
|
||||
};
|
||||
} // namespace MMCZip
|
||||
} // namespace MMCZip
|
||||
|
|
|
|||
|
|
@ -43,4 +43,4 @@ class ArchiveWriter {
|
|||
QString m_filename;
|
||||
QString m_format = "zip";
|
||||
};
|
||||
} // namespace MMCZip
|
||||
} // namespace MMCZip
|
||||
|
|
|
|||
|
|
@ -97,4 +97,4 @@ bool ExportToZipTask::abort()
|
|||
}
|
||||
return false;
|
||||
}
|
||||
} // namespace MMCZip
|
||||
} // namespace MMCZip
|
||||
|
|
|
|||
|
|
@ -69,4 +69,4 @@ class ExportToZipTask : public Task {
|
|||
QFuture<ZipResult> m_buildZipFuture;
|
||||
QFutureWatcher<ZipResult> m_buildZipWatcher;
|
||||
};
|
||||
} // namespace MMCZip
|
||||
} // namespace MMCZip
|
||||
|
|
|
|||
|
|
@ -132,4 +132,4 @@ bool ExtractZipTask::abort()
|
|||
return false;
|
||||
}
|
||||
|
||||
} // namespace MMCZip
|
||||
} // namespace MMCZip
|
||||
|
|
|
|||
|
|
@ -50,4 +50,4 @@ class ExtractZipTask : public Task {
|
|||
QFuture<ZipResult> m_zipFuture;
|
||||
QFutureWatcher<ZipResult> m_zipWatcher;
|
||||
};
|
||||
} // namespace MMCZip
|
||||
} // namespace MMCZip
|
||||
|
|
|
|||
|
|
@ -61,4 +61,4 @@ DownloadType parseDownloadType(QString javaDownload);
|
|||
QString downloadTypeToString(DownloadType javaDownload);
|
||||
MetadataPtr parseJavaMeta(const QJsonObject& libObj);
|
||||
|
||||
} // namespace Java
|
||||
} // namespace Java
|
||||
|
|
|
|||
|
|
@ -114,4 +114,4 @@ bool ArchiveDownloadTask::abort()
|
|||
aborted = m_task->abort();
|
||||
return aborted;
|
||||
};
|
||||
} // namespace Java
|
||||
} // namespace Java
|
||||
|
|
|
|||
|
|
@ -42,4 +42,4 @@ class ArchiveDownloadTask : public Task {
|
|||
QString m_checksum_hash;
|
||||
Task::Ptr m_task;
|
||||
};
|
||||
} // namespace Java
|
||||
} // namespace Java
|
||||
|
|
|
|||
|
|
@ -43,4 +43,4 @@ class ManifestDownloadTask : public Task {
|
|||
QString m_checksum_hash;
|
||||
Task::Ptr m_task;
|
||||
};
|
||||
} // namespace Java
|
||||
} // namespace Java
|
||||
|
|
|
|||
|
|
@ -78,4 +78,4 @@ void SymlinkTask::executeTask()
|
|||
}
|
||||
}
|
||||
|
||||
} // namespace Java
|
||||
} // namespace Java
|
||||
|
|
|
|||
|
|
@ -33,4 +33,4 @@ class SymlinkTask : public Task {
|
|||
QString m_path;
|
||||
Task::Ptr m_task;
|
||||
};
|
||||
} // namespace Java
|
||||
} // namespace Java
|
||||
|
|
|
|||
|
|
@ -65,4 +65,4 @@ void anonymizeLog(QString& log)
|
|||
for (auto rule : anonymizeRules) {
|
||||
log.replace(rule.reg, rule.with);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,4 +37,4 @@
|
|||
|
||||
#include <QString>
|
||||
|
||||
void anonymizeLog(QString& log);
|
||||
void anonymizeLog(QString& log);
|
||||
|
|
|
|||
|
|
@ -171,4 +171,4 @@ class MinecraftInstance : public BaseInstance {
|
|||
std::unique_ptr<TexturePackFolderModel> m_texture_pack_list;
|
||||
std::unique_ptr<DataPackFolderModel> m_data_pack_list;
|
||||
std::unique_ptr<WorldList> m_world_list;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -43,4 +43,4 @@ bool MinecraftLoadAndCheck::abort()
|
|||
return status;
|
||||
}
|
||||
return Task::abort();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,4 +39,4 @@ void AuthSession::MakeDemo(QString name, QString u)
|
|||
access_token = "0";
|
||||
player_name = name;
|
||||
status = PlayableOnline; // needs online to download the assets
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -260,4 +260,4 @@ auto Resource::getOriginalFileName() const -> QString
|
|||
if (!m_enabled)
|
||||
fileName.chop(9);
|
||||
return fileName;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,4 +67,4 @@ class LocalDataPackParseTask : public Task {
|
|||
int m_token;
|
||||
|
||||
DataPack* m_data_pack;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -77,4 +77,4 @@ class SkinList : public QAbstractListModel {
|
|||
QList<SkinModel> m_skinList;
|
||||
QDir m_dir;
|
||||
MinecraftAccountPtr m_acct;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -56,4 +56,4 @@ class SkinModel {
|
|||
QString m_capeId;
|
||||
Model m_model;
|
||||
QString m_url;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -36,4 +36,4 @@ static const std::set<ResourceType> VALID_RESOURCES = { ResourceType::DataPack,
|
|||
ResourceType::ShaderPack, ResourceType::World, ResourceType::Mod };
|
||||
QString getName(ResourceType type);
|
||||
} // namespace ResourceTypeUtils
|
||||
} // namespace ModPlatform
|
||||
} // namespace ModPlatform
|
||||
|
|
|
|||
|
|
@ -45,4 +45,4 @@ void loadIndexedPack(IndexedPack& m, QJsonObject& obj);
|
|||
} // namespace ATLauncher
|
||||
|
||||
Q_DECLARE_METATYPE(ATLauncher::IndexedPack)
|
||||
Q_DECLARE_METATYPE(QList<ATLauncher::IndexedVersion>)
|
||||
Q_DECLARE_METATYPE(QList<ATLauncher::IndexedVersion>)
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@ void loadURLs(ModPlatform::IndexedPack& m, QJsonObject& obj);
|
|||
void loadBody(ModPlatform::IndexedPack& m);
|
||||
void loadIndexedPackVersions(ModPlatform::IndexedPack& pack, QJsonArray& arr);
|
||||
ModPlatform::IndexedVersion loadIndexedPackVersion(QJsonObject& obj, bool load_changelog = false);
|
||||
} // namespace FlameMod
|
||||
} // namespace FlameMod
|
||||
|
|
|
|||
|
|
@ -220,4 +220,4 @@ QString exportToModList(QList<Mod*> mods, QString lineTemplate)
|
|||
}
|
||||
return lines.join("\n");
|
||||
}
|
||||
} // namespace ExportToModList
|
||||
} // namespace ExportToModList
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<RCC version="1.0">
|
||||
<qresource prefix="/documents">
|
||||
<file>../../../COPYING.md</file>
|
||||
<file>credits.html</file>
|
||||
<file>credits.html</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
<file>scalable/status-running.svg</file>
|
||||
<file>scalable/status-yellow.svg</file>
|
||||
<file>scalable/viewfolder.svg</file>
|
||||
<file>scalable/worlds.svg</file>
|
||||
<file>scalable/worlds.svg</file>
|
||||
<file>scalable/delete.svg</file>
|
||||
<file>scalable/export.svg</file>
|
||||
<file>scalable/rename.svg</file>
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
<file>vshader_skin_background.glsl</file>
|
||||
<file>fshader.glsl</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
</RCC>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
// https://code.qt.io/cgit/qt/qtbase.git/tree/examples/opengl/cube/vshader.glsl
|
||||
|
||||
// Dylan Schooner - 2025
|
||||
// Modification: Implemented final Z-NDC re-inversion to compensate
|
||||
// Modification: Implemented final Z-NDC re-inversion to compensate
|
||||
// for rigid OpenGL 2.0 context forcing glClearDepth(1.0).
|
||||
// This flips the high-precision Reverse Z output to the standard [0, W] range.
|
||||
|
||||
|
|
|
|||
|
|
@ -108,4 +108,4 @@ auto ImgurAlbumCreation::Sink::finalize(QNetworkReply&) -> Task::State
|
|||
m_result->deleteHash = object.value("data").toObject().value("deletehash").toString();
|
||||
m_result->id = object.value("data").toObject().value("id").toString();
|
||||
return Task::State::Succeeded;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,4 +43,4 @@ BaseExternalTool* GenericProfilerFactory::createTool(BaseInstance* instance, QOb
|
|||
{
|
||||
return new GenericProfiler(globalSettings, instance, parent);
|
||||
}
|
||||
#include "GenericProfiler.moc"
|
||||
#include "GenericProfiler.moc"
|
||||
|
|
|
|||
|
|
@ -47,4 +47,4 @@ class ChooseOfflineNameDialog final : public QDialog {
|
|||
private:
|
||||
Ui::ChooseOfflineNameDialog* ui;
|
||||
QRegularExpressionValidator* m_usernameValidator;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -181,4 +181,4 @@ void IconPickerDialog::openFolder()
|
|||
void IconPickerDialog::filterIcons(const QString& query)
|
||||
{
|
||||
proxyModel->setFilterFixedString(query);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -230,4 +230,4 @@ MinecraftAccountPtr MSALoginDialog::newAccount(QWidget* parent)
|
|||
return dlg.m_account;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -280,4 +280,4 @@ void BoxGeometry::scale(const QVector3D& vector)
|
|||
{
|
||||
m_matrix.scale(vector);
|
||||
}
|
||||
} // namespace opengl
|
||||
} // namespace opengl
|
||||
|
|
|
|||
|
|
@ -183,4 +183,4 @@ void Scene::setElytraVisible(bool elytraVisible)
|
|||
{
|
||||
m_elytraVisible = elytraVisible;
|
||||
}
|
||||
} // namespace opengl
|
||||
} // namespace opengl
|
||||
|
|
|
|||
|
|
@ -49,4 +49,4 @@ class Scene : protected QOpenGLFunctions {
|
|||
bool m_capeVisible = false;
|
||||
bool m_elytraVisible = false;
|
||||
};
|
||||
} // namespace opengl
|
||||
} // namespace opengl
|
||||
|
|
|
|||
|
|
@ -73,4 +73,4 @@ class GlobalDataPackPage : public QWidget, public BasePage {
|
|||
|
||||
MinecraftInstance* m_instance;
|
||||
DataPackPage* m_underlyingPage = nullptr;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -44,4 +44,4 @@ void ServerPingTask::executeTask()
|
|||
// Delete McResolver object when done
|
||||
connect(resolver, &McResolver::finished, [resolver]() { resolver->deleteLater(); });
|
||||
resolver->ping();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,4 +26,4 @@ class ModpackProviderBasePage : public BasePage {
|
|||
virtual void setSearchTerm(QString) = 0;
|
||||
/** Get the current term in the search bar. */
|
||||
virtual QString getSerachTerm() const = 0;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -214,4 +214,4 @@ QString ListModel::getUserPath()
|
|||
path = m_instances_path;
|
||||
return path;
|
||||
}
|
||||
} // namespace FTBImportAPP
|
||||
} // namespace FTBImportAPP
|
||||
|
|
|
|||
|
|
@ -67,4 +67,4 @@ class ListModel : public QAbstractListModel {
|
|||
ModpackList m_modpacks;
|
||||
const QString m_instances_path;
|
||||
};
|
||||
} // namespace FTBImportAPP
|
||||
} // namespace FTBImportAPP
|
||||
|
|
|
|||
|
|
@ -61,4 +61,4 @@ class CheckComboBox : public QComboBox {
|
|||
QString m_default_text;
|
||||
QString m_separator;
|
||||
bool m_containerMousePress = false;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -65,4 +65,4 @@ class JavaSettingsWidget : public QWidget {
|
|||
BaseInstance* m_instance;
|
||||
Ui::JavaSettingsWidget* m_ui;
|
||||
unique_qobject_ptr<JavaCommon::TestCheck> m_checker;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -69,4 +69,4 @@
|
|||
"macOS"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
|
|||
WriteRegStr ShCtx "Software\Classes\${APP_ID}" "" `${DESCRIPTION}`
|
||||
WriteRegStr ShCtx "Software\Classes\${APP_ID}\DefaultIcon" "" `${ICON}`
|
||||
; default open verb
|
||||
WriteRegStr ShCtx "Software\Classes\${APP_ID}\shell" "" "open"
|
||||
WriteRegStr ShCtx "Software\Classes\${APP_ID}\shell" "" "open"
|
||||
WriteRegStr ShCtx "Software\Classes\${APP_ID}\shell\open" "" `${COMMANDTEXT}`
|
||||
WriteRegStr ShCtx "Software\Classes\${APP_ID}\shell\open\command" "" `${COMMAND}`
|
||||
|
||||
|
|
@ -153,7 +153,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
|
|||
|
||||
!insertmacro APP_SETUP_Def `${DESCRIPTION}` `${ICON}` `${APP_ID}` `${APP_NAME}` `${APP_EXE}` `${COMMANDTEXT}` `${COMMAND}`
|
||||
|
||||
# Register "Default Programs"
|
||||
# Register "Default Programs"
|
||||
WriteRegStr ShCtx "Software\Classes\Applications\${APP_EXE}\Capabilities" "ApplicationDescription" `${DESCRIPTION}`
|
||||
WriteRegStr ShCtx "Software\RegisteredApplications" `${APP_NAME}` "Software\Classes\Applications\${APP_EXE}\Capabilities"
|
||||
|
||||
|
|
@ -231,7 +231,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
|
|||
${IfNot} ${Errors}
|
||||
DeleteRegKey ShCtx "Software\Classes\${APP_ID}\DefaultIcon"
|
||||
${EndIf}
|
||||
|
||||
|
||||
# Unregister "Open With"
|
||||
DeleteRegKey ShCtx "Software\Classes\Applications\${APP_EXE}"
|
||||
|
||||
|
|
@ -256,7 +256,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "@Launcher_VERSION_NAME4@
|
|||
!macro APP_TEARDOWN_DEFAULT APP_ID APP_NAME APP_EXE
|
||||
|
||||
!insertmacro APP_TEARDOWN_Def `${APP_ID}` `${APP_NAME}` `${APP_EXE}`
|
||||
|
||||
|
||||
# Unregister "Default Programs"
|
||||
DeleteRegValue ShCtx "Software\RegisteredApplications" `${APP_NAME}`
|
||||
DeleteRegKey ShCtx "Software\Classes\Applications\${APP_EXE}\Capabilities"
|
||||
|
|
@ -303,27 +303,27 @@ Function RunUninstall
|
|||
StrCpy $2 $1 1 ; take first char of string
|
||||
StrCmp $2 '"' quoteloop stringloop
|
||||
stringloop: ; get string length
|
||||
StrCpy $2 $1 1 $3 ; get next char
|
||||
IntOp $3 $3 + 1 ; index += 1
|
||||
StrCmp $2 "" +2 stringloop ; if empty exit loop
|
||||
IntOp $3 $3 - 1 ; index -= 1
|
||||
Goto run
|
||||
StrCpy $2 $1 1 $3 ; get next char
|
||||
IntOp $3 $3 + 1 ; index += 1
|
||||
StrCmp $2 "" +2 stringloop ; if empty exit loop
|
||||
IntOp $3 $3 - 1 ; index -= 1
|
||||
Goto run
|
||||
quoteloop: ; get string length with quotes removed
|
||||
StrCmp $3 "" 0 +2 ; if index is set skip quote removal
|
||||
StrCpy $1 $1 "" 1 ; Remove initial quote
|
||||
IntOp $3 $3 + 1 ; index += 1
|
||||
StrCpy $2 $1 1 $3 ; get next char
|
||||
StrCmp $2 "" +2 ; if empty exit loop
|
||||
StrCmp $2 '"' 0 quoteloop ; if ending quote exit loop, else loop
|
||||
StrCmp $3 "" 0 +2 ; if index is set skip quote removal
|
||||
StrCpy $1 $1 "" 1 ; Remove initial quote
|
||||
IntOp $3 $3 + 1 ; index += 1
|
||||
StrCpy $2 $1 1 $3 ; get next char
|
||||
StrCmp $2 "" +2 ; if empty exit loop
|
||||
StrCmp $2 '"' 0 quoteloop ; if ending quote exit loop, else loop
|
||||
run:
|
||||
StrCpy $2 $1 $3 ; Path to uninstaller ; (copy string up to ending quote - if it exists)
|
||||
StrCpy $1 161 ; ERROR_BAD_PATHNAME ; set exit code (it get's overwritten with uninstaller exit code if ExecWait call doesn't error)
|
||||
GetFullPathName $3 "$2\.." ; $InstDir
|
||||
IfFileExists "$2" 0 +4
|
||||
ExecWait $4 $1 ; The file exists, call the saved command
|
||||
IntCmp $1 0 "" +2 +2 ; Don't delete the installer if it was aborted ;
|
||||
Delete "$2" ; Delete the uninstaller
|
||||
RMDir "$3" ; Try to delete $InstDir
|
||||
StrCpy $2 $1 $3 ; Path to uninstaller ; (copy string up to ending quote - if it exists)
|
||||
StrCpy $1 161 ; ERROR_BAD_PATHNAME ; set exit code (it get's overwritten with uninstaller exit code if ExecWait call doesn't error)
|
||||
GetFullPathName $3 "$2\.." ; $InstDir
|
||||
IfFileExists "$2" 0 +4
|
||||
ExecWait $4 $1 ; The file exists, call the saved command
|
||||
IntCmp $1 0 "" +2 +2 ; Don't delete the installer if it was aborted ;
|
||||
Delete "$2" ; Delete the uninstaller
|
||||
RMDir "$3" ; Try to delete $InstDir
|
||||
Pop $4
|
||||
Pop $3
|
||||
Pop $2
|
||||
|
|
@ -337,13 +337,13 @@ Section "" UninstallPrevious
|
|||
${If} $0 == ""
|
||||
ReadRegStr $0 HKCU "${UNINST_KEY}" "UninstallString"
|
||||
${EndIf}
|
||||
|
||||
|
||||
${If} $0 != ""
|
||||
!insertmacro RunUninstall $0 $0
|
||||
${If} $0 <> 0
|
||||
MessageBox MB_YESNO|MB_ICONSTOP "Failed to uninstall, continue anyway?" /SD IDYES IDYES +2
|
||||
Abort
|
||||
${EndIf}
|
||||
!insertmacro RunUninstall $0 $0
|
||||
${If} $0 <> 0
|
||||
MessageBox MB_YESNO|MB_ICONSTOP "Failed to uninstall, continue anyway?" /SD IDYES IDYES +2
|
||||
Abort
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
|
||||
SectionEnd
|
||||
|
|
@ -447,7 +447,7 @@ SectionEnd
|
|||
Section /o "Shell Association (Open-With dialog)" SHELL_ASSOC
|
||||
|
||||
!insertmacro APP_SETUP `${APPDESCRIPTION}` `${APPICON}` `${APPID}` `${APPCMDTEXT}` `${APPEXE}` `${APPCMDTEXT}` '$INSTDIR\${APPEXE} -I "%1"'
|
||||
|
||||
|
||||
!insertmacro APP_ASSOCIATE_DEFAULT ".mrpack" `${APPID}` `${APPEXE}` true
|
||||
!insertmacro APP_ASSOCIATE ".zip" `${APPID}` `${APPEXE}` false
|
||||
|
||||
|
|
@ -489,7 +489,7 @@ Section "Uninstall"
|
|||
SectionEnd
|
||||
|
||||
Section -un.ShellAssoc
|
||||
|
||||
|
||||
!insertmacro APP_TEARDOWN_DEFAULT `${APPID}` `${APPNAME}` `${APPEXE}`
|
||||
|
||||
!insertmacro APP_UNASSOCIATE ".zip" `${APPID}` `${APPEXE}`
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
## If current working dirctory is ./scripts, ask to invoke from one directory up
|
||||
if [ ! -d "scripts" ]; then
|
||||
echo "Please run this script from the root directory of the project"
|
||||
exit 1
|
||||
echo "Please run this script from the root directory of the project"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
find . -type f -name '*.png' -not -path '*/libraries/*' -exec oxipng --opt max --strip all --alpha --interlace 0 {} \;
|
||||
|
|
|
|||
Loading…
Reference in a new issue