From 7aa0007bfc80b879ac1cae53ce4bbf8f72aa79e1 Mon Sep 17 00:00:00 2001
From: Adrian <adriangonzalesval@gmail.com>
Date: Sun, 5 Nov 2023 23:02:09 -0500
Subject: [PATCH] fix: Updated blossom usage

---
 gradle/libs.versions.toml                            |  5 +++--
 velocity/build.gradle.kts                            | 12 +++++++++---
 .../expansion/luckperms/velocity/Constants.java.peb} |  3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)
 rename velocity/src/main/{java/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java => java-templates/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java.peb} (54%)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f2114d4..b05420e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,9 +3,9 @@ metadata.format.version = "1.1"
 [versions]
 
 velocity = "3.2.0-SNAPSHOT"
-paper = "1.19.3-R0.1-SNAPSHOT"
+paper = "1.20.2-R0.1-SNAPSHOT"
 
-blossom = "1.3.1"
+blossom = "2.1.0"
 shadow = "8.1.1"
 runtask = "2.1.0"
 pluginyml = "0.6.0"
@@ -42,3 +42,4 @@ shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
 runvelocity = { id = "xyz.jpenilla.run-velocity", version.ref = "runtask" }
 runpaper = { id = "xyz.jpenilla.run-velocity", version.ref = "runtask" }
 pluginyml = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }
+idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.1.7" }
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index c9d56a4..ff14f36 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    alias(libs.plugins.idea.ext)
     alias(libs.plugins.blossom)
 }
 
@@ -10,7 +11,12 @@ dependencies {
     implementation(projects.luckpermsExpansionCommon)
 }
 
-blossom {
-    replaceTokenIn("src/main/java/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java")
-    replaceToken("{version}", project.version)
+sourceSets {
+    main {
+        blossom {
+            javaSources {
+                property("version", project.version.toString())
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/velocity/src/main/java/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java b/velocity/src/main/java-templates/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java.peb
similarity index 54%
rename from velocity/src/main/java/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java
rename to velocity/src/main/java-templates/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java.peb
index 74ba4ca..d5642c9 100644
--- a/velocity/src/main/java/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java
+++ b/velocity/src/main/java-templates/io/github/miniplaceholders/expansion/luckperms/velocity/Constants.java.peb
@@ -1,5 +1,6 @@
 package io.github.miniplaceholders.expansion.luckperms.velocity;
 
 public class Constants {
-    static final String VERSION = "{version}";
+    private Constants() {}
+    static final String VERSION = "{{ version }}";
 }