Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-04 07:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/5.5.2'

Browse source
This commit is contained in:
Gravita 2023-11-20 17:14:57 +07:00
commit 3d61635c6b
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Launcher/build.gradle
View file

@ -26,7 +26,8 @@
archiveClassifier.set('clean') archiveClassifier.set('clean')
manifest.attributes("Main-Class": mainClassName, manifest.attributes("Main-Class": mainClassName,
"Premain-Class": mainAgentName, "Premain-Class": mainAgentName,
"Multi-Release": "true") "Multi-Release": "true",
"Automatic-Module-Name": "GravitLauncher")
} }
tasks.register('sourcesJar', Jar) { tasks.register('sourcesJar', Jar) {

2
LauncherCore/src/main/java/pro/gravit/utils/Version.java
View file

@ -6,7 +6,7 @@ public final class Version implements Comparable<Version> {
public static final int MAJOR = 5; public static final int MAJOR = 5;
public static final int MINOR = 5; public static final int MINOR = 5;
public static final int PATCH = 1; public static final int PATCH = 2;
public static final int BUILD = 1; public static final int BUILD = 1;
public static final Version.Type RELEASE = Type.STABLE; public static final Version.Type RELEASE = Type.STABLE;
public final int major; public final int major;

9
LauncherCore/src/main/java11/pro/gravit/utils/launch/ModuleLaunch.java
View file

@ -39,7 +39,7 @@ public ClassLoaderControl init(List<Path> files, String nativePath, LaunchOption
} catch (MalformedURLException ex) { } catch (MalformedURLException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
}).toArray(URL[]::new), BasicLaunch.class.getClassLoader()); }).toArray(URL[]::new), ClassLoader.getPlatformClassLoader());
moduleClassLoader.nativePath = nativePath; moduleClassLoader.nativePath = nativePath;
{ {
if(options.enableHacks) { if(options.enableHacks) {
@ -163,14 +163,11 @@ private class ModuleClassLoader extends URLClassLoader {
private String nativePath; private String nativePath;
private final List<String> packages = new ArrayList<>(); private final List<String> packages = new ArrayList<>();
public ModuleClassLoader(URL[] urls) { public ModuleClassLoader(URL[] urls, ClassLoader parent) {
super(urls); super("LAUNCHER", urls, parent);
packages.add("pro.gravit.launcher."); packages.add("pro.gravit.launcher.");
packages.add("pro.gravit.utils."); packages.add("pro.gravit.utils.");
} }
public ModuleClassLoader(URL[] urls, ClassLoader parent) {
super(urls, parent);
}
@Override @Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {

2
build.gradle
View file

@ -5,7 +5,7 @@
id 'org.openjfx.javafxplugin' version '0.0.10' apply false id 'org.openjfx.javafxplugin' version '0.0.10' apply false
} }
group = 'pro.gravit.launcher' group = 'pro.gravit.launcher'
version = '5.5.1' version = '5.5.2'
apply from: 'props.gradle' apply from: 'props.gradle'

2
modules

@ -1 +1 @@
Subproject commit 67462dafa9b8de8e3d7366f495c959b9c2c037d5 Subproject commit a70de3865daff53f44fb93cb6c80df99e3cdc0a1