From 12935d958445c5d4b409c4f9915c41785d847b67 Mon Sep 17 00:00:00 2001 From: Adrian Date: Sat, 4 Nov 2023 09:32:10 -0500 Subject: [PATCH] fix: Update Blossom usage --- README.md | 7 +++---- common/build.gradle.kts | 12 +++++++++--- .../miniplaceholders/common/PluginConstants.java.peb | 7 +++++++ .../miniplaceholders/common/PluginConstants.java | 7 ------- gradle.properties | 4 ++-- gradle/libs.versions.toml | 3 ++- 6 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 common/src/main/java-templates/io/github/miniplaceholders/common/PluginConstants.java.peb delete mode 100644 common/src/main/java/io/github/miniplaceholders/common/PluginConstants.java diff --git a/README.md b/README.md index a31873a..1c4a876 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,14 @@ ![Modrinth Downloads](https://img.shields.io/modrinth/dt/HQyibRsN?logo=Modrinth&style=flat-square) ![GitHub Downloads](https://img.shields.io/github/downloads/MiniPlaceholders/MiniPlaceholders/total?logo=GitHub&style=flat-square) -MiniMessage Component-based Placeholders for PaperMC, Folia, Fabric, Sponge, Krypton and Velocity platforms +MiniMessage Component-based Placeholders for Paper, Fabric, Sponge, Folia and Velocity platforms ## Compatibility - Paper 1.19.3, 1.19.4+ -- Folia 1.19.4 +- Folia 1.19.4+ - Velocity 3.1.2+ - Fabric 1.19.4+ -- Sponge API 8, 9, 10 -- Krypton +- Sponge API 8+ ## Commands diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 562d77a..9a281b5 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("miniplaceholders.auto.module") + alias(libs.plugins.idea.ext) alias(libs.plugins.blossom) } @@ -16,7 +17,12 @@ dependencies { compileOnly(libs.adventure.minimesssage) } -blossom { - replaceToken("{version}", project.version) - replaceTokenIn("src/main/java/io/github/miniplaceholders/common/PluginConstants.java") +sourceSets { + main { + blossom { + javaSources { + property("version", project.version.toString()) + } + } + } } diff --git a/common/src/main/java-templates/io/github/miniplaceholders/common/PluginConstants.java.peb b/common/src/main/java-templates/io/github/miniplaceholders/common/PluginConstants.java.peb new file mode 100644 index 0000000..23cdb66 --- /dev/null +++ b/common/src/main/java-templates/io/github/miniplaceholders/common/PluginConstants.java.peb @@ -0,0 +1,7 @@ +package io.github.miniplaceholders.common; + +public final class PluginConstants { + public static final String VERSION = "{{ version }}"; + + private PluginConstants() {} +} diff --git a/common/src/main/java/io/github/miniplaceholders/common/PluginConstants.java b/common/src/main/java/io/github/miniplaceholders/common/PluginConstants.java deleted file mode 100644 index 37ab752..0000000 --- a/common/src/main/java/io/github/miniplaceholders/common/PluginConstants.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.miniplaceholders.common; - -public final class PluginConstants { - public static final String VERSION = "{version}"; - - private PluginConstants(){} -} diff --git a/gradle.properties b/gradle.properties index a5be6fc..4db600d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = io.github.miniplaceholders -version = 2.2.1 -description = MiniMessage Component-based Placeholders for Paper, Folia, Fabric, Sponge, velocity and Krypton platforms +version = 2.2.2-SNAPSHOT +description = MiniMessage Component-based Placeholders for Paper, Fabric, Sponge, Folia and Velocity platforms org.gradle.jvmargs=-Xmx2G \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9edcd59..5ba6a9b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ minecraft = "1.20.1" runtask = "2.2.0" pluginyml = "0.6.0" userdev = "1.5.9" -blossom = "1.3.1" +blossom = "2.1.0" indra = "3.1.3" shadow = "8.1.1" jmh = "0.7.2" @@ -76,3 +76,4 @@ blossom = { id = "net.kyori.blossom", version.ref = "blossom" } shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } jmh = { id = "me.champeau.jmh", version.ref = "jmh" } dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } +idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }