Compare commits

..

No commits in common. "27bcfc046ef776bd6dff452c70f00307d494931f" and "f1559183a121593f79803651eeae31138b9b6320" have entirely different histories.

11 changed files with 22 additions and 26 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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