Skip to content

fix: properly resolve platform plugin file templates #1905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0utplay merged 3 commits into from
Oct 5, 2026
Merged

fix: properly resolve platform plugin file templates #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c21430
fix: properly resolve platform plugin file templates
derklaro Oct 4, 2026
ec78da7
...
derklaro Oct 4, 2026
0e51eb7
...
derklaro Oct 4, 2026
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
9 changes: 7 additions & 2 deletions ...sions/src/main/kotlin/eu/cloudnetservice/cloudnet/gradle/plugins/CloudNetModulesPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ package eu.cloudnetservice.cloudnet.gradle.plugins
import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin
import eu.cloudnetservice.cloudnet.gradle.tasks.PrepareUpdaterDataTask
import eu.cloudnetservice.cloudnet.gradle.util.UpdaterMeta
import eu.cloudnetservice.cloudnet.gradle.util.sourceSets
import eu.cloudnetservice.gradle.juppiter.GenerateModuleJson
import eu.cloudnetservice.gradle.juppiter.JuppiterPlugin
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.jvm.tasks.Jar
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.invoke
Expand All @@ -42,9 +44,12 @@ class CloudNetModulesPlugin : Plugin<Project> {
}
}

val generateModuleJson = tasks.named<GenerateModuleJson>("genModuleJson")
val archiveFileName = project.objects.property<String>()
tasks.named<JavaCompile>("compileJava") {
options.sourcepath = files(sourceSets().named("main").map { it.resources.sourceDirectories })
}

val archiveFileName = project.objects.property<String>()
val generateModuleJson = tasks.named<GenerateModuleJson>("genModuleJson")
val prepareUpdaterData = tasks.named<PrepareUpdaterDataTask>("prepareUpdaterData") {
dependsOn(generateModuleJson)
from(generateModuleJson.flatMap { it.outputDirectory.file(it.fileName) })
Expand Down
6 changes: 6 additions & 0 deletions ...sions/src/main/kotlin/eu/cloudnetservice/cloudnet/gradle/plugins/CloudNetPluginsPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,21 @@

package eu.cloudnetservice.cloudnet.gradle.plugins

import eu.cloudnetservice.cloudnet.gradle.util.sourceSets
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.named

class CloudNetPluginsPlugin : Plugin<Project> {
override fun apply(project: Project) {
project.run {
apply<CloudNetJavaPlugin>()
registerProcessSources()
tasks.named<JavaCompile>("compileJava") {
options.sourcepath = files(sourceSets().named("main").map { it.resources.sourceDirectories })
}
}
}
}
19 changes: 6 additions & 13 deletions ...ava/eu/cloudnetservice/ext/platforminject/processor/infogen/NightConfigInfoGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
import com.electronwill.nightconfig.core.io.ConfigWriter;
import eu.cloudnetservice.ext.platforminject.api.data.ParsedPluginData;
import eu.cloudnetservice.ext.platforminject.api.generator.PluginInfoGenerator;
import eu.cloudnetservice.ext.platforminject.processor.util.ResourceUtil;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Objects;
import java.util.Set;
import javax.annotation.processing.Filer;
Expand Down Expand Up @@ -82,20 +79,16 @@ protected abstract void applyPlatformInfo(

protected @NonNull Config loadFileTemplateOrNewConfig(@NonNull Filer filer) {
for (var fileNameCandidate : this.platformFileNames) {
// find the expected template file in the resources directory
var templateFileName = String.format(TEMPLATE_FILE_NAME_FORMAT, fileNameCandidate);
var templateFile = ResourceUtil.resolveResource(filer, templateFileName);

// check if the template file exists & load it if it does
if (templateFile != null) {
try (var reader = Files.newBufferedReader(templateFile, StandardCharsets.UTF_8)) {
return this.parser.parse(reader);
} catch (IOException ignored) {
try {
var templateFileName = String.format(TEMPLATE_FILE_NAME_FORMAT, fileNameCandidate);
var templateFileResource = filer.getResource(StandardLocation.SOURCE_PATH, "", templateFileName);
try (var templateFileReader = templateFileResource.openReader(true)) {
return this.parser.parse(templateFileReader);
}
} catch (IOException _) {

@DasBabyPixel DasBabyPixel Oct 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should probably log this or comment why it doesn't need to be logged

}
}

// create a new empty file, the template file doesn't exist
return this.configFormat.createConfig();
}
}
121 changes: 0 additions & 121 deletions ...ssor/src/main/java/eu/cloudnetservice/ext/platforminject/processor/util/ResourceUtil.java
View file
Open in desktop

This file was deleted.

Loading