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

96 Commits

Author SHA1 Message Date
Samuel Stidham
bffb2a3609 Fixed the code. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit adf0cfdebf)
 2024-05-18 10:16:15 +00:00
Samuel Stidham
0d3596c864 Add extra java locations for MacOs. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit 8e0af16de9)
 2024-05-18 10:16:15 +00:00
Trial97
c74099ec7b Fixed windows bundled java path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5ae98f4f90)
 2024-04-24 15:46:21 +00:00
Trial97
f06bd54d6f Removed duplicate local 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 10d1720da5)
 2024-04-23 16:19:50 +00:00
Trial97
0b535e44e1 Changed env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 73c3794c1b)
 2024-04-23 16:19:50 +00:00
Trial97
877de6da40 Fixed windows appdata path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dac7027846)
 2024-04-23 16:19:50 +00:00
Trial97
c330452e84 Fix bundled java detection on mac 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit dbfd535b38)
 2024-04-23 16:19:50 +00:00
William Gray
47bd02637a Update JavaUtils.cpp 
Signed-off-by: William Gray <ruwagray@gmail.com>
(cherry picked from commit 9f4654ede9)
 2024-04-21 17:45:15 +00:00
Trial97
b2cca30cd9 Moved getPathNameInLocal8bit inside FileSystem namespace 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3ddcadcdd1)
 2024-04-06 12:40:35 +00:00
Alexandru Ionut Tripon
7313630615
Update launcher/java/JavaUtils.cpp 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-08 09:01:31 +02:00
Trial97
c78d35d699
added additional minecraft java path for windows 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 10:20:53 +02:00
Tayou
86e2f6c58c
Merge pull request #1685 from Trial97/java 
Autodetect Java bundled with official launcher
 2023-10-31 18:03:41 +01:00
LocalSpook
5be80df1ee Replace typedef with using 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-24 01:36:27 -07:00
TheKodeToad
c4882e7162
Merge pull request #443 from TheKodeToad/skinfix 
Add legacy skin fix
 2023-10-15 21:46:29 +01:00
Trial97
82461b1113
rename for windows 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-06 08:51:45 +03:00
Trial97
4f1ee85424
check for minecraft java runtime 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-06 00:21:37 +03:00
nea
c6c17036e3
Add more Java installation dirs 
Signed-off-by: nea <nea@nea.moe>
 2023-10-04 21:20:59 +02:00
TheKodeToad
1213a5ab46
Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +01:00
Trial97
d3acac16e6
added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 13:10:13 +03:00
Sefa Eyeoglu
215d7dbb74
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:17:05 +02:00
Sefa Eyeoglu
91ba4cf75e
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:16:53 +02:00
Sefa Eyeoglu
779f70057b
Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging 2023-08-14 18:16:13 +02:00
Sefa Eyeoglu
a545f67a21
fix: take JavaCheckResult by const reference 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:07 +02:00
Rachel Powers
b9fe37aec1
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:33:46 -07:00
TheKodeToad
c37e1fb9f1
Merge branch 'develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-20 18:11:27 +01:00
Trial97
440afcedb0
fixed warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 13:32:18 +03:00
Trial97
b0a21c9389
insert header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 13:31:28 +03:00
Trial97
fc4a1ef193
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 13:31:13 +03:00
Rachel Powers
671d3c1c80
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:11 -07:00
Chris Lane
9ad29e8d85
Remove extra spaces in one more Java checker debug 
Signed-off-by: Chris Lane <git@chrislane.com>
 2023-06-20 15:51:31 +01:00
Chris Lane
07f3d27fb8
Clean up 'Running java checker' debug msg code 
Signed-off-by: Chris Lane <git@chrislane.com>
 2023-06-20 15:36:25 +01:00
Chris Lane
f2692e60f3
Add missing space in java checker debug message 
Signed-off-by: Chris Lane <git@chrislane.com>
 2023-06-20 12:44:44 +01:00
TheKodeToad
180ed0cc1a
Merge branch 'PrismLauncher:develop' into skinfix 2023-06-13 11:08:21 +01:00
TheKodeToad
b7d82354cb [ci skip] License headers!! (yay) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-10 14:43:58 +01:00
TheKodeToad
1191c33c2b Remove flawed implementation 
This seems to add the latest icon (bug) as a fallback if not provided...
but it mainly seems to cause problems... 🤷

I swear I did `git add .`.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-07 22:45:21 +01:00
TheKodeToad
52054469cd Fix *bug* lol 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-07 22:39:23 +01:00
Rachel Powers
df18d8560d chore: fix test & clean up one last warning 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-04 22:46:05 -07:00
Rachel Powers
f27716656c fix: remove qt < 5.6 support process error signal 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-11 16:32:00 -07:00
Rachel Powers
12f0d51c0c Fix: signal/slot macro -> func pointer & network fixes 
- convert qt connect calls to use function pointers instead of the signal/slot macros wherever practical (UI classes were mostly left alone, target was tasks and processes)
- give signals an explicit receivers to use the static method over the instance method wherever practical
- ensure networks tasks are using the `errorOccured` signal added in Qt5.15 over the deprecated `error` signal
- ensure all networks tasks have an sslErrors signal connected
- add seemingly missing `MinecraftAccount::authSucceeded` connection for `MSAInteractive` login flow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-17 18:23:18 -07:00
TheKodeToad
9cc3d9d4ce Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-02-19 11:35:26 +00:00
BalkanMadman
c125c96e88 Java installations detection fix for Linux 
Signed-off-by: BalkanMadman <zurabid2016@gmail.com>
 2023-02-04 16:48:06 +02: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
TheKodeToad
87bcefd08a Automatically add add-opens if Java version >= 9 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 15:28:24 +00:00
Sefa Eyeoglu
392452d422
Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
 2022-11-10 14:34:15 +01:00
Sefa Eyeoglu
695734636f
Merge pull request #294 from piperswe/add-snapcraft-yml 2022-11-05 11:09:51 +01:00
flow
353b51f11e
refactor: move MMCStrings -> StringUtils 
General utilities can go in here >:)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:24 -03:00
flow
7956e6f04e
fix: don't use forward-declared Ptr types in meta/ 
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-01 19:48:26 -03:00
Piper McCorkle
2e0f818905 Add a snapcraft.yml for building Snaps 
The included snapcraft.yml can be used to build a Snap (the application
format used by Canonical's modern package manager) out of Prism. If the
project wants in the future, Prism can publish these Snaps to the Snap
Store so the Prism Launcher can be installed through the Ubuntu Software
app on vanilla Ubuntu.

I haven't registered the Snap name, so it's currently free for anyone to
reserve. I'd suggest that a Prism developer register the name
prismlauncher at https://snapcraft.io/register-snap to ensure the name
belongs to the project, even if there are no plans of setting up CI to
publish snaps in the short term.

I have also modified JavaUtils.cpp to be able to autodetect the Java
versions included in the Snap, and added "*.snap" to the .gitignore so
the compiled Snap isn't accidentally committed to the repository.

Signed-off-by: Piper McCorkle <contact@piperswe.me>
 2022-10-26 09:25:54 -05:00
AliceDTRH
b2789fef0f
Use correct variable for Windows 
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
 2022-10-22 17:19:34 +02:00
AliceDTRH
1471eddc7e
Deduplicates java installs before passing it on 
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
 2022-10-22 16:40:31 +02:00