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

73 Commits

Author SHA1 Message Date
TheKodeToad
fb7d19941f Fix CleanEnviroment()'s usage of stripVariableEntries 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e7cd8fe078e3a68bd3179816020a9ed08f1b2847)
 2024-10-23 21:30:57 +00:00
TheKodeToad
d2304b6698
Improve Java checking speed by using startsWith for gentoo paths 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-24 22:13:18 +01:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
Kationor
659fa7fbfb
fix/windows: Check registry for per-user java installations 
Signed-off-by: Kationor <n96211028@gmail.com>
 2024-08-07 18:00:42 +02:00
Trial97
29a6db171f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-22 08:57:31 +03:00
izder456
0a543cb66b FIX launcher/java/JavaUtils.cpp to properly autodetect JVM paths on OpenBSD and FreeBSD 
Signed-off-by: izder456 <izder456@disroot.org>
 2024-07-11 20:32:04 -05:00
Trial97
0b79abcdcd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
Trial97
147741e616
increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
Trial97
3b473b24d8
fix sdkman on macos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-26 10:16:27 +03:00
porter milton
2958691857
add ~/Library/Java/JavaVirtualMachines/* to java installation detection 
Signed-off-by: porter milton <57007161+porterporter@users.noreply.github.com>
 2024-06-25 23:16:26 +00:00
Trial97
7c38edc93d
Apply suggestion from code review 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 16:10:05 +03:00
seth
e0063b1ee7
Merge pull request #2429 from Richard-Rogalski/GENTOOweloveyou 
[Linux] Auto-detect Gentoo installed JDKs
 2024-06-22 19:14:46 -04:00
Trial97
ca369ac2b0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 19:52:37 +03:00
Richard-Rogalski
399071c717 Fix Java auto-detect so it finds Gentoo installed JDKs 
Signed-off-by: Richard-Rogalski <rrogalski@tutanota.com>
 2024-05-21 11:41:47 -05:00
Fourmisain
23095b70a4
please the pre-commit check 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-21 13:44:00 +02:00
Fourmisain
dbe4adc034
detect IBM Semeru Certified Edition on linux 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-21 10:51:37 +02:00
Fourmisain
af157c1613
fix x86 detection on 64 bit windows 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-20 23:13:44 +02:00
Fourmisain
08918be11e
add detection for IBM Semeru Java runtime 
Signed-off-by: Fourmisain <8464472+Fourmisain@users.noreply.github.com>
 2024-05-20 21:44:35 +02:00
Trial97
7a5348a179
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
Samuel Stidham
adf0cfdebf Fixed the code. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
 2024-05-05 20:01:29 -04:00
Samuel Stidham
8e0af16de9 Add extra java locations for MacOs. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
 2024-05-05 19:53:18 -04:00
Trial97
5ae98f4f90
Fixed windows bundled java path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-24 15:49:05 +03:00
Trial97
10d1720da5
Removed duplicate local 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-23 19:08:14 +03:00
Trial97
73c3794c1b
Changed env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-23 19:03:19 +03:00
Trial97
dac7027846
Fixed windows appdata path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-23 18:59:31 +03:00
Trial97
dbfd535b38
Fix bundled java detection on mac 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-23 08:52:17 +03:00
William Gray
9f4654ede9
Update JavaUtils.cpp 
Signed-off-by: William Gray <ruwagray@gmail.com>
 2024-04-21 03:35:27 -05:00
Trial97
889f604a41
Removed JavaExtraSearchPaths 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 21:38:31 +02:00
Trial97
27d662e642
Added management for downloaded javas from prism 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-09 22:47:39 +02:00
Trial97
b3fc07d444
Added extra java search paths 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 21:47:59 +02:00
Trial97
ba990e075b
Added JavaPath function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 19:45:46 +02:00
Trial97
81282bf7e0
Autodetect Java? 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-26 00:22:05 +02: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
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
Sefa Eyeoglu
1d638e018a
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-04 19:41:47 +02:00
Sefa Eyeoglu
1d468ac35a
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-02 18:35:35 +02:00
BalkanMadman
c125c96e88 Java installations detection fix for Linux 
Signed-off-by: BalkanMadman <zurabid2016@gmail.com>
 2023-02-04 16:48:06 +02: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
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
Sefa Eyeoglu
722194405a
refactor: initial rebrand 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:37:59 +02:00
Tayou
26f31e9288
use qEnvironmentVariable instead of qgetenv in JavaUtils 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-08-18 23:59:35 +02:00
Tayou
bb4861cf0d check for java installs in PATH on windows 
this should find java installs from scoop as well as any other installer, that registers java in the PATH environment variable.

Signed-off-by: Tayou <tayou@gmx.net>
 2022-08-18 18:24:32 +02:00
timoreo
6aad750fe0
Merge pull request #893 from Scrumplex/refactor-env-handling 2022-07-23 14:08:10 +02:00
Sefa Eyeoglu
fd2b206997
fix: support LD_* for OpenBSD 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
2d53c7c5b2
refactor: filter values in environment variables 
Before this change, you had to specify custom LD_* variables using the
prefix GAME_LD_*. Now instead of dropping all LD_* variables by default,
we should just filter them and remove the values we *know* are from our
start script.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:07:58 +02:00