feature: Command system almost-complete rework

.checkstyle/checkstyle.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+ "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+ <module name="TreeWalker">
+ <!-- Currently only a few rules, will add more -->
+ <module name="AvoidStarImport"/>
+ <module name="UnusedImports"/>
+ </module>
+</module>

.github/workflows/checks.yml

@@ -0,0 +1,35 @@
+# This is a basic workflow to help you get started with Actions
+name: Checks
+
+# Controls when the workflow will run
+on:
+ push:
+ branches: [ "**" ]
+
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+ gradle:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-java@v3
+ with:
+ distribution: temurin
+ java-version: 17
+
+ - name: Setup Gradle
+ uses: gradle/gradle-build-action@v2
+
+ - name: Checkstyle
+ run: ./gradlew checkstyleMain
+
+ - name: Spotless check
+ run: ./gradlew spotlessCheck
+
+ - name: License check
+ run: ./gradlew license

.gitignore

@@ -47,7 +47,6 @@
 
 # CMake
 cmake-build-*/
-
 # Mongo Explorer plugin
 .idea/**/mongoSettings.xml
 

README.md

@@ -9,7 +9,8 @@ With this, your parameters are the command's arguments!
 
 ## Features
 
-- Simplifies how you handle your command arguments, instead of having an array with arguments and handling it one by one, simply add what you want to the parameters of your command method.
+- Simplifies how you handle your command arguments, instead of having an array with arguments and handling it one by
+ one, simply add what you want to the parameters of your command method.
 - Small, adds only 32KB to your project.
 - All messages are customizable.
 - Makes having multiple commands even easier.
@@ -28,13 +29,14 @@ You can find the documentation [**here**](https://triumphteam.dev/library/triump
 
 ## Contributing
 
-Found any issue? Please report it [**here**](https://github.com/TriumphTeam/triumph-cmds/issues). 
+Found any issue? Please report it [**here**](https://github.com/TriumphTeam/triumph-cmds/issues).
 Feel free to PR any changes you'd like to see in it! 
 The source code can be found [**here**](https://github.com/TriumphTeam/triumph-cmds).
 
 ## GUI
 
-**Triumph** also has an additional lib to make easier GUI's in Spigot, you can read more about it [**here**](https://triumphteam.dev/library/triumph-gui/introduction).
+**Triumph** also has an additional lib to make easier GUI's in Spigot, you can read more about it [**here
+**](https://triumphteam.dev/library/triumph-gui/introduction).
 
 ## Other
 

build-logic/build.gradle.kts

@@ -2,11 +2,10 @@ plugins {
  `kotlin-dsl`
 }
 
-repositories {
- gradlePluginPortal()
-}
-
 dependencies {
- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20")
- implementation("gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1")
-}
+ // Hack to allow version catalog inside convention plugins
+ implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+
+ // Bundled plugins
+ implementation(libs.bundles.build)
+}

build-logic/settings.gradle.kts

@@ -0,0 +1,15 @@
+rootProject.name = "build-logic"
+
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+ repositories {
+ gradlePluginPortal()
+ mavenCentral()
+ }
+
+ versionCatalogs {
+ register("libs") {
+ from(files("../gradle/libs.versions.toml")) // include from parent project
+ }
+ }
+}

build-logic/src/main/kotlin/cmds.base-conventions.gradle.kts

@@ -1,18 +1,25 @@
+import com.diffplug.gradle.spotless.FormatExtension
+import org.gradle.accessors.dm.LibrariesForLibs
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
+// Hack which exposes `libs` to this convention plugin
+val libs = the<LibrariesForLibs>()
+
 plugins {
  `java-library`
- id("com.github.hierynomus.license")
  kotlin("jvm")
+ id("com.github.hierynomus.license")
+ id("com.diffplug.spotless")
+ id("net.kyori.indra")
+ id("net.kyori.indra.checkstyle")
 }
 
 repositories {
  mavenCentral()
- mavenLocal()
 }
 
 dependencies {
- compileOnly("org.jetbrains:annotations:23.0.0")
+ compileOnly(libs.annotations)
 }
 
 java {
@@ -22,20 +29,59 @@ java {
  withJavadocJar()
 }
 
+kotlin {
+ explicitApi()
+}
+
 license {
  header = rootProject.file("LICENSE")
  encoding = "UTF-8"
- mapping("kotlin", "JAVADOC_STYLE")
- mapping("java", "JAVADOC_STYLE")
+ useDefaultMappings = true
 
  include("**/*.kt")
  include("**/*.java")
 }
 
+indra {
+ checkstyle()
+}
+
+fun FormatExtension.defaults() {
+ trimTrailingWhitespace()
+ endWithNewline()
+ indentWithSpaces(4)
+}
+
+spotless {
+ format("format") {
+ defaults()
+
+ target(
+ "*.md",
+ ".gitignore",
+ "*.properties",
+ )
+ }
+
+ java {
+ defaults()
+ formatAnnotations()
+ }
+
+ kotlin {
+ defaults()
+ ktlint("0.47.1").editorConfigOverride(
+ mapOf(
+ "ktlint_disabled_rules" to "filename,trailing-comma-on-call-site,trailing-comma-on-declaration-site",
+ )
+ )
+ }
+}
+
 tasks {
  withType<JavaCompile> {
  options.encoding = "UTF-8"
- //options.compilerArgs.add("-Xlint:unchecked")
+ options.compilerArgs.add("-parameters")
  }
 
  withType<KotlinCompile> {
@@ -44,4 +90,4 @@ tasks {
  javaParameters = true
  }
  }
-}
+}

build-logic/src/main/kotlin/cmds.library-conventions.gradle.kts

@@ -31,7 +31,7 @@ tasks {
 
  developers {
  developer {
- id.set("matt")
+ id.set("Matt")
  name.set("Mateus Moreira")
  }
  }
@@ -57,4 +57,4 @@ tasks {
  }
  }
  }
-}
+}

build-logic/src/main/kotlin/cmds.logger-conventions.gradle.kts

@@ -0,0 +1,19 @@
+
+import org.gradle.accessors.dm.LibrariesForLibs
+
+// Hack which exposes `libs` to this convention plugin
+val libs = the<LibrariesForLibs>()
+
+plugins {
+ `java-library`
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ implementation(libs.logger.api)
+ implementation(libs.logger.core)
+ implementation(libs.logger.impl)
+}

build-logic/src/main/kotlin/cmds.parent-conventions.gradle.kts

@@ -1,30 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
  `java-library`
  kotlin("jvm")
 }
-
-repositories {
- mavenCentral()
- mavenLocal()
-}
-
-java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks {
- withType<JavaCompile> {
- options.encoding = "UTF-8"
- //options.compilerArgs.add("-Xlint:unchecked")
- }
-
- withType<KotlinCompile> {
- kotlinOptions {
- jvmTarget = "1.8"
- javaParameters = true
- }
- }
-}

core/build.gradle.kts

@@ -16,4 +16,4 @@ tasks {
  test {
  useJUnitPlatform()
  }
-}
+}