sayanvanish v2

.gitignore

@@ -43,4 +43,6 @@ bin/
 
 .idea
 **/run
-.kotlin
+.kotlin
+**/sayanvanish-test/**
+.gradle-local

.gitmodules

@@ -0,0 +1,8 @@
+[submodule "StickyNote"]
+	path = StickyNote
+	url = https://github.com/Sayan-Development/StickyNote.git
+	branch = pubsub-generic
+[submodule "docs"]
+	path = docs
+	url = https://github.com/Syrent/sayanvanish-docs.git
+	branch = main

README.md

@@ -128,14 +128,14 @@ The dependency artifact for the main API is `sayanvanish-api`.
 
 **Platform-Specific Dependencies**
 
-For platform-specific dependencies, the artifact ID follows the format `sayanvanish-<platform>`. Examples include `sayanvanish-bukkit` and `sayanvanish-proxy-velocity`.
+For platform-specific dependencies, the artifact ID follows the format `sayanvanish-<platform>`. Examples include `sayanvanish-paper` and `sayanvanish-proxy-velocity`.
 
 **In Maven**
 
 ```xml
 <dependency>
   <groupId>org.sayandev</groupId>
-  <artifactId>sayanvanish-bukkit</artifactId>
+  <artifactId>sayanvanish-paper</artifactId>
   <version>[get version from github]</version>
 </dependency>
 ```
@@ -145,21 +145,21 @@ For platform-specific dependencies, the artifact ID follows the format `sayanvan
 * **Groovy**
 
 ```groovy
-compileOnly "org.sayandev:sayanvanish-bukkit:[get version from github]"
+compileOnly "org.sayandev:sayanvanish-paper:[get version from github]"
 ```
 
 * **Kotlin**
 
 ```kotlin
-compileOnly("org.sayandev:sayanvanish-bukkit:[get version from github]")
+compileOnly("org.sayandev:sayanvanish-paper:[get version from github]")
 ```
 
 #### Accessing the API
 
 You can access the SayanVanish API like this:
 
 ```java
-SayanVanishAPI.getInstance();
+SayanVanishAPI;
 ```
 
 Or you can use a platform-specific user type like this:
@@ -177,7 +177,7 @@ SayanVanishBukkitAPI.getInstance();
 From this class, you can access and modify everything. For example, to add a new user:
 
 ```java
-SayanVanishAPI.getInstance().getDatabase().addUser(User);
+SayanVanishAPI.getDatabase().addUser(User);
 ```
 
 #### Events

build.gradle.kts

@@ -1,7 +1,8 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import com.google.gson.JsonParser
+import com.diffplug.gradle.spotless.SpotlessExtension
 import io.papermc.hangarpublishplugin.model.Platforms
-import org.gradle.kotlin.dsl.exclude
+import net.kyori.indra.licenser.spotless.IndraSpotlessLicenserExtension
+import org.sayandev.plugin.StickyNotePackagingMode
 import java.io.ByteArrayOutputStream
 import java.net.HttpURLConnection
 import java.net.URL
@@ -11,6 +12,7 @@ plugins {
     `maven-publish`
     id("io.papermc.hangar-publish-plugin") version "0.1.2"
     id("com.modrinth.minotaur") version "2.8.10"
+    id("net.kyori.indra.licenser.spotless") version "4.0.0" apply false
     id("org.sayandev.stickynote.project")
 }
 
@@ -31,11 +33,26 @@ fun lastCommitMessages(): String {
     val connection = url.openConnection() as HttpURLConnection
     connection.requestMethod = "GET"
     connection.setRequestProperty("Accept", "application/vnd.github.v3+json")
-    val response = connection.inputStream.bufferedReader().use { it.readText() }
-    val sha = JsonParser.parseString(response).asJsonObject.getAsJsonArray("workflow_runs").get(0).asJsonObject.get("head_sha").asString
+    // TODO: fix this
+    /*val response = runCatching { connection.inputStream.bufferedReader().use { it.readText() } }.getOrNull() ?: let {
+        println("Failed to fetch last commit messages from GitHub Actions API: ${connection.responseCode} ${connection.responseMessage}")
+        return "No recent commits found."
+    }
 
-    return executeGitCommand("log", "--pretty=format:%C(auto)%h %s %C(blue)<%an>", "$sha..HEAD")
-//    return "Dummy"
+    val sha = JsonParser.parseString(response).asJsonObject.getAsJsonArray("workflow_runs").let {
+        if (it.size() == 0) {
+            null
+        } else {
+            it.get(0).asJsonObject.get("head_sha").asString
+        }
+    }
+
+    return if (sha != null) {
+        executeGitCommand("log", "--pretty=format:%C(auto)%h %s %C(blue)<%an>", "$sha..HEAD")
+    } else {
+        "No changes"
+    }*/
+    return "Changelog unavailable due to API changes."
 }
 
 fun lastReleaseCommitMessages(): String {
@@ -44,11 +61,14 @@ fun lastReleaseCommitMessages(): String {
     connection.requestMethod = "GET"
     connection.setRequestProperty("Accept", "application/vnd.github.v3+json")
     val response = connection.inputStream.bufferedReader().use { it.readText() }
-    val previousReleaseVersion = JsonParser.parseString(response).asJsonArray.get(1).asJsonObject.get("tag_name").asString
+    // TODO: fix this
+    /*val previousReleaseVersion = JsonParser.parseString(response).asJsonArray.get(1).asJsonObject.get("tag_name").asString
 
     val currentProjectVersion = versionString
 
-    return executeGitCommand("log", "--pretty=format:%s%n", "$previousReleaseVersion..$currentProjectVersion")
+    return executeGitCommand("log", "--pretty=format:%s%n", "$previousReleaseVersion..$currentProjectVersion")*/
+
+    return "Changelog unavailable due to API changes."
 }
 
 val versionString: String = findProperty("version")!! as String
@@ -72,10 +92,49 @@ allprojects {
     version = findProperty("version")!! as String
 
     plugins.apply("java")
+    plugins.apply("org.jetbrains.kotlin.jvm")
+    plugins.apply("org.jetbrains.kotlin.plugin.serialization")
     plugins.apply("maven-publish")
-    plugins.apply("kotlin")
+    plugins.apply("com.gradleup.shadow")
+    plugins.apply("java-library")
     plugins.apply("org.sayandev.stickynote.project")
     plugins.apply("com.modrinth.minotaur")
+    if (path.startsWith(":sayanvanish")) {
+        plugins.apply("net.kyori.indra.licenser.spotless")
+
+        extensions.configure<IndraSpotlessLicenserExtension>("indraSpotlessLicenser") {
+            licenseHeaderFile(rootProject.file("license_header.txt"))
+            property("name", rootProject.name)
+            property("url", "https://github.com/Syrent/SayanVanish")
+        }
+
+        extensions.configure<SpotlessExtension>("spotless") {
+            java {
+                target("src/**/*.java")
+                targetExclude("**/generated/**", "**/build/**", "**/docs/**", "**/StickyNote/**")
+            }
+            kotlin {
+                target("src/**/*.kt")
+                targetExclude("**/generated/**", "**/build/**", "**/docs/**", "**/StickyNote/**")
+            }
+            groovy {
+                target("src/**/*.groovy")
+                targetExclude("**/generated/**", "**/build/**", "**/docs/**", "**/StickyNote/**")
+            }
+        }
+
+        pluginManager.withPlugin("com.diffplug.spotless") {
+            tasks.named("build") {
+                dependsOn("spotlessApply")
+            }
+        }
+    }
+
+    stickynote {
+        packagingMode(StickyNotePackagingMode.FAT)
+        useSubmodule(true)
+//        relocate(!gradle.startParameter.taskNames.any { it.startsWith("runServer") || it.startsWith("runVelocity") })
+    }
 
     repositories {
         mavenLocal()
@@ -176,23 +235,12 @@ allprojects {
 }
 
 subprojects {
-    configurations.create("compileOnlyApiResolved").apply {
-        isCanBeResolved = true
-        extendsFrom(configurations.getByName("compileOnlyApi"))
-    }
-
     java {
         withSourcesJar()
 
         disableAutoTargetJvm()
     }
 
-    val publicationShadowJar by tasks.registering(ShadowJar::class) {
-        from(sourceSets.main.get().output)
-        configurations = listOf(*configurations.get().toTypedArray(), this@subprojects.configurations["compileOnlyApiResolved"])
-        archiveClassifier.set("")
-    }
-
     tasks {
         jar {
             archiveClassifier.set("unshaded")
@@ -213,8 +261,7 @@ subprojects {
     publishing {
         publications {
             create<MavenPublication>("maven") {
-//                from(components["shadow"])
-                artifact(publicationShadowJar.get())
+                from(components["shadow"])
                 artifact(tasks["sourcesJar"])
                 this.version = versionString
 
@@ -272,19 +319,14 @@ hangarPublish {
 
         platforms {
             register(Platforms.PAPER) {
-                jar.set(project(":sayanvanish-bukkit").tasks.shadowJar.flatMap { it.archiveFile })
+                jar.set(project(":sayanvanish-paper").tasks.shadowJar.flatMap { it.archiveFile })
                 platformVersions.set((property("paperVersion") as String).split(",").map { it.trim() })
             }
 
             register(Platforms.VELOCITY) {
                 jar.set(project(":sayanvanish-proxy:sayanvanish-proxy-velocity").tasks.shadowJar.flatMap { it.archiveFile })
                 platformVersions.set((property("velocityVersion") as String).split(",").map { it.trim() })
             }
-
-            register(Platforms.WATERFALL) {
-                jar.set(project(":sayanvanish-proxy:sayanvanish-proxy-bungeecord").tasks.shadowJar.flatMap { it.archiveFile })
-                platformVersions.set((property("waterfallVersion") as String).split(",").map { it.trim() })
-            }
         }
     }
-}
+}

gradle.properties

@@ -4,27 +4,14 @@ org.gradle.parallel=true
 org.gradle.vfs.watch=true
 systemProp.file.encoding=utf-8
 
-paperVersion=1.8-1.21.11
-foliaVersion=1.19.4-1.21.11
+paperVersion=1.20.4-1.21.11
+foliaVersion=1.20.4-1.21.11
 velocityVersion=3.0-3.4
-waterfallVersion=1.11-1.21
 
 modrinthProjectID=hkzyeLcD
-modrinthMinecraftVersions=1.8.9,\
-  1.9,1.9.1,1.9.2,1.9.3,1.9.4,\
-  1.10,1.10.1,1.10.2,\
-  1.11,1.11.1,1.11.2,\
-  1.12,1.12.1,1.12.2,\
-  1.13,1.13.1,1.13.2,\
-  1.14,1.14.1,1.14.2,1.14.3,1.14.4,\
-  1.15,1.15.1,1.15.2,\
-  1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,\
-  1.17,1.17.1,\
-  1.18,1.18.1,1.18.2,\
-  1.19,1.19.1,1.19.2,1.19.3,1.19.4,\
-  1.20,1.20.1,1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,\
-  1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.8,1.21.10,1.21.11
-modrinthLoaders=paper,purpur,spigot,velocity,bungeecord,waterfall,folia
+modrinthMinecraftVersions=1.20.4,1.20.5,1.20.6\
+  1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11
+modrinthLoaders=paper,purpur,velocity,folia
 
 group=org.sayandev
 slug=sayanvanish
@@ -33,4 +20,7 @@ description=A modular vanish system for Minecraft servers
 website=https://sayandev.org
 author=Syrent
 
-version=1.7.3
+version=2.0.0-alpha.4
+
+stickynote.useSubmodule=true
+stickynote.submodulePath=StickyNote

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

license_header.txt

@@ -0,0 +1,16 @@
+This file is part of $name, licensed under the GNU General Public License v3.0.
+
+Copyright (c) $YEAR Sayan Development and contributors
+
+$name is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+$name is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.

sayanvanish-api/build.gradle.kts

@@ -1,3 +1,16 @@
+stickynote {
+    registerModule(core {
+        database
+        configuration {
+            kotlinx
+        }
+        messaging {
+            redis
+            websocket
+        }
+    })
+}
+
 dependencies {
     compileOnlyApi(libs.discordsrv)
     compileOnlyApi(libs.luckperms.api)

sayanvanish-api/src/main/kotlin/org/sayandev/sayanvanish/api/APIPlatformAdapter.kt

@@ -0,0 +1,29 @@
+/*
+ * This file is part of SayanVanish, licensed under the GNU General Public License v3.0.
+ *
+ * Copyright (c) 2026 Sayan Development and contributors
+ *
+ * SayanVanish is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SayanVanish is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.sayandev.sayanvanish.api
+
+class APIPlatformAdapter : PlatformAdapter<User, VanishUser> {
+    override fun adapt(user: User): User {
+        return user
+    }
+
+    override fun adapt(vanishUser: VanishUser): VanishUser {
+        return vanishUser
+    }
+}