ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
7,657 Commits 4 Branches 5 Tags 40 MiB
09c2c6793b
Commit Graph

254 Commits

Author SHA1 Message Date
Trial97
b2fdd83594
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 19:09:10 +03:00
Trial97
5981e7815a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task 2023-08-05 19:06:01 +03:00
Trial97
939a2d67ed
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 18:21:09 +03:00
Sefa Eyeoglu
304e294ea7
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class 2023-08-04 20:31:43 +02:00
Sefa Eyeoglu
ae793f6cf1
Merge pull request #1459 from Scrumplex/format 2023-08-04 19:42:36 +02:00
Sefa Eyeoglu
1d638e018a
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-04 19:41:47 +02:00
Sefa Eyeoglu
1d468ac35a
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:35 +02:00
Rachel Powers
2d1197f59f
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-31 22:26:20 -07:00
Trial97
62aa7a52c4
fiexed conflicts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-27 00:07:38 +03:00
Trial97
3c472fd7e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 2023-07-27 00:05:59 +03:00
seth
af59c41713
fix: typo in task.h 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 16:20:30 -04:00
Trial97
64041a84a2
handle file removal in ExportToZipTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 16:55:26 +03:00
Trial97
78ee63af38
simplify modrinth export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 16:40:01 +03:00
Trial97
a7e0c9db96
connected failed event for some tasks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-15 12:01:07 +03:00
Trial97
db9f5f44e0
Split in two the options 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 22:26:22 +03:00
Trial97
cebb4dd17a
made the number of concurrent tasks configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 20:39:53 +03:00
Rachel Powers
520594e529
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-13 20:05:16 -07:00
TheKodeToad
9aedb5afff
Merge pull request #1334 from TheKodeToad/litemod-dl 
LiteMod downloading
 2023-07-10 16:42:38 +01:00
TheKodeToad
91c9082d19
Merge pull request #1249 from Trial97/curse 
Curseforge modpack export
 2023-07-10 14:20:29 +01:00
TheKodeToad
6e2fcc9e11 Replace string manipulation in favour of QFileInfo 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-09 12:08:15 +01:00
TheKodeToad
d53d58a5d4 LiteMod downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 22:16:43 +01:00
TheKodeToad
8ae67b84db Optional mods in mrpack export 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-06 20:04:26 +01:00
Trial97
5f63c781b4
resolved local vaiables names 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 18:50:29 +03:00
Rachel Powers
8d7dcdfc5b
chore: fix shadowed member and signed/unsigned mismatch 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: supress unused with [[maybe_unused]]

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: unshadow ^&^& static_cast implicit return

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: deshadow and mark unused in parse task

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: mark unused in folder models

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: deshadow and mark unused with instances

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: more deshadow and unused

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: remove uneeded simicolons

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: mark unused

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: prevent shadow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 23:39:38 -07:00
Rachel Powers
98d6904e4a
chore: fix propagate mispelling 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:12 -07:00
Trial97
5f1074471d
Corected variable name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 13:35:42 +03:00
Trial97
c04cee7ff7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 13:21:00 +03:00
Rachel Powers
df4fd7df7f
Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class 2023-06-25 12:43:48 -07:00
Rachel Powers
c8ff812ab8
feat(net): ApiUpload ^& fix unfired finished signals 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 12:02:46 -07:00
Rachel Powers
9c10965997
refactor: split out setting api headers for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:25 -07:00
Trial97
564e394ec8
feat:Update mods now fills missing dependencies 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 21:48:12 +03:00
Trial97
81c1a95166
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 20:04:56 +03:00
Trial97
7fdd68d768
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-24 15:58:55 +03:00
Trial97
19cb6ad588
Updated Modrinth esport messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:04:18 +03:00
James Beddek
20ba6e5fb5
modrinth: use encoded url when exporting pack 
Ensures that necessary url components such as spaces are encoded.
Prevents an error when submitting the resulting file to modrinth.

See https://discord.com/channels/734077874708938864/1120070731242410024

Fixes: #1226
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-24 15:42:58 +12:00
Trial97
69c709b05a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 20:01:17 +03:00
Trial97
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-23 14:38:30 +03:00
Trial97
67db141203
Renamed getResults to resultsReady 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 14:38:23 +03:00
James Beddek
009623823d
Modrinth: use default icon for non-managed packs 
Fixes: #317
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 23:00:13 +12:00
Trial97
6fd729e285
Fixed regresion regarding modrinth project_id in dependence array 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 17:42:16 +03:00
Trial97
1bdde1f947
Small fixes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 00:36:37 +03:00
Trial97
0161520b33
Fixed leaks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-18 23:27:26 +03:00
Trial97
147366bc0a
Made ByteSynkArray to use shared_ptr 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 22:59:41 +03:00
Trial97
182e19eae3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-15 10:35:26 +03:00
TheKodeToad
f4a814b5e6
Remove unnecessary code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-12 15:46:15 +01:00
TheKodeToad
94ddc8bbf7
Could this work? 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-12 14:14:50 +01:00
Rachel Powers
3dccc38f42
Merge pull request #904 from TheKodeToad/mrpack-export 
mrpack export
 2023-06-04 19:01:50 -07:00
TheKodeToad
3c87e5d31e Make mcInstance mutable 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:48:15 +01:00
Alexandru Ionut Tripon
1840505a0f
Fix crash when selecting same mod from different providers (#1029) 2023-06-02 18:04:06 -03:00
Trial97
737fc1a2a4
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:01:39 +03:00
Trial97
27c3775f99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 17:44:23 +03:00
TheKodeToad
86974b046e
Clarify comment 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-28 11:48:09 +01:00
Rachel Powers
2680dba0aa fix: use <= when compareing release types 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 17:16:50 -07:00
Rachel Powers
cf4df19986 feat: display release type 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 16:23:43 -07:00
Rachel Powers
c156034069 feat: add verion_type / release_type to IndexedVersion 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-26 13:50:22 -07:00
Trial97
ffcc58cb3e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-14 14:20:24 +03:00
Kode
f60562c5a2
Merge branch 'develop' into mrpack-export 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-13 19:07:03 +01:00
TheKodeToad
129e959a3b Move setAbortable(true) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:28:51 +01:00
TheKodeToad
e1b6020b76 Make some changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-13 18:24:01 +01:00
Kode
5b8d025440
ty! 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-12 14:43:55 +01:00
TheKodeToad
e0380960fd Change to use future 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-02 14:23:31 +01:00
Rachel Powers
b6452215c1 feat: add details signal to Task 
feat: add details to mod pack downloading
feat: add logging rule sloading form `ligging.ini at data path root
feat: add `launcher.task` `launcher.task.net` and `launcher.task.net.[down|up]load` logging categories
fix: add new subtask progress to the end of the lay out not the beginning (cuts down on flickering)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:47:50 -07:00
Rachel Powers
9d2f0e4dc8 feat: Propogated subtask progress 
Oh boy this is big.

> TaskStepProgress struct is now QMetaObject compatabile and can be sent through signals
> Task now has a method to propogates sub task progress it must be signal bound by each task containing a task wishing to report progress of it's children.
> Downloads report speed
> Tasks now have UUIDS to track them
  - use when reporting
  - use when logging
  - use when storeing them or objects related to them

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:47:20 -07:00
Trial97
42bc91463e
Updated links 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 20:37:17 +03:00
Trial97
b4fa6e120a
Fixed tipo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
fac33498db
Made some copy by reference 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
7bd26ce468
Semi fixed the Modrinth dependency implementation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Trial97
4fe497cd68
First working version with curseforge mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
Trial97
5655a33515
Added Dependency API 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:05 +03:00
TheKodeToad
709736d3f9 Make response const 
I don't think the segfault fix was ideal :P
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-18 09:28:10 +01:00
TheKodeToad
2e9403a324 This was moved 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 13:19:59 +01:00
TheKodeToad
ba17efa381 Smol fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 13:18:25 +01:00
TheKodeToad
b8e0c8ebc6 Boring changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-17 10:16:03 +01:00
Trial97
6d5c629b43
Added dependencies to the APIs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-10 00:04:35 +03:00
Kode
3a7961834a
Remove seek 
Don't need it if the data is already in a byte array.

Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-04-09 21:28:40 +01:00
TheKodeToad
813ccc1381 How did i- 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-07 11:03:11 +01:00
TheKodeToad
b65f4c9536 Better collectFileListRecursively error 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:59:24 +01:00
TheKodeToad
012d8bb468 Revert concurrent syntax 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:58:09 +01:00
TheKodeToad
d7a137ad13 Remove more prototype not good code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:24:19 +01:00
TheKodeToad
073aaf9b3b Remove "prototype" field 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:19:41 +01:00
TheKodeToad
871d647c93 Use local metadata 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-04-06 19:18:36 +01:00
TheKodeToad
e42050cc8a Skip lookup if no files and fail if zipping fails 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-28 14:22:28 +01:00
TheKodeToad
46f448dfba Improve invokeMethod syntax 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-19 21:26:25 +00:00
TheKodeToad
710156b9f1 Replace native file separator - this was accidentally brought to my attention on Modrinth's guild 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-19 21:25:12 +00:00
TheKodeToad
8837f06e4e Only add summary if not empty 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 14:01:41 +00:00
TheKodeToad
ddca838e46 Info and error dialogs 
TODO: is there a better approach?

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 12:24:18 +00:00
TheKodeToad
5d5fcae501 Further reduce buggy behaviour 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-06 17:24:04 +00:00
TheKodeToad
970ec8187c More refactoring 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-05 18:25:57 +00:00
TheKodeToad
87384182a1 Fix abort? 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 11:07:07 +00:00
TheKodeToad
f583e617ec Implement abort (possible broken?) and therefore make it work without crashing! 
The shared pointer was going out of scope 🤦.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 10:37:56 +00:00
TheKodeToad
a2716f5cf6 Improve code 
Even more broken now (it is stuck loading forever)!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 10:24:25 +00:00
TheKodeToad
2343aad088 Make it work! (TODO make it not crash) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-03 15:00:07 +00:00
TheKodeToad
dcaa907fed Mod loader support 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-03 11:25:11 +00:00
TheKodeToad
adcdf28d64 Move task to another thread 
I don't know whether this is the prefered method.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-03 11:24:36 +00:00
TheKodeToad
6505b0c065 Move logic to task 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 19:48:41 +00:00
flow
b724607e31
feat(RD): add shader pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
flow
c3ea303a37
feat(RD): add resource pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:52 -03:00
flow
435273e08a
fix(Inst.Import): don't allow bad file path in mrpack import 
This checks the URL of the path of the file to be downloaded,
ensuring that it always contains the root .minecraft target folder,
following the warning in the mrpack documentation.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-02 17:11:24 -03:00
flow
29f7ea752f
refactor: make shared_qobject_ptr ctor explicit 
This turns issues like creating two shared ptrs from a single raw ptr
from popping up at runtime, instead making them a compile error.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-25 16:57:51 -03:00
Sefa Eyeoglu
6e841a3b7e
Merge branch 'develop' into remove-updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-24 14:40:17 +01:00