5357 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	c6bcb6228b	Merge pull request #1108 from Scrumplex/better_texture_packs	2022-09-20 13:28:33 +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
Sefa Eyeoglu	098327f128	Merge pull request #903 from jopejoe1/demo-launch	2022-09-18 14:41:25 +02:00
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
flow	5765a1fdf1	fix: allow demo for older versions ... We were not propagating the '--demo' flag in the legacy launcher, unconditionally setting the 'demo' parameter to false. Signed-off-by: flow <flowlnlnln@gmail.com>	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
flow	8674ac4f68	Merge pull request #1146 from Scrumplex/fix-launch-rd	2022-09-15 17:55:08 -03:00
Sefa Eyeoglu	684b8f24f3	fix: allow starting rd- versions ... Using `Collections.emptyList()` doesn't allow us to later append stuff into that list. Use an empty `ArrayList` instead. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>	2022-09-15 09:29:48 +02:00
Sefa Eyeoglu	1ca2be0039	Merge pull request #982 from DavidoTek/windarkmode2	2022-09-14 13:17:17 +02:00
flow	8c41ff68f7	chore(actions)!: bump macOS required version to 10.15 ... This is needed for std::filesystem support in macOS's libc. Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-12 18:41:13 -03:00
flow	931d6c280a	chore(tests): add test for copy operation with blacklist ... I almost 💀 because no tests used this x.x Signed-off-by: flow <flowlnlnln@gmail.com>	2022-09-12 13:12:55 -03: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