d55f47077a
Merge pull request #626 from leo78913/mods-provider-column
...
closes https://github.com/PrismLauncher/PrismLauncher/issues/402
2022-12-30 11:39:03 -03:00
257970c27d
refactor(Mods): make provider() return a std::optional
...
This makes it easier to check if a mod has a provider or not, without
having to do a string comparison.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-29 13:21:49 -03:00
6ea1234a3b
Merge pull request #618 from TheKodeToad/safer-destructive-actions
...
Fixes https://github.com/PolyMC/PolyMC/issues/948
2022-12-26 17:48:43 +01:00
aa3633d2d7
fix: translate unknown mod provider
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-16 11:13:54 -03:00
c440f33122
fix(ResourceModel): use a single ConcurrentTask for parsing tasks
...
This avoids creating a bunch of threads that fills up the maximum amount
allowed by QThreadPool, and causes a deadlock between the helper threads
and the main thread (main thread tries to create threads in painting
code, but isn't able to, so it keeps waiting for a thread to free up,
but all the threads are waiting on the main thread to process some
events).
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-12-15 13:51:07 -03:00
4ee29b388d
feat: add a provider column to the mods page
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-12-15 12:02:08 -03:00
127b094c41
Improve handling of destructive actions
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2022-12-14 15:20:42 +00:00
5622bcc563
Merge pull request #461 from flowln/fix_big_resource_pack_imgs
...
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/360
2022-12-11 04:16:21 -08:00
8cac61f0be
fix: check resource pack validity solely using pack format
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-27 18:41:52 +01:00
f55fc51e9b
fix: remove commented-out assertions
...
They may not hold true at all times, and that's fine.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-20 11:11:08 -03:00
df0f9259c0
refactor: move RP/TP validation to their respective utils
...
This makes it easier to validate individual resources, and allows the
logic to be used in other places in the future, if we need to.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-20 11:10:26 -03:00
1f6b8f9d2b
fix instance IDs and resource pack imports
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:59:30 +08:00
a33b804923
fix: add resource pack format for 1.19.3
...
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:47:47 +08:00
f527958cb3
fix: check if packFormat is valid for resourcepack parsing
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:42:56 +08:00
b1bdc6f745
fix resource packs and add support for texture packs
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-11-19 23:38:05 +08:00
c4c1e75de8
fix: use QPixmapCache only from the main thread
...
It's a required condition.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-15 18:14:03 -03:00
7705f290ca
fix: don't retry to load RP images that can't fit in the cache
...
Avoids an infinite loop when the image is too big.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-15 12:07:11 -03:00
cedc7754d9
Merge pull request #428 from DioEgizio/fixes-to-CI
2022-11-14 14:16:01 -08:00
aef5349aee
Pass index.parent() as parent parameter for rowCount
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:57 +00:00
ac993aa31f
Use Q_UNUSED instead of [[maybe_unused]] in onParseFailed
...
Qt5 on Ubuntu cannot handle [[maybe_unused]] in this function
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:57 +00:00
fce323b945
Check parent in rowCount/columnCount/canFetchMore
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:57 +00:00
08f8623cb7
Mark paramaters of onParseFailed as unused
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-11-14 19:05:56 +00:00
0a04c3a2a7
fix: Fix the error that CodeQL caught
...
Signed-off-by: txtsd <code@ihavea.quest >
2022-11-13 18:54:55 +01:00
76050880f1
fix: use unicode variant for marking '.index' hidden
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-11-04 16:53:21 -03:00
ed261f0af9
Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp
...
Co-authored-by: flow <flowlnlnln@gmail.com >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2022-09-25 20:38:55 +03:00
600c49f7f0
Replaced tomlc99 with tomlplusplus
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2022-09-24 00:10:27 +03:00
a24d589845
fix: ensure all resource folders exist
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:39:05 +02:00
23fc453fae
fix: comments and naming of texture pack stuff
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:26:15 +02:00
aad6f74db6
fix: tests
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:26:15 +02:00
07dcefabcb
feat: add texture pack parsing
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-20 10:26:15 +02:00
0873b8d304
fix: prevent container detaching in ResourceFolderModel
...
and use const accessors whenever we can!
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-16 20:12:31 -03:00
c9eb584ac8
fix: prevent deletes by shared pointer accidental creation
...
This fixes the launcher crashing when opening the game :iea:
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-16 20:12:30 -03:00
10493bd44a
fix: move newly allocated resources to the main thread
...
This avoids them getting deleted when the worker thread exits, due to
thread affinity on the created thread.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-16 20:12:30 -03:00
9e35230467
fix: memory leak when getting mods from the mods folder
...
friendly reminder to always delete your news.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-16 20:12:30 -03:00
4c7d3a103c
refactor: restructure tests
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-09-11 22:29:01 +02:00
bedd3c50b6
fix: improve handling of unrecognized pack formats
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 15:05:23 -03:00
9db27c6acc
fix: crash when adding resource packs directly in the folder
...
This fixes an issue in which, when adding a new resource pack externally
to PolyMC, when the resource pack view was open, would crash poly.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
42c81395b3
fix: race condition on ResourceFolderModel tests
...
This (hopefully) fixes the race contiditions that sometimes got
triggered in tests.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
3b13e692d2
feat: move resource pack images to QPixmapCache
...
This takes care of evicting entries when the cache gets too big for us,
so we can add new entries without much worries.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
0331f5a1eb
feat(tests): add tests for resource pack parsing
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
8a7e117f6b
refactor: move resource pack file parsing utilities to separate namespace
...
This makes it easier to use that logic in other contexts.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
9b984cedac
feat: add image from pack.png to resource packs
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:22 -03:00
6a93688b2e
fix: filtering in regex search in resource packs
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
3ab17a97a8
fix: sorting by pack format
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
f21ae66265
feat: add basic resource pack parsing of pack.mcmeta
...
This parses the pack format ID and the description from the local file,
from both a ZIP and a folder, and hooks it into the model.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
050768c266
feat: add more resource pack info
...
Adds pack format id and description to ResourcePack, that'll be parsed
from pack.mcmeta.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:21 -03:00
cda2bfc240
feat: allow specifying factory for resources in BasicFolderLoadTask
...
This allows us to hook our own resource type, that possibly has more
content than the base Resource, to it.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-09-03 13:37:20 -03:00
0b81b283bf
fix: LGTM warnings
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:49:56 -03:00
e2ab2aea32
change: add enable/disable to resources
...
TIL that zip resource packs, when disabled, actually have the effect of
not showing up in the game at all. Since this can be useful to someone,
I moved the logic for it to the resources.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:49:54 -03:00
c3ceefbafb
refactor+fix: add new tests for Resource models and fix issues
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-08-20 10:49:23 -03:00
