.github/workflows/build.yml

@@ -1,22 +1,26 @@
-name: Build
+name: Build & Publish
 
-on: [
-  workflow_dispatch,
-  push
-]
+on:
+  workflow_dispatch:
+    inputs:
+      publish:
+        default: false
+        type: boolean
+        description: Whether to publish the release of not
+        required: true
+  push:
+
+env:
+  COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
 
 jobs:
   build:
-    name: Build & Publish
+    name: Build
     runs-on: ubuntu-latest
 
     permissions:
       contents: read
 
-    env:
-      BUILD_NUMBER: "${{ github.run_number }}"
-      COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-
     steps:
       - uses: actions/checkout@v4
         name: Checkout sources
@@ -31,7 +35,7 @@ jobs:
         name: Setup Gradle
 
       - name: Build Artifact
-        run: "chmod +x ./gradlew && ./gradlew build $([[ \"$COMMIT_MESSAGE\" == \"release:\"* ]] && echo || echo -PBUILD_NUMBER=$BUILD_NUMBER)"
+        run: "chmod +x ./gradlew && ./gradlew build"
 
       - uses: actions/upload-artifact@v4
         name: Save Artifact
@@ -44,10 +48,47 @@ jobs:
         env:
           NEXUS_USERNAME: "${{ secrets.NEXUS_USERNAME }}"
           NEXUS_PASSWORD: "${{ secrets.NEXUS_PASSWORD }}"
-        run: "./gradlew publish -PNEXUS_USERNAME=$NEXUS_USERNAME -PNEXUS_PASSWORD=$NEXUS_PASSWORD $([[ \"$COMMIT_MESSAGE\" == \"release:\"* ]] && echo \"\" || echo \"-PBUILD_NUMBER=$BUILD_NUMBER\")"
+        run: "./gradlew :api:publish -PNEXUS_USERNAME=$NEXUS_USERNAME -PNEXUS_PASSWORD=$NEXUS_PASSWORD"
+  publish:
+    if: ${{ github.repository == 'Adrigamer2950/AdriAPI' &&
+      ( startsWith(github.event.head_commit.message, 'release:') 
+      || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish) ) }}
+    name: Publish Release
+    runs-on: ubuntu-latest
+    needs:
+      - build
+
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout sources
+
+      - uses: actions/setup-java@v4
+        name: Set up JDK 17
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - uses: gradle/actions/setup-gradle@v4
+        name: Setup Gradle
+
+      - name: Create gh-assets directory
+        run: "mkdir gh-assets"
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: "AdriAPI-b${{ github.run_number }}"
+          path: "./gh-assets"
+
+      - name: Publish to HangarMC
+        env:
+          HANGAR_API_TOKEN: ${{ secrets.HANGAR_API_TOKEN }}
+        run: "chmod +x ./gradlew && ./gradlew publishPluginPublicationToHangar"
 
       - name: Publish to Modrinth
-        if: "${{ github.repository == 'Adrigamer2950/AdriAPI' && startsWith(github.event.head_commit.message, 'release:') }}"
         env:
           MODRINTH_TOKEN: "${{ secrets.MODRINTH_TOKEN }}"
-        run: "./gradlew modrinth modrinthSyncBody"
+        run: "./gradlew modrinth modrinthSyncBody"

README.md

@@ -3,18 +3,24 @@
     <img src="https://avatars.githubusercontent.com/u/58531641?v=4" height="200" alt="Logo" />
 </p>
 
-An API created to make Minecraft Plugin development easier
+An API aimed to simplify the development of Paper plugins
 
 ![Build](https://github.com/Adrigamer2950/AdriAPI/actions/workflows/build.yml/badge.svg)
 
-# Resources
-- [Docs](https://docs.devadri.es)
-- [bStats](https://bstats.org/plugin/bukkit/AdriAPI/20135)
-- [Maven Repository](https://repo.devadri.es)
-
 # Info
 
-This API is aimed to simplify the development of Bukkit plugins (please use Paper or any fork of Paper instead of CraftBukkit/Spigot), 
+This API is aimed to simplify the development of Paper plugins,
 providing a lot of utilities that will make your life (and mine) easier.
 
-### It's used in my plugins, but you can use it on your own plugins if you want, just make sure to give proper credit!
+> [!CAUTION]
+> You need Java 17+ to use this API/Plugin. If you are using a lower version consider upgrading
+
+> [!WARNING]
+> Only Minecraft 1.17 or superior is officially supported. Versions below 1.17 will not receive any support
+
+### It's mostly used in my plugins, but you can use it on your own plugins if you want, just make sure to give proper credit!
+
+# Resources
+- [Docs](https://docs.devadri.es)
+- [bStats](https://bstats.org/plugin/bukkit/AdriAPI/20135)
+- [Maven Repository](https://repo.devadri.es)

api/build.gradle.kts

@@ -0,0 +1,98 @@
+@file:Suppress("VulnerableLibrariesLocal")
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.internal.extensions.stdlib.toDefaultLowerCase
+
+plugins {
+    id("java")
+    id("maven-publish")
+    alias(libs.plugins.shadow)
+}
+
+val versionIsBeta = (parent?.properties?.get("version") as String).toDefaultLowerCase().contains("beta")
+
+if (project.hasProperty("NEXUS_USERNAME") && project.hasProperty("NEXUS_PASSWORD")) {
+    java {
+        withJavadocJar()
+        withSourcesJar()
+    }
+
+    publishing {
+        repositories {
+            maven {
+                val baseUrl = "https://repo.devadri.es/repository/"
+
+                url = uri(
+                    baseUrl + if (versionIsBeta) "dev" else "releases"
+                )
+                credentials {
+                    username = project.property("NEXUS_USERNAME") as String
+                    password = project.property("NEXUS_PASSWORD") as String
+                }
+            }
+        }
+        publications {
+            create<MavenPublication>("shadow") {
+                groupId = rootProject.group as String
+                artifactId = rootProject.name
+                version = rootProject.version as String
+
+                from(components["shadow"])
+                pom {
+                    name = rootProject.name
+                    description.set(parent?.properties?.get("description") as String)
+                    url = "https://github.com/Adrigamer2950/AdriAPI"
+
+                    licenses {
+                        license {
+                            name = "GPL-3.0"
+                            url = "https://www.gnu.org/licenses/gpl-3.0.html"
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id = "Adrigamer2950"
+                            name = "Adri"
+                        }
+                    }
+
+                    scm {
+                        url = "https://github.com/Adrigamer2950/AdriAPI"
+                    }
+
+                    issueManagement {
+                        system = "GitHub"
+                        url = "https://github.com/Adrigamer2950/AdriAPI/issues"
+                    }
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    compileOnly(libs.paper.api)
+
+    implementation(libs.jansi)
+
+    implementation(libs.libby)
+
+    implementation(project(":folia"))
+
+    compileOnly(libs.boosted.yaml)
+}
+
+tasks.named<ShadowJar>("shadowJar") {
+    archiveClassifier.set("")
+
+    dependencies {
+        relocate("net.byteflux.libby", "me.adrigamer2950.adriapi.lib.libby")
+
+        relocate("org.fusesource.jansi", "me.adrigamer2950.adriapi.lib.jansi")
+    }
+}
+
+tasks.named("build") {
+    finalizedBy(tasks.named("shadowJar"))
+}

src/main/java/me/adrigamer2950/adriapi/api/APIPlugin.java → api/src/main/java/me/adrigamer2950/adriapi/api/APIPlugin.java

@@ -4,12 +4,11 @@
 import lombok.NonNull;
 import me.adrigamer2950.adriapi.api.command.Command;
 import me.adrigamer2950.adriapi.api.command.manager.CommandManager;
-import me.adrigamer2950.adriapi.api.folia.Scheduler;
+import me.adrigamer2950.adriapi.api.scheduler.Scheduler;
 import me.adrigamer2950.adriapi.api.library.manager.LibraryManager;
 import me.adrigamer2950.adriapi.api.logger.APILogger;
 import me.adrigamer2950.adriapi.api.util.ServerType;
 import me.adrigamer2950.adriapi.api.util.bStats;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.ApiStatus;
@@ -35,20 +34,21 @@ public abstract class APIPlugin extends JavaPlugin {
     private Scheduler scheduler;
     private bStats bstats;
     private ServerType serverType;
-    private BukkitAudiences adventure;
-    protected LibraryManager libraryManager;
+    private LibraryManager libraryManager;
 
     @Override
-    public final void onEnable() {
+    public final void onLoad() {
         this.serverType = ServerType.getType();
-        this.adventure = BukkitAudiences.create(this);
         this.libraryManager = LibraryManager.get(this);
 
         onPreLoad();
 
         this.getLogger().debug("&6Loading hooks...");
         loadHooks();
+    }
 
+    @Override
+    public final void onEnable() {
         this.getLogger().debug("&6Enabling plugin...");
         onPostLoad();
     }
@@ -58,7 +58,7 @@ private void loadHooks() {
         this.commandManager = new CommandManager<>(this);
 
         this.getLogger().debug("&6Loading Scheduler...");
-        this.scheduler = new Scheduler(this);
+        this.scheduler = Scheduler.get(this, this.getServerType().equals(ServerType.FOLIA));
 
         if (this.getBStatsServiceId() != 0) {
             this.getLogger().debug("&6Loading bStats hook...");
@@ -91,7 +91,6 @@ public final void onDisable() {
         if (this.bstats != null) this.bstats.shutdown();
         this.bstats = null;
         this.serverType = null;
-        this.adventure = null;
         this.libraryManager = null;
     }
 

src/main/java/me/adrigamer2950/adriapi/api/colors/Colors.java → api/src/main/java/me/adrigamer2950/adriapi/api/colors/Colors.java

@@ -9,7 +9,6 @@
  * You can also use a custom color code
  * system that's easier to remember than Bukkit one.
  */
-@SuppressWarnings("deprecation")
 public class Colors {
 
     /**

src/main/java/me/adrigamer2950/adriapi/api/command/manager/CommandManager.java → api/src/main/java/me/adrigamer2950/adriapi/api/command/manager/CommandManager.java

@@ -4,14 +4,11 @@
 import me.adrigamer2950.adriapi.api.APIPlugin;
 import me.adrigamer2950.adriapi.api.command.Command;
 import me.adrigamer2950.adriapi.api.event.command.CommandLoadedEvent;
-import me.adrigamer2950.adriapi.api.exceptions.DuplicatedManagerException;
 import me.adrigamer2950.adriapi.api.exceptions.command.CommandNotInPluginYMLException;
 import me.adrigamer2950.adriapi.api.logger.APILogger;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.PluginCommand;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.ApiStatus;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,43 +26,17 @@ public final class CommandManager<T extends APIPlugin> {
 
     public final APILogger LOGGER;
     private final List<Command<? extends APIPlugin>> cmds = new ArrayList<>();
-    @ApiStatus.Internal
-    public static final List<CommandManager<? extends APIPlugin>> COMMAND_MANAGERS = new ArrayList<>();
-
-    /**
-     * @param plugin The plugin
-     * @return The plugin if it has a Command Manager, null otherwise
-     */
-    public static CommandManager<? extends APIPlugin> getManager(Plugin plugin) {
-        for (CommandManager<? extends APIPlugin> cmdM : COMMAND_MANAGERS)
-            if (cmdM.getPlugin().equals(plugin))
-                return cmdM;
-
-        return null;
-    }
 
     @Getter
     private final T plugin;
 
     /**
      * @param pl The plugin
      */
-    @SuppressWarnings("deprecation")
     public CommandManager(T pl) {
-        if (getManager(pl) != null) {
-            throw new DuplicatedManagerException(
-                    String.format("Command Manager for plugin %s v%s has already been created and cannot be duplicated",
-                            pl.getName(),
-                            pl.getDescription().getVersion()
-                    )
-            );
-        }
-
         this.plugin = pl;
 
         this.LOGGER = this.plugin.getLogger();
-
-        COMMAND_MANAGERS.add(this);
     }
 
     /**
@@ -84,7 +55,7 @@ public void registerCommand(Command<? extends APIPlugin> command) {
         CommandMap commandMap = command.getPlugin().getServer().getCommandMap();
 
         if (commandMap.getCommand(command.getName()) == null) {
-            commandMap.register(command.getPlugin().getPluginMeta().getName(), command);
+            commandMap.register(command.getPlugin().getDescription().getName(), command);
         } else {
             PluginCommand plCmd = command.getPlugin().getServer().getPluginCommand(command.getName());
             if (plCmd == null || plCmd.getPlugin() != command.getPlugin()) {
@@ -101,7 +72,6 @@ public void registerCommand(Command<? extends APIPlugin> command) {
         CommandLoadedEvent event = new CommandLoadedEvent(command, plugin);
         Bukkit.getPluginManager().callEvent(event);
 
-        //noinspection deprecation
         LOGGER.debug(
                 String.format("Command '%s' for plugin %s v%s has been successfully loaded", command.getName(), command.getPlugin().getName(), command.getPlugin().getDescription().getVersion())
         );