diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 33ac686..5d107c9 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -17,12 +17,16 @@ dependencies { testImplementation(libs.assertj) } -blossom { - replaceTokenIn("src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java") - replaceToken("{version}", project.version) - replaceToken("{description}", project.description) - replaceToken("{configurate}", libs.versions.configurate.get()) - replaceToken("{geantyref}", libs.versions.geantyref.get()) +sourceSets { + main { + blossom { + javaSources { + property("version", project.version.toString()) + property("configurate", libs.versions.configurate.get()) + property("geantyref", libs.versions.geantyref.get()) + } + } + } } tasks { diff --git a/common/src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java b/common/src/main/java-templates/io/github/_4drian3d/authmevelocity/common/Constants.java.peb similarity index 77% rename from common/src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java rename to common/src/main/java-templates/io/github/_4drian3d/authmevelocity/common/Constants.java.peb index ed64344..9890591 100644 --- a/common/src/main/java/io/github/_4drian3d/authmevelocity/common/Constants.java +++ b/common/src/main/java-templates/io/github/_4drian3d/authmevelocity/common/Constants.java.peb @@ -20,8 +20,7 @@ package io.github._4drian3d.authmevelocity.common; public final class Constants { private Constants() {} - public static final String VERSION = "{version}"; - public static final String DESCRIPTION = "{description}"; - public static final String CONFIGURATE = "{configurate}"; - public static final String GEANTYREF = "{geantyref}"; -} + public static final String VERSION = "{{ version }}"; + public static final String CONFIGURATE = "{{ configurate }}"; + public static final String GEANTYREF = "{{ geantyref }}"; +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fce4c60..89af0eb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ bstats = "3.0.2" shadow = "8.1.1" configurate = "4.1.2" adventure = "4.14.0" -blossom = "1.3.1" +blossom = "2.0.1" geantyref = "1.3.13" indra = "3.1.2" runtask = "2.1.0" diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java index a950323..b650115 100644 --- a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/AuthMeVelocityPlugin.java @@ -70,7 +70,7 @@ import java.util.stream.Stream; id = "authmevelocity", name = "AuthMeVelocity", url = "https://modrinth.com/plugin/authmevelocity", - description = Constants.DESCRIPTION, + description = "AuthMeReloaded Support for Velocity", version = Constants.VERSION, authors = {"xQuickGlare", "4drian3d"}, dependencies = {