Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,745 Commits 1 Branch 19 Tags 35 MiB
91c7a700a9
Commit Graph

1253 Commits

Author SHA1 Message Date
flow
06019f01e3
feat: add dialog to ask whether to chaneg instance's name 
This prevents custom names from being lost when updating, by only
changing the name if the old instance name constains the old version,
so that we can update it if the user whishes to.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
ddde885084
fix: show warning in case there's no old index when updating 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
be8c6f218c
refactor: setAbortStatus -> setAbortable 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
9eb35ea7c8
fix: don't load specific settings for managed pack info 
This avoids loading all settings for all instances when searching for
one with a specific managed pack name.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:10 -03:00
flow
d2fdbec41d
fix: move file deletion to the end of the instance update 
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.

Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.

What a long commit message o.O

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
2dd372600c
fix: some abort-related issues 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
eda6cf11ef
feat(ui): improve info dialog before updating an instance 
Adds a 'Cancel' option, and add a note about doing a backup before
updating.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
68facd6b93
fix(ui): hook up abort status signal in ProgressDialog 
Now we have a visual indication on when tasks are abortable!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
87002fb8f8
fix: hook up setAbortStatus in instance import tasks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
6a50fa35ec
feat: add canAbort() status change in Task 
By now, it's a recurring pattern of wanting to restrict aborting in
certain situations. This avoids further code duplication, and adds a
signal that external users can hook up to to respond to such change.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
6541570969
fix: simplify abort handling and add missing emits 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
4b0ceea894
fix: correctly set managed pack fields in CF pack 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:09 -03:00
flow
8c0816c166
feat: add override awareness to CF modpack updating 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
be769d07f1
fix: correctly set all managed pack fields in Modrinth pack 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
3a9d58e31c
feat: add override handling in modrinth pack update 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
7024acac06
feat: add override helper functions 
These help us keep track of relevant metadata information about
overrides, so that we know what they are when we update a pack.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
6131346e2f
refactor: change the way instance names are handled 
While working on pack updating, instance naming always gets in the way,
since we need both way of respecting the user's name choice, and a
standarized way of getting the original pack name / version.

This tries to circunvent such problems by abstracting away the naming
schema into it's own struct, holding both the original name / version,
and the user-defined name, so that everyone can be happy and world peace
can be achieved! (at least that's what i'd hope :c).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
eed73c9078
refactor: clean up InstanceImportTask a bit 
Also removes a divide by two in the download progress
(why was it there???)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
795d6f35ee
feat: add curseforge modpack updating 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
ebd46705d5
refactor: move creation of CF file download task to a separate function 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:08 -03:00
flow
72d2ca234e
refactor: move flame modpack import to separate file 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:07 -03:00
flow
2246c3359b
refactor: add throw_on_blocked arg to Flame file parse 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:07 -03:00
flow
242fb156a2
feat: add 'getFiles' by fileIds route in Flame API 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:07 -03:00
flow
208ed73e59
feat: add early modrinth pack updating 
Still some FIXMEs and TODOs to consider, but the general thing is here!

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:36:06 -03:00
flow
4441b37338
refactor: move modrinth modpack import to separate file 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:32:36 -03:00
flow
941d75824a
refactor: add instance creation abstraction and move vanilla 
This is so that 1. Code is more cleanly separated, and 2. Allows to more
easily add instance updating :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:32:36 -03:00
flow
ec9ddc4f22
chore: add helper function for copying managed pack data between insts. 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-20 18:32:36 -03:00
Sefa Eyeoglu
98b6f90172
fix: add more legacy architectures 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
7e280de361
refactor: drop 64-bit check 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
7bd8bd13fe
feat: support multiarch system classifiers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 16:01:06 +02:00
Sefa Eyeoglu
09e85e948c
refactor: introduce RuntimeContext 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 15:59:43 +02:00
Sefa Eyeoglu
9ec1c00887
fix: register JavaRealArchitecture for MinecraftInstance 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 15:58:56 +02:00
Sefa Eyeoglu
a24d589845
fix: ensure all resource folders exist 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:39:05 +02:00
Sefa Eyeoglu
ebbcc9f6da
fix: actually render color codes for texture packs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
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
Sefa Eyeoglu
aad6f74db6
fix: tests 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
07dcefabcb
feat: add texture pack parsing 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 10:26:15 +02:00
txtsd
40c68595d7
Merge pull request #1150 from flowln/fix_crash_on_game_quit 2022-09-20 09:41:59 +05:30
txtsd
fe9a4fece4
Merge pull request #1142 from flowln/better_fs 2022-09-20 09:00:19 +05:30
flow
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
flow
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
flow
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
flow
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
flow
81e326571b
fix: enable demo launch only on supported instances 
e.g. >= 1.3.1 instances

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 19:27:42 -03:00
flow
1b2a7de4e2 fix: show 'demo' instead of 'offline' in log when in demo mode 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 18:44:18 -03:00
flow
11216d200c change: move demo action to "Play offline" menu 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 18:44:18 -03:00
jopejoe1
777be6a48d Add 'Ctrl+Alt+O' Shortcut to launch demo instance. 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-09-15 18:44:18 -03:00
jopejoe1
29dcb9d274 Added Launch Demo button. 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-09-15 18:44:18 -03:00
Sefa Eyeoglu
1ca2be0039
Merge pull request #982 from DavidoTek/windarkmode2 2022-09-14 13:17:17 +02:00
flow
ee0fb2d0e0
fix: use std::wstring for Windows filenames 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:24 -03:00
flow
c496ad1237
chore: make DirNameFromString add normal duplicate identifier 
Wrap the number in parenthesis to be similar to other software.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:24 -03:00
flow
277fa21f5f
refactor: remove Win32 'crap' in FileSystem 
We should use std::filesystem symlink and hardlink functions instead.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:23 -03:00
flow
1cf949226e
refactor: use std::filesystem for overrides 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:23 -03:00
flow
be3fae6511
refactor: use std::filesystem for path deletion 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:23 -03:00
flow
5932f36285
refactor: use std::filesystem for file copy 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-12 13:07:23 -03:00
flow
30abb65368
Merge pull request #1133 from Scrumplex/refactor-tests 
Move tests to a separate folder, to fix issues and improve maintenance
 2022-09-12 12:57:55 -03:00
Sefa Eyeoglu
4c7d3a103c
refactor: restructure tests 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-11 22:29:01 +02:00
flow
a091245793
fix: emit signals when aborting NetJob 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-10 09:10:16 -03:00
flow
7cf2c3be0f
fix: start at least one task in ConcurrentTask 
This allows us to emit all the necessary stuff when we're finished in
the case of starting a task with no subtasks. In particular, this caused
the mod updater to not work properly :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-07 12:11:42 -03:00
flow
f65d506f26
Merge pull request #997 from flowln/fix_major_version_filter 2022-09-07 10:34:50 -03:00
flow
333dbca01e
Merge pull request #1105 from flowln/better_resource_packs 
Add basic resource pack parsing and fix issues
 2022-09-07 08:30:36 -03:00
flow
42eb265624
refactor: create mod pages and filter widget by factory methods 
This takes most expensive operations out of the constructors.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-07 08:29:58 -03:00
flow
8a65726e9d
fix: use more robust method of finding matches for major version 
This uses the proper version list to find all MC versions matching the
major number (_don't say anything about SemVer_ 🔫).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-07 08:27:53 -03:00
flow
1b0ca47682
Merge pull request #939 from flowln/mod_downloader_improve 
Some more UI / UX improvements to the mod downloader!
 2022-09-07 08:27:11 -03:00
flow
8e3f5c3305
Merge pull request #966 from flowln/refactor_tasks 
Reduce code duplication in tasks, fix some bugs and add some tests
 2022-09-07 08:26:28 -03:00
timoreo
4817f0312d
Fixed up a warning 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-09-06 14:32:19 +02:00
Sefa Eyeoglu
b70a82c609
Merge pull request #1111 from PolyMC/revert-1067-classpath-epicness 2022-09-05 20:06:33 +02:00
Sefa Eyeoglu
25d1e0c4e6
Merge pull request #1107 from DioEgizio/smaller-about 2022-09-05 17:52:16 +02:00
Sefa Eyeoglu
8e3356f11a
Merge pull request #1034 from Scrumplex/detect-performance-features 2022-09-05 17:45:17 +02:00
Sefa Eyeoglu
1b559c7776
Revert "Move classpath definition into NewLaunch itself" 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-05 17:37:10 +02:00
DioEgizio
d5583f0f02 make the about dialog smaller 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-09-04 14:32:33 +02:00
flow
bedd3c50b6
fix: improve handling of unrecognized pack formats 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 15:05:23 -03:00
flow
43a7af3f44
fix: removing mods with their metadata as well 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:23 -03:00
flow
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
flow
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
flow
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
flow
0331f5a1eb
feat(tests): add tests for resource pack parsing 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:22 -03:00
flow
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
flow
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
flow
dd9e30b24a
feat: add resource icon to InfoFrame 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
6a93688b2e
fix: filtering in regex search in resource packs 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
3ab17a97a8
fix: sorting by pack format 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
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
flow
afa1a5e932
feat: modify InfoFrame and ResourcePackPage to show ResourcePack info 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-03 13:37:21 -03:00
flow
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
flow
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
Sefa Eyeoglu
2f167b1512
Merge pull request #1095 from flowln/ensure_file_path_in_override 2022-09-01 09:54:22 +02:00
flow
ba3ac85356
Merge pull request #1067 from Scrumplex/classpath-epicness 
Move classpath definition into NewLaunch itself
 2022-08-31 18:28:29 -03:00
flow
ec29cedeb7
Merge pull request #1080 from flowln/eternal_cache 
Never invalidate libraries cache entries by time elapsed
 2022-08-31 18:28:07 -03:00
flow
064ae49d2b
fix: make MultipleOptionsTask inherit directly from SequentialTask 
It's not a good idea to have multiple concurrent tasks running on a
sequential thing like this one.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:02 -03:00
flow
247f99ce2f
feat(test): add more tests to Tasks 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
7b6d269904
refactor: make NetJob inherit from ConcurrentTask as well! 
Avoids lots of code duplication

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
87a0482b8b
refactor: make MultipleOptionsTask inherit from ConcurrentTask too 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
e899699918
refactor: make SequentialTask inherit from ConcurrentTask 
In a way, sequential tasks are just concurrent tasks with only a single
task running concurrently, so we can remove LOTS of duplicated logic :)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
bdf464e792
fix: abort logic running subsequent tasks anyways some times 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
c410bb4ecb
fix: 'succeeded while not running' spam in ConcurrentTask 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
a720bcc637
fix: bogus progress update when the total step progress was zero 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:01 -03:00
flow
369a8cdc74
fix: only try to start tasks that are really there 
This fixes an annoying issue where concurrent tasks would try to start
multiple tasks even when there was not that many tasks to run in the
first place, causing some amount of log spam.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:29:00 -03:00
flow
3f4e55be4f
fix: ensure destination file paths exist when overriding folders 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 16:28:23 -03:00
flow
2186b134a4
fix: Mod type enum -> Resource type enum 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-28 14:47:52 -03:00