Compare commits

...

2 commits

Author SHA1 Message Date
Gravita
27bcfc046e
[FEATURE] Upgrade minimum version to Java 21 2024-11-24 15:54:23 +07:00
Gravita
f946c893e1
[FEATURE] Add OptionalMod.getDependencies() 2024-11-24 15:30:14 +07:00
11 changed files with 26 additions and 22 deletions

View file

@ -153,12 +153,8 @@ public static ClientProfile makeProfile(ClientProfile.Version version, String ti
} }
} }
} }
builder.setMinJavaVersion(17); builder.setMinJavaVersion(21);
builder.setRecommendJavaVersion(17); builder.setRecommendJavaVersion(21);
if(version.compareTo(ClientProfileVersions.MINECRAFT_1_20_3) >= 0) {
builder.setMinJavaVersion(21);
builder.setRecommendJavaVersion(21);
}
jvmArgs.add("-Dfml.ignorePatchDiscrepancies=true"); jvmArgs.add("-Dfml.ignorePatchDiscrepancies=true");
jvmArgs.add("-Dfml.ignoreInvalidMinecraftCertificates=true"); jvmArgs.add("-Dfml.ignoreInvalidMinecraftCertificates=true");
builder.setJvmArgs(jvmArgs); builder.setJvmArgs(jvmArgs);

View file

@ -1,4 +1,4 @@
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.gradleup.shadow'
String mainClassName = "pro.gravit.launcher.start.ClientLauncherWrapper" String mainClassName = "pro.gravit.launcher.start.ClientLauncherWrapper"
@ -7,8 +7,8 @@
url "https://repo.spring.io/plugins-release/" url "https://repo.spring.io/plugins-release/"
} }
} }
sourceCompatibility = '17' sourceCompatibility = '21'
targetCompatibility = '17' targetCompatibility = '21'
configurations { configurations {
bundle bundle

View file

@ -1,5 +1,5 @@
sourceCompatibility = '17' sourceCompatibility = '21'
targetCompatibility = '17' targetCompatibility = '21'
dependencies { dependencies {
api project(':LauncherCore') api project(':LauncherCore')

View file

@ -6,6 +6,7 @@
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
public class OptionalFile implements ProfileFeatureAPI.OptionalMod { public class OptionalFile implements ProfileFeatureAPI.OptionalMod {
@LauncherNetworkAPI @LauncherNetworkAPI
@ -72,6 +73,11 @@ public boolean isVisible() {
return visible; return visible;
} }
@Override
public Set<ProfileFeatureAPI.OptionalMod> getDependencies() {
return Set.of(dependencies);
}
public boolean isMark() { public boolean isMark() {
return mark; return mark;
} }

View file

@ -7,8 +7,8 @@
url "https://repo.spring.io/plugins-release/" url "https://repo.spring.io/plugins-release/"
} }
} }
sourceCompatibility = '17' sourceCompatibility = '21'
targetCompatibility = '17' targetCompatibility = '21'
jar { jar {
archiveClassifier.set('clean') archiveClassifier.set('clean')

View file

@ -1,5 +1,5 @@
sourceCompatibility = '17' sourceCompatibility = '21'
targetCompatibility = '17' targetCompatibility = '21'
dependencies { dependencies {
compileOnly group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi'] compileOnly group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi']

View file

@ -4,6 +4,7 @@
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@ -37,5 +38,6 @@ interface OptionalMod {
String getDescription(); String getDescription();
String getCategory(); String getCategory();
boolean isVisible(); boolean isVisible();
Set<OptionalMod> getDependencies();
} }
} }

View file

@ -8,8 +8,8 @@
url "https://repo.spring.io/plugins-release/" url "https://repo.spring.io/plugins-release/"
} }
} }
sourceCompatibility = '17' sourceCompatibility = '21'
targetCompatibility = '17' targetCompatibility = '21'
jar { jar {
archiveClassifier.set('clean') archiveClassifier.set('clean')

View file

@ -1,4 +1,4 @@
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.gradleup.shadow'
String mainClassName = "pro.gravit.launcher.server.ServerWrapper" String mainClassName = "pro.gravit.launcher.server.ServerWrapper"
String mainAgentName = "pro.gravit.launcher.server.ServerAgent" String mainAgentName = "pro.gravit.launcher.server.ServerAgent"
@ -14,8 +14,8 @@
} }
} }
sourceCompatibility = '17' sourceCompatibility = '21'
targetCompatibility = '17' targetCompatibility = '21'
jar { jar {
archiveClassifier.set('clean') archiveClassifier.set('clean')

View file

@ -1,5 +1,5 @@
plugins { plugins {
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false id 'com.gradleup.shadow' version '8.3.5' apply false
id 'maven-publish' id 'maven-publish'
id 'signing' id 'signing'
id 'org.openjfx.javafxplugin' version '0.1.0' apply false id 'org.openjfx.javafxplugin' version '0.1.0' apply false

@ -1 +1 @@
Subproject commit 0d8cef927b1fda3097dc88c3adcffc4d0e33dd69 Subproject commit 755009c292ce35273b8a7e584088a0932ab17e7c