Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ private static void writeZip(File output, Map<String, byte[]> files) {
@Input
public abstract ListProperty<Integer> getCompatibleJavaMajors();

@Input
public abstract Property<String> getCompatibleJavaName();

@Input
public abstract Property<String> getUniversalCoordinate();

Expand Down Expand Up @@ -298,6 +301,11 @@ private JsonObject forgePatchJson(JsonArray libraries, String lwjglVersion) {
getCompatibleJavaMajors().get().forEach(javaMajors::add);
patch.add("compatibleJavaMajors", javaMajors);
}

if (!getCompatibleJavaName().get().isEmpty()) {
patch.addProperty("compatibleJavaName", getCompatibleJavaName().get();
}

if (!tweakers.isEmpty()) {
patch.add("+tweakers", tweakers);
}
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/com/cleanroommc/gradle/api/util/lazy/Providers.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@ public static Provider<Integer> targetJavaMajor(Project project) {
return targetJavaVersion(project).map(JavaLanguageVersion::asInt);
}

public static Provider<String> targetJavaName(Project project) {
return targetJavaMajor(project).map(Providers::javaRuntimeName);
}

// mojang jre names
public static String javaRuntimeName(int major) {
if (major >= 29) return "";
if (major >= 25) return "java-runtime-epsilon";
if (major >= 21) return "java-runtime-delta";
if (major >= 17) return "java-runtime-beta";
if (major >= 16) return "java-runtime-alpha";
return "jre-legacy";
}

public static Provider<JavaLauncher> javaLauncher(Project project) {
return javaLauncher(project.getExtensions().getByType(JavaToolchainService.class), targetJavaVersion(project));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ public DistributionTasks(Project project, ProjectCoordinates coordinates, Caches

var javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
var targetJavaMajor = Providers.targetJavaMajor(project);
var targetJavaName = Providers.targetJavaName(project);
var mainSourceSet = javaExtension.getSourceSets().named(SourceSet.MAIN_SOURCE_SET_NAME);
var jarTask = project.getTasks().named("jar", Jar.class);

Expand Down Expand Up @@ -474,6 +475,7 @@ public DistributionTasks(Project project, ProjectCoordinates coordinates, Caches
task.getMainClass().set(clientLaunchClass);
task.getTweakers().set(clientTweakClass.map(List::of));
task.getCompatibleJavaMajors().set(targetJavaMajor.map(List::of));
task.getCompatibleJavaName().set(targetJavaName);
task.getUniversalCoordinate().set(universal.map(Coordinate::serialized));
task.getUniversalUrl().set(universalUrl);
task.getUniversalJar().set(this.universalJar.flatMap(Jar::getArchiveFile));
Expand Down