0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,305 Commits 1 Branch 0 Tags 29 MiB
f74e3db804
Commit Graph

339 Commits

Author SHA1 Message Date
Petr Mrázek
f259e9f727 NOISSUE update copyright dates 2018-02-11 00:40:01 +01:00
Petr Mrázek
38e669dbf5 NOISSUE change FS::updateTimestamp to work with directories too, use it to fix icon issues on macOS 2018-02-11 00:35:56 +01:00
Petr Mrázek
2dac9d02d8 GH-2134 fix model selection when uploading a skin 2018-02-10 11:54:59 +01:00
Petr Mrázek
b3fb437f8e NOISSUE When changing version of or installing a package, remove customized version 2018-02-09 00:54:17 +01:00
Petr Mrázek
f115bdf5b8 NOISSUE make visualvm work with relative paths (inside the MultiMC folder) 2018-02-06 01:51:22 +01:00
Petr Mrázek
088e8e0eff NOISSUE remove unneeded URL fixing code and fix up the exception thrown by invalid Flame URLs 2018-01-29 00:47:18 +01:00
Petr Mrázek
cd55674b36 NOISSUE do not install .a files for shared libraries on Windows 2018-01-27 02:42:27 +01:00
Petr Mrázek
166e5a03d6 NOISSUE rearrange build system 
* Added install commands to the libraries instead of force installing files
* Most of the application cmake stuff moved to top level
* RPATH should now be set/cleared correctly
* Contains a fix for GH-1780
 2018-01-27 02:00:20 +01:00
Petr Mrázek
0c2e2094ee NOISSUE clean up download redirects and handle their errors as fatal 2018-01-22 03:09:00 +01:00
Petr Mrázek
c33b4e252f NOISSUE fix bad redirect URLs provided by the curse CDN 
MultiMC now parses the HTTP Location header in a (more) tolerant mode.
 2018-01-21 03:49:54 +01:00
Petr Mrázek
1dbc4e16f7 NOISSUE remove the jar-modded jar after the instance finishes 2018-01-08 00:59:47 +01:00
Petr Mrázek
0636c03d7c GH-2087 remove the revert to vanilla functionality, add file download button to version page 2018-01-05 04:26:46 +01:00
Petr Mrázek
9510a1bbf2 NOISSUE stop logging process environment and MC launch script 2018-01-04 03:50:05 +01:00
Petr Mrázek
4340068a84 NOISSUE add button for creating empty, properly registered, components 2017-12-31 01:37:50 +01:00
Petr Mrázek
c7032ce68a NOISSUE add missing QStringList include 2017-12-30 19:02:09 +01:00
Petr Mrázek
58ead6a1f4 NOISSUE handle 'folder' Flame packages by ignoring them, show warnings for minor Flame import problems 2017-12-30 18:57:46 +01:00
Petr Mrázek
6c30c84b11 NOISSUE switch MultiMC to the v1 meta endpoint 2017-12-29 03:32:22 +01:00
Petr Mrázek
75c0046f41 NOISSUE initial meta version will be 1, map 0 to 1 
Metadata for version 1 will be at v1.meta.multimc.org
 2017-12-29 01:51:00 +01:00
Petr Mrázek
719f3e863a NOISSUE add versioning to component metadata format and use it 2017-12-29 00:37:14 +01:00
Petr Mrázek
9eb0525dab NOISSUE preserve log page checkbox state when the instance window is closed 
Only for a single session, not between sessions.
 2017-12-18 01:19:43 +01:00
Petr Mrázek
daf9d0eaa7 NOISSUE do not override already loaded metadata entities with partial data 2017-12-14 02:22:20 +01:00
Petr Mrázek
f18afd3d1e NOISSUE fix a bunch of warnings thrown by Qt internals 
Badly connected signals/slots and similar things.
 2017-12-14 00:29:00 +01:00
Petr Mrázek
6d034bda82 GH-2059 fix instance directory not being created on first launch 2017-12-05 09:52:04 +01:00
Petr Mrázek
d6fc37e486 NOISSUE make MultiMC respond to account manipulation better 
* Setting and resetting default account will update the account list properly
* Removing the active account will now also reset it (previously, it would 'stay around')
* The accounts model is no longer reset by every action
 2017-12-03 20:54:28 +01:00
Petr Mrázek
8eb1397a8a NOISSUE fix wrong look of checkboxes in the account list 2017-12-03 19:34:54 +01:00
Petr Mrázek
95e6f37d39 NOISSUE force saving of any outstanding instance component state on exit 2017-12-03 18:36:28 +01:00
Petr Mrázek
e0bea1e46a NOISSUE watch added Component for changes in order to trigger ComponentList saves 2017-12-03 15:57:21 +01:00
Petr Mrázek
6a462d0778 GH-1082 allow disabling components 
Currently only ones that are removable and aren't dep-only
 2017-12-03 15:48:25 +01:00
Petr Mrázek
0a56b56286 NOISSUE in offline mode, do not contact the auth server if there is a valid account already 2017-12-03 14:05:35 +01:00
Petr Mrázek
30fad998a6 NOISSUE normalize instances path in FolderInstanceProvider 
This resolves some issues with the instance export dialog when the instances folder
path contains '..' and '.', or involves symlinks.
 2017-12-03 02:38:53 +01:00
Petr Mrázek
85ae710d40 GH-2026 implement changes necessary to support 1.13 snapshots 2017-12-03 01:22:34 +01:00
Petr Mrázek
17c8f31a09 NOISSUE split out the LaunchProfile out of the ComponentList 2017-11-17 15:44:13 +01:00
Petr Mrázek
fede712a26 NOISSUE rename MinecraftProfile to ComponentList 
It is realistically a list of components. The fact that it also holds the final
launch parameters is a design bug.
 2017-11-04 15:23:49 +01:00
Petr Mrázek
87edaa7dcd NOISSUE and one more build for the build gods... ssl error catching again. 2017-11-01 23:21:00 +01:00
Petr Mrázek
e5da2e36c7 NOISSUE actually do catch the ssl errors 2017-11-01 23:04:49 +01:00
Petr Mrázek
e44a0cb944 NOISSUE catch and log SSL errors for Download(s) 2017-11-01 22:52:11 +01:00
Petr Mrázek
a6a642eb7e GH-2026 only run versions with FirstThreadOnMacOS trait on first thread 2017-10-29 09:15:10 +01:00
Petr Mrázek
c78498f40c GH-2026 actually do the previous on macOS, not Windows 2017-10-28 23:29:18 +02:00
Petr Mrázek
4b80d34be4 GH-2026 start Minecraft on first thread on macOS 
This should fix issues with the 1.13 snapshots
 2017-10-28 22:56:18 +02:00
Petr Mrázek
d4b82f11ca GH-2026 fix failing library test case for native libraries 2017-10-28 22:21:49 +02:00
Petr Mrázek
3eebc641f9 GH-2026 fix native library downloads 
If a single library had both native and java jars, they would randomly get confused.
 2017-10-28 21:12:12 +02:00
Petr Mrázek
ab870648bd NOISSUE remove debug dump to file in paste upload 2017-10-11 09:13:26 +02:00
Petr Mrázek
1388751fd4 NOISSUE clean up and fix paste.ee upload 2017-10-11 08:55:42 +02:00
Petr Mrázek
eba8e61ce9 NOISSUE change behaviour of the +tweakers patch item 
Patch application will either add tweakers, or move them
to the end if they are already present.

This allows fixing up tweaker order in subsequent version patches.
 2017-10-08 02:02:52 +02:00
Petr Mrázek
c51512f940 NOISSUE use classparser for importing Legacy instances with undecided Minecraft versions 2017-09-27 15:39:13 +02:00
Petr Mrázek
9a2d203c0d GH-1993 swap min/max memory settings when they are the wrong way around 2017-09-27 12:45:07 +02:00
Petr Mrázek
79d208795c GH-1997 fix off by one error in 8.3 path logic 2017-09-27 04:28:21 +02:00
Petr Mrázek
d276da1359 GH-1997 try to fix Windows build 
Coding blind. Much !!FUN!!.
 2017-09-27 04:10:09 +02:00
Petr Mrázek
464bc0f770 GH-1997 replace use of weird hacks with normal java arguments 
This affects classpath and java.library.path.

The catch is that if the strings cannot be expressed in system codepage
on Windows, it tries to use 8.3 paths.
 2017-09-27 04:04:19 +02:00
Petr Mrázek
0595a00090 NOISSUE discourage using java > 8 by sorting it below everything else 2017-09-26 19:16:46 +02:00
Petr Mrázek
2b998bb8cc NOISSUE implement LEgacy instance migration 2017-09-26 13:38:34 +02:00
Petr Mrázek
eac892965e NOISSUE make sure MultiMC and Flame import is mutually exclusive 2017-09-26 01:39:39 +02:00
Petr Mrázek
678c7ab271 NOISSUE remove Flame manifest on import 
This prevents treating the instance as a Flame pack later.
 2017-09-26 01:37:50 +02:00
Petr Mrázek
f26ca143c4 NOISSUE do not fail when the Flame overrides folder is missing 2017-09-26 01:36:52 +02:00
Petr Mrázek
f8c5cee982 NOISSUE ignore the 'Example Mod' mod name, use filename instead 2017-09-25 08:18:42 +02:00
Petr Mrázek
c82042dcfa GH-2000 translate 'required' from Flame pack manifests to '.disabled' 2017-09-25 08:06:23 +02:00
Petr Mrázek
b5b16d0972 NOISSUE make instance traits() const 2017-09-22 00:27:30 +02:00
Petr Mrázek
76c7e0fe1c NOISSUE remove some dead code from MinecraftInstance (moved elsewhere) 2017-09-22 00:13:07 +02:00
Petr Mrázek
e9434fce3d NOISSUE prefer to use '.minecraft' instead of 'minecraft' folder 2017-09-20 23:58:39 +02:00
Petr Mrázek
ba3cbb7330 NOISSUE more work on Legacy migration 2017-09-20 23:38:31 +02:00
Petr Mrázek
9a6c2b0e2c NOISSUE Add back Legacy for migration purposes 2017-09-17 19:24:39 +02:00
Petr Mrázek
b2b0487600 NOISSUE clean up moc warnings 2017-09-10 13:25:32 +02:00
Petr Mrázek
9491396292 NOISSUE put back missing OneSix upgrade logic 2017-09-10 12:41:32 +02:00
Petr Mrázek
13628e7a82 NOISSUE merging of strategy into profile, onesix into minecraft 2017-09-09 19:19:05 +02:00
Petr Mrázek
b29382c748 NOISSUE Remove Legacy support 2017-09-09 18:30:22 +02:00
Petr Mrázek
4c01983f47 NOISSUE remove FTB integration 2017-09-09 18:29:52 +02:00
Petr Mrázek
3fb4ce713f NOISSUE add support for Flame packs with resource packs 
And a bunch of undefined things we don't handle intentionally just yet...
 2017-09-08 09:02:27 +02:00
Petr Mrázek
b61407a75d NOISSUE retry committing instances if it fails a few times 
This should fix issues with antivirus locking files/folders on Windows.
 2017-09-05 23:38:17 +02:00
Petr Mrázek
d80382180e NOISSUE refactor pack import (extraction and paths) 
It now:
* Doesn't extract until it knows the content format is good.
* Extracts in a predictable location, not requiring to use a second path for the actual pack root.
 2017-09-04 08:17:25 +02:00
Petr Mrázek
b8adbb9b73 GH-1971 do not check filesystem boundaries when committing instances 
The check wasn't very good and was breaking because it assumed uniform paths.
 2017-09-02 13:58:57 +02:00
Petr Mrázek
6381bfdb88 NOISSUE handle error 201 in Auth code 
This is something I ran into when one of my accounts stopped working.
The auth token probably expired.

This should now be handled as a normal auth error, not a network failure.
 2017-09-02 13:37:12 +02:00
Petr Mrázek
3ed990861a NOISSUE simplify ProblemProvider 2017-08-28 22:09:53 +02:00
Joona
59b681a174
NOISSUE implement more error handling 2017-08-22 18:35:10 -07:00
Joona
6e25624623
NOISSUE remove debug statement 2017-08-22 18:12:23 -07:00
Joona
60d10201e9
NOISSUE Add GPU vendor and driver version 2017-08-22 18:02:03 -07:00
Joona
0cd55d943e
CPU and GPU model on Linux 2017-08-22 17:47:06 -07:00
Joona
48274e889f
move env cleaning and clean before java test 2017-08-22 15:23:35 -07:00
Joona
9d3a847555 forgot to remove debug statement 2017-08-22 22:38:01 +02:00
Joona
4d54d2662a switch to new paste.ee API 2017-08-22 22:38:01 +02:00
Petr Mrázek
8cf88ffc58 GH-1314 add UI for custom minecraft jar addition 
Also changes the text of the jar mod addition button.
It should be clearer what it does and hopefully will not confuse
as many people.
 2017-08-07 00:46:29 +02:00
Petr Mrázek
bea1b5de5e GH-1929 do not allow non-current update task to affect the update process 
Errors are handled by setting a flag and failing on the next call to next()
 2017-07-21 08:49:58 +02:00
Petr Mrázek
5ea170db78 GH-1927 fix potential issue with FMLLibrariesTask succeeding twice. 2017-07-07 19:50:24 +02:00
Petr Mrázek
e5b4b5d295 GH-1927 Add more specific task status logging 
* Tasks are now described by class name and object name (or memory address).
* Tasks starts are logged.
* Aborted tasks are now treated just as the other cases.
 2017-07-07 19:46:56 +02:00
Petr Mrázek
fbeceaa98c NOISSUE remove verbose dl progress logging 2017-07-07 18:16:09 +02:00
Petr Mrázek
1797f45e8f NOISSUE fix jumpy download progress bars 
They are not as precise, the new logic gives every
download 1000 'units' instead of the actual (initially unknown) sizes.
 2017-07-06 15:38:16 +02:00
Petr Mrázek
d6ab4b4a7f NOISSUE rearrange global initialization 2017-07-05 18:02:49 +02:00
Petr Mrázek
74c455ff35 NOISSUE add note to Job_Failed_Proceed 
It should be removed, it just signifies that there is a system missing.
 2017-06-27 08:20:12 +02:00
Petr Mrázek
36f3e24cf3 NOISSUE remove some bad code in various Task related classes 2017-06-27 04:32:53 +02:00
Petr Mrázek
89d3a66658 NOISSUE some safe refactors and changes of the task subsystem 
Possibly also some bug fixes.
 2017-06-26 01:14:32 +02:00
Petr Mrázek
8a1da91219 NOISSUE finish cleaning quazip 
All LGPL code is back in the customized quazip fork
 2017-05-31 09:20:24 +02:00
Petr Mrázek
cdc9bed83f NOISSUE move some zip utility functions back to quazip 
It's not entirely clean yet.
 2017-05-31 09:20:24 +02:00
Petr Mrázek
7acf1998eb NOISSUE split wrapper commands into command and args 
This lets you use commands with parameters.
 2017-05-29 01:36:01 +02:00
Petr Mrázek
50b8412a26 NOISSUE do not try to restore file permissions when importing modpacks 2017-05-25 01:24:27 +02:00
Petr Mrázek
3597a50854 NOISSUE log native extraction failures also to game log 2017-05-22 08:57:13 +02:00
Petr Mrázek
4133247bff NOISSUE and even more warnings gone 2017-05-21 22:30:53 +02:00
Petr Mrázek
c329bc73c0 NOISSUE more compiler warning removal 2017-05-21 22:24:06 +02:00
Petr Mrázek
d432d8ecfc NOISSUE get rid of some more compiler warnings 2017-05-21 22:14:40 +02:00
Petr Mrázek
8bd8be95f0 NOISSUE fix a bunch of compiler warnings 2017-05-21 20:20:37 +02:00
Petr Mrázek
572a6026b5 GH-1895 update LWJGL list during legacy instance update 2017-05-21 02:34:02 +02:00
Petr Mrázek
868669a497 NOISSUE add a linux system packaging install layout 2017-05-13 01:24:15 +02:00
Petr Mrázek
4cf4110d9d NOISSUE log even more about 'Flame' resolving issues 2017-05-09 21:56:33 +02:00
Petr Mrázek
e029b7764e NOISSUE log 'Flame' mod resolver parsing errors. 2017-05-09 21:49:36 +02:00
Petr Mrázek
8a526fab0e GH-1885 make FileSink save (even empty) files when the HTTP response is 200 or 203 2017-05-09 03:08:38 +02:00
Petr Mrázek
15c829fd3c GH-1876 Fork and update quazip 
* It is added as a new submodule: https://github.com/MultiMC/quazip/tree/multimc-1
* Its build system has been entirely replaced to remove the existing issues with it
* It now has working unit tests
* No more patches needed
* It has a static linking exception in its license now, but we use it shared anyway
 2017-05-06 17:36:57 +02:00
Petr Mrázek
e854894a3c GH-1876 turn pack200 into a shared library 2017-05-05 01:34:01 +02:00
Petr Mrázek
0ce44dbd41 GH-1864 fix imgur album creation 2017-05-04 22:58:22 +02:00
Petr Mrázek
e76e6329cd NOISSUE Revert all recent changes to NetAction and NetJob 2017-05-03 23:13:49 +02:00
Petr Mrázek
0efa714ba5 NOISSUE replace std::shared_ptr with shared_qobject_ptr for all download tasks 2017-05-03 21:09:36 +02:00
Petr Mrázek
794102b32c NOISSUE less jumpy download progress bars and redirect URL fix 2017-04-30 02:54:37 +02:00
Petr Mrázek
1be99b075a NOISSUE more NetAction and NetJob cleanups 2017-04-29 21:34:36 +02:00
Petr Mrázek
e1465f4848 NOISSUE refactor NetAction to be based on Task 
Still missing some things, this is part 1.
 2017-04-29 02:24:00 +02:00
Petr Mrázek
6dc1bc65e1 NOISSUE fix Mojang JSON format unit test on Qt 5.6 by dumping JSON to byte arrays 2017-04-25 23:33:19 +02:00
Petr Mrázek
4fa3e2a714 GH-1856 Fix metadata version and list loading 
Shouldn't crash anymore, shouldn't overwrite data in some bad way anymore either.
 2017-04-24 01:30:51 +02:00
Petr Mrázek
3f24c4cfe5 GH-1856 Make MultiMC fail hard when things are missing 
Things like:
* jar mods
* valid version files
 2017-04-23 02:34:16 +02:00
Petr Mrázek
8084f27ec8 NOISSUE do not write library display name twice 2017-04-22 20:27:00 +02:00
Petr Mrázek
249baf6fcf GH-1860 fix old jarmods 
Names were not set for the libraries, making them return invalid things
 2017-04-22 19:38:28 +02:00
Petr Mrázek
8ace5fa91d NOISSUE Add flame. 2017-04-22 18:51:04 +02:00
Petr Mrázek
77a1d39f6b NOISSUE fix problems in old curse packs 
Added:
* jarmod importing
* fixing of bad minecraft versions
* mapping of undefined 'recommended' forge versions to something appropriate
* some fake guessing of pack icons
* fixes for some more issues found with the pack manifest format
 2017-04-22 05:20:06 +02:00
Petr Mrázek
6a525db78d NOISSUE 'required' attribute of curse manifests is optional, libraries attribute reading 2017-04-22 00:29:24 +02:00
Petr Mrázek
1d71214d4a NOISSUE fix build: there is no qInfo in old Qt5. 2017-04-21 22:30:39 +02:00
Petr Mrázek
ab5045b54c NOISSUE finalize curse modpack import work 2017-04-21 22:23:31 +02:00
Petr Mrázek
f3c46dbf11 NOISSUE silly/simple implementation of mod metadata in OneSix version format 2017-04-21 22:23:00 +02:00
Petr Mrázek
6bd2605a79 NOISSUE add import from curse zip packs 
Does not actually grab mods, but resolves them and prints the results in logs.
 2017-04-20 05:22:04 +02:00
Petr Mrázek
60777ad8ce GH-1856 always pull new versions of metadata when requested 
The only block is if it's already happening.
 2017-04-19 22:23:00 +02:00
Rafael Ristovski
88041783e6 Add missing <functional> include. 
Compiling under Linux fails because of a missing include directive
Ref:
http://en.cppreference.com/w/cpp/utility/functional/bind
http://en.cppreference.com/w/cpp/utility/functional/placeholders
 2017-04-19 22:11:12 +02:00
Petr Mrázek
47e075babd NOISSUE set metadata source to main 2017-04-18 17:55:05 +02:00
Petr Mrázek
5565a2f85e NOISSUE fix crash because of early destruction of java list load task 2017-04-18 16:45:58 +02:00
Petr Mrázek
c4c8e99681 NOISSUE jar mods as libraries, fix for customizing net.minecraft 2017-04-17 22:51:30 +02:00
Petr Mrázek
fc28aacdea NOISSUE stop using the path attributes from Mojang download info 
It really should not dictate how are things stored and it just makes
the metadata bigger for no reason.
 2017-04-15 11:40:22 +02:00
Petr Mrázek
07cde802e4 GH-1853 fix FTB and parsing of old version files 2017-04-14 12:33:54 +02:00
Petr Mrázek
2aaf9827a6 NOISSUE slightly refactor jarMod entry reading 2017-04-14 12:21:10 +02:00
Petr Mrázek
be53eb66f8 NOISSUE implement mainJar support in OneSix format 
This allows customizing the main jar like any other library.
 2017-04-13 09:28:25 +02:00
Petr Mrázek
8e58d61150 NOISSUE fix issue with the narrator feature by splitting java and native libraries 2017-04-07 00:20:02 +02:00
Petr Mrázek
dddc5cedf3 NOISSUE make a call to ensureBoolean in the JSON format code less ambiguous 2017-04-07 00:20:02 +02:00
Petr Mrázek
dff307557b NOISSUE fix liteloader uid where it is hardcoded hardcoded 2017-04-07 00:20:02 +02:00
Petr Mrázek
643d74f66c NOISSUE implement recommended versions using the new JSON format 2017-04-07 00:20:02 +02:00
Petr Mrázek
f565798650 NOISSUE remove unused version range filtering 2017-04-07 00:20:02 +02:00
Petr Mrázek
e0596d3c86 NOISSUE Make forge installable again 2017-04-07 00:20:02 +02:00
Petr Mrázek
2ac0edbbdb NOISSUE preview of LWJGL version changing 
It still needs work - some LWJGL versions are exclusive to macOS.
This has to be encoded in the json.
 2017-04-07 00:20:02 +02:00
Petr Mrázek
53188386b8 NOISSUE refactor builtin patch loading slightly 2017-04-07 00:20:02 +02:00
Petr Mrázek
af3384c649 NOISSUE add filename to newly created jar mod patches 2017-04-07 00:20:02 +02:00
Petr Mrázek
22735f275e NOISSUE remove dead code 2017-04-07 00:20:02 +02:00
Petr Mrázek
5fabb4f254 NOISSUE Rough refactor of ProfilePatch and VersionFile internals. 
They are now distinct classes with distinct responsibilities.

* ProfilePatch is an entry in MinecraftProfile and can hold VersionFile or Meta::Version.
* VersionFile is the basic element that holds version information loaded from JSON.
* Meta::Version is the loader class for VersionFile(s) from a server.
 2017-04-07 00:20:02 +02:00
Petr Mrázek
6f2a87167a NOISSUE remove some dead code from version related classes 2017-04-07 00:20:02 +02:00
Petr Mrázek
3aa28bd64a NOISSUE fix some warning on linux related to the GNU C library 2017-04-07 00:20:02 +02:00
Petr Mrázek
da4ae1bc1e NOISSUE reimplement package dependencies 
It is now stored as a hashmap
There is also a parentUid to limit depsolving by encapsulating by version
 2017-04-07 00:20:02 +02:00
Petr Mrázek
f557c13679 NOISSUE stuff and things happened. Maybe. 2017-04-07 00:20:02 +02:00
Petr Mrázek
2660418d58 NOISSUE hack it together enough to get launching back 
Meta index will now always return valid objects.
They just might never load if they don't exist on the server.
 2017-04-07 00:20:02 +02:00
Petr Mrázek
e46aba9da5 NOISSUE sanitize loading and downloading of metadata files 2017-04-07 00:20:02 +02:00
Petr Mrázek
0060b50625 NOISSUE simplify. 2017-04-07 00:20:01 +02:00