chore: Separate plugin from api

Author: Adrigamer2950

build.gradle.kts

@@ -2,7 +2,6 @@
 
 import xyz.jpenilla.runtask.task.AbstractRun
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 import xyz.jpenilla.runpaper.task.RunServer
 import io.papermc.hangarpublishplugin.model.Platforms
 import org.gradle.internal.extensions.stdlib.toDefaultLowerCase
@@ -11,7 +10,6 @@ import java.io.ByteArrayOutputStream
 plugins {
     id("java")
     id("maven-publish")
-    alias(libs.plugins.plugin.yml)
     alias(libs.plugins.minotaur)
     alias(libs.plugins.run.server)
     alias(libs.plugins.shadow)
@@ -25,6 +23,7 @@ val version = properties["version"] as String +
         if (versionIsBeta)
             "-${getGitCommitHash()}"
         else ""
+val targetJavaVersion = (properties["java-version"] as String).toInt()
 
 if (project.hasProperty("NEXUS_USERNAME") && project.hasProperty("NEXUS_PASSWORD")) {
     java {
@@ -87,88 +86,60 @@ if (project.hasProperty("NEXUS_USERNAME") && project.hasProperty("NEXUS_PASSWORD
 }
 
 allprojects {
+    apply(plugin = "java")
+
     repositories {
         mavenCentral()
         maven {
             name = "papermc-repo"
             url = uri("https://repo.papermc.io/repository/maven-public/")
         }
+        maven {
+            name = "AlessioDP"
+            url = uri("https://repo.alessiodp.com/releases")
+        }
     }
-}
 
-repositories {
-    maven {
-        name = "sonatype"
-        url = uri("https://oss.sonatype.org/content/groups/public/")
+    dependencies {
+        // JetBrains Annotations
+        compileOnly(rootProject.libs.jetbrains.annotations)
+
+        // Lombok
+        compileOnly(rootProject.libs.lombok)
+        annotationProcessor(rootProject.libs.lombok)
     }
-    maven {
-        name = "AlessioDP"
-        url = uri("https://repo.alessiodp.com/releases")
+
+    tasks.withType<JavaCompile>().configureEach {
+        if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible) {
+            options.release = targetJavaVersion
+            options.encoding = "UTF-8"
+        }
+    }
+
+    java {
+        val javaVersion = JavaVersion.toVersion(targetJavaVersion)
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
+        if (JavaVersion.current() < javaVersion) {
+            toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+        }
     }
 }
 
 dependencies {
-    // JetBrains Annotations
-    compileOnly(libs.jetbrains.annotations)
-
-    // Paper API
     compileOnly(libs.paper.api)
 
-    // Lombok
-    compileOnly(libs.lombok)
-    annotationProcessor(libs.lombok)
+    implementation(libs.bundles.shade)
 
-    // Ansi
-    compileOnly(libs.jansi)
-    bukkitLibrary(libs.jansi)
-
-    // Libby
-    implementation(libs.libby)
-
-    // Folia module
     implementation(project(":folia"))
-}
-
-val targetJavaVersion = 17
-
-tasks.withType<JavaCompile>().configureEach {
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible) {
-        options.release = targetJavaVersion
-        options.encoding = "UTF-8"
-    }
-}
 
-java {
-    val javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    sourceCompatibility = javaVersion
-    targetCompatibility = javaVersion
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-    }
+    implementation(project(":plugin"))
 }
 
 tasks.named<Jar>("jar") {
     enabled = false
 }
 
-bukkit {
-    name = "AdriAPI"
-    main = "me.adrigamer2950.adriapi.AdriAPI"
-    apiVersion = "1.17"
-    author = properties["author"] as String?
-    description = properties["description"] as String?
-    website = "https://github.com/Adrigamer2950/AdriAPI"
-    load = BukkitPluginDescription.PluginLoadOrder.STARTUP
-    foliaSupported = true
-
-    commands {
-        register("adriapi") {
-            description = "Main command"
-            usage = "/adriapi"
-        }
-    }
-}
-
 fun getJarFile(): File? {
     val jarFile = File("./gh-assets").listFiles()?.firstOrNull { it.name.endsWith(".jar") }
     return jarFile

gradle.properties

@@ -1,3 +1,5 @@
 version=2.3.0-BETA
 description=An API aimed to simplify the development of Paper plugins
-author=Adrigamer2950
+author=Adrigamer2950
+
+java-version=17

gradle/libs.versions.toml

@@ -24,4 +24,7 @@ plugin-yml = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "plugin-yml
 minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
 run-server = { id = "xyz.jpenilla.run-paper", version.ref = "run-server" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow"}
-hangar-publish = { id = "io.papermc.hangar-publish-plugin", version.ref = "hangar-publish-plugin" }
+hangar-publish = { id = "io.papermc.hangar-publish-plugin", version.ref = "hangar-publish-plugin" }
+
+[bundles]
+shade = ["jansi", "libby"]

plugin/build.gradle.kts

@@ -0,0 +1,40 @@
+@file:Suppress("VulnerableLibrariesLocal")
+
+import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
+
+plugins {
+    id("java")
+    alias(libs.plugins.plugin.yml)
+}
+
+dependencies {
+    // Paper API
+    compileOnly(libs.paper.api)
+
+    // Ansi
+    compileOnly(libs.jansi)
+
+    // Libby
+    compileOnly(libs.libby)
+
+    // Folia module
+    compileOnly(project(":folia"))
+}
+
+bukkit {
+    name = "AdriAPI"
+    main = "me.adrigamer2950.adriapi.plugin.AdriAPI"
+    apiVersion = "1.17"
+    author = properties["author"] as String?
+    description = properties["description"] as String?
+    website = "https://github.com/Adrigamer2950/AdriAPI"
+    load = BukkitPluginDescription.PluginLoadOrder.STARTUP
+    foliaSupported = true
+
+    commands {
+        register("adriapi") {
+            description = "Main command"
+            usage = "/adriapi"
+        }
+    }
+}

src/main/java/me/adrigamer2950/adriapi/AdriAPI.java renamed to plugin/src/main/java/me/adrigamer2950/adriapi/plugin/AdriAPI.java

@@ -1,4 +1,4 @@
-package me.adrigamer2950.adriapi;
+package me.adrigamer2950.adriapi.plugin;
 
 import me.adrigamer2950.adriapi.api.APIPlugin;
 import me.adrigamer2950.adriapi.listeners.CustomEventsListener;

src/main/java/me/adrigamer2950/adriapi/AdriAPICommand.java renamed to plugin/src/main/java/me/adrigamer2950/adriapi/plugin/AdriAPICommand.java

@@ -1,4 +1,4 @@
-package me.adrigamer2950.adriapi;
+package me.adrigamer2950.adriapi.plugin;
 
 import me.adrigamer2950.adriapi.api.command.Command;
 import me.adrigamer2950.adriapi.api.user.User;

src/main/java/me/adrigamer2950/adriapi/listeners/CustomEventsListener.java renamed to plugin/src/main/java/me/adrigamer2950/adriapi/plugin/listeners/CustomEventsListener.java

@@ -1,4 +1,4 @@
-package me.adrigamer2950.adriapi.listeners;
+package me.adrigamer2950.adriapi.plugin.listeners;
 
 import me.adrigamer2950.adriapi.api.event.item.ItemCraftedEvent;
 import org.bukkit.Bukkit;

src/main/java/me/adrigamer2950/adriapi/listeners/InventoriesListener.java renamed to plugin/src/main/java/me/adrigamer2950/adriapi/plugin/listeners/InventoriesListener.java

@@ -1,4 +1,4 @@
-package me.adrigamer2950.adriapi.listeners;
+package me.adrigamer2950.adriapi.plugin.listeners;
 
 import me.adrigamer2950.adriapi.api.inventory.Inventory;
 import org.bukkit.event.EventHandler;

settings.gradle.kts

@@ -4,4 +4,4 @@ plugins {
 
 rootProject.name = "AdriAPI"
 
-include("folia")
+include("folia", "plugin")

src/main/java/me/adrigamer2950/adriapi/api/inventory/Inventory.java

@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.NonNull;
 import me.adrigamer2950.adriapi.api.user.User;
-import me.adrigamer2950.adriapi.listeners.InventoriesListener;
+import me.adrigamer2950.adriapi.plugin.listeners.InventoriesListener;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.event.inventory.InventoryClickEvent;