Code refactoring.

Removed annotations for `configuration`, `commands` and `module`.
Removed `kotlin-reflect` from dependencies.
Code cleanup, and simplified.
Klaxon removed from dependencies.
Cooldown removed from dependencies.

Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>

Author: MairwunNx

build.gradle

@@ -34,14 +34,6 @@ minecraft {
 }
 
 repositories {
-    maven {
-        name = package_maven_repo_name
-        url = uri "$package_maven_repo-cooldown"
-        credentials {
-            username = package_maven_repo_mail
-            password = packagesToken
-        }
-    }
     maven { url 'https://libraries.minecraft.net' }
     mavenCentral()
     jcenter()
@@ -50,12 +42,9 @@ repositories {
 dependencies {
     minecraft "net.minecraftforge:forge:$forge_version"
     implementation "com.mojang:brigadier:$brigadier_version"
-    // todo: change to "com.projectessentials.cooldown:ProjectEssentials-Cooldown:cooldown_version"
-    implementation "com.mairwunnx.project_essentials_cooldown:ProjectEssentials-Cooldown:$cooldown_version"
     internal "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinx_serialization_version"
     internal "org.jetbrains.kotlin:kotlin-stdlib-$kotlin_jdk_version_target:$kotlin_version"
-    internal "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    internal "com.beust:klaxon:$klaxon_version"
+    implementation group: 'org.json', name: 'json', version: '20190722'
 }
 
 dokka {

gradle.properties

@@ -15,9 +15,8 @@ kotlin.code.style=official
 # Project external dependencies.
 kotlin_version=1.3.72
 kotlinx_serialization_version=0.20.0
-klaxon_version=5.2
 # Module informatation.
-module_version=2.0.0-RC.1+MC-1.14.4
+module_version=2.0.0-RC.2+MC-1.14.4
 module_name=Project Essentials Core
 module_id=project_essentials_core
 module_vendor=MairwunNx (Pavel Erokhin)
@@ -26,5 +25,3 @@ package_public_token=ZDhjMjgyNjlhM2E0ZTQ0MmM2Mjk5ZWI4YmMyZjI0YzNjOTNkMDVkZA==
 package_maven_repo=https://maven.pkg.github.com/projectessentials/projectessentials
 package_maven_repo_name=GitHubPackages
 package_maven_repo_mail=MairwunNx@gmail.com
-# Project Essentials dependencies
-cooldown_version=1.14.4-1.0.4

src/main/kotlin/com/mairwunnx/projectessentials/core/EntryPoint.kt

@@ -37,11 +37,11 @@ internal class EntryPoint {
         and we can discuss it.
      */
     private val providers = listOf(
-        GeneralConfiguration::class,
-        NativeAliasesConfiguration::class,
-        ModuleObject::class,
-        BackLocationCommand::class,
-        ConfigureEssentialsCommand::class
+        GeneralConfiguration::class.java,
+        NativeAliasesConfiguration::class.java,
+        ModuleObject::class.java,
+        BackLocationCommand::class.java,
+        ConfigureEssentialsCommand::class.java
     )
 
     private val processors = listOf(
@@ -63,7 +63,7 @@ internal class EntryPoint {
             ForgeEventType.SetupEvent
         ) {
             applyLocalization()
-            processors.forEach { ProcessorAPI.register(it) }
+            processors.forEach(ProcessorAPI::register)
         }
 
         subscribeOn<InterModEnqueueEventData>(

src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/InternalConstants.kt

@@ -6,25 +6,25 @@ package com.mairwunnx.projectessentials.core.api.v1
  * Configuration processor loading index order.
  * @since 2.0.0-SNAPSHOT.1.
  */
-const val CONFIGURATION_PROCESSOR_INDEX = 0u
+const val CONFIGURATION_PROCESSOR_INDEX = 0
 
 /**
  * Module processor loading index order.
  * @since 2.0.0-SNAPSHOT.1.
  */
-const val MODULE_PROCESSOR_INDEX = 1u
+const val MODULE_PROCESSOR_INDEX = 1
 
 /**
  * Localization processor loading index order.
  * @since 2.0.0-SNAPSHOT.1.
  */
-const val LOCALIZATION_PROCESSOR_INDEX = 2u
+const val LOCALIZATION_PROCESSOR_INDEX = 2
 
 /**
  * Command processor loading index order.
  * @since 2.0.0-SNAPSHOT.1.
  */
-const val COMMAND_PROCESSOR_INDEX = 3u
+const val COMMAND_PROCESSOR_INDEX = 3
 
 /**
  * Initial fall back language, uses before
@@ -45,12 +45,6 @@ const val MESSAGE_CORE_PREFIX = "project_essentials_core"
  */
 const val MESSAGE_MODULE_PREFIX = "project_essentials_"
 
-/**
- * Prefix for localized messages for main module (`Project Essentials`).
- * @since 2.0.0-SNAPSHOT.1.
- */
-const val MESSAGE_MAIN_MODULE_PREFIX = "project_essentials"
-
 const val SETTING_LOC_ENABLED = "v2-localization-enabled"
 const val SETTING_LOC_FALLBACK_LANG = "v2-localization-fallback-lang"
 const val SETTING_DISABLE_SAFE_ENCHANT = "disable-safely-enchant-level"

src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/commands/Command.kt

@@ -0,0 +1,20 @@
+package com.mairwunnx.projectessentials.core.api.v1.commands
+
+/**
+ * Command aliases basically for working with
+ * command cooldowns.
+ *
+ * @since 2.0.0-RC.2.
+ */
+object CommandAliases {
+    /**
+     * This stores all aliases, just add your alias here.
+     *
+     * Where `String` - command for aliases.
+     *
+     * Where `MutableList<String>` - aliases of command.
+     *
+     * @since 2.0.0-RC.2.
+     */
+    val aliases: HashMap<String, MutableList<String>> = hashMapOf()
+}

src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/commands/CommandAliases.kt

@@ -1,6 +1,6 @@
 package com.mairwunnx.projectessentials.core.api.v1.commands
 
-import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
+
 import com.mairwunnx.projectessentials.core.api.v1.extensions.playerName
 import com.mairwunnx.projectessentials.core.api.v1.module.ModuleAPI
 import com.mojang.brigadier.CommandDispatcher
@@ -32,20 +32,17 @@ abstract class CommandBase(
     private val marker = MarkerManager.Log4jMarker("COMMAND OUT")
     private val logger = LogManager.getLogger()
 
-    /**
-     * Command data, stores data of `Command`
-     * annotation type.
-     * @since 2.0.0-SNAPSHOT.1.
-     */
-    lateinit var data: Command
+    abstract override val name: String
+    override val aliases: List<String> = emptyList()
+    override val override: Boolean = false
 
     /**
      * Initializing command. For this case, just
      * remove already registered command if needed.
      * @since 2.0.0-SNAPSHOT.1.
      */
     override fun initialize() {
-        if (data.override) CommandAPI.removeCommand(data.name)
+        if (override) CommandAPI.removeCommand(name)
     }
 
     /**
@@ -55,17 +52,17 @@ abstract class CommandBase(
      */
     override fun register(dispatcher: CommandDispatcher<CommandSource>) {
         if (ModuleAPI.isModuleExist("cooldown")) {
-            CommandsAliases.aliases[data.name] = data.aliases.toMutableList()
+            CommandAliases.aliases[name] = aliases.toMutableList()
         }
 
         if (actionNeed) {
             val literalNode = dispatcher.register(literal.executes(::process))
-            data.aliases.filter { it != data.name }.forEach {
+            aliases.filter { it != name }.forEach {
                 dispatcher.register(Commands.literal(it).executes(::process).redirect(literalNode))
             }
         } else {
             val literalNode = dispatcher.register(literal)
-            data.aliases.filter { it != data.name }.forEach {
+            aliases.filter { it != name }.forEach {
                 dispatcher.register(Commands.literal(it).redirect(literalNode))
             }
         }
@@ -83,11 +80,4 @@ abstract class CommandBase(
         )
         return 0
     }
-
-    /**
-     * @param clazz from what need take data.
-     * @return Command annotation data class.
-     * @since 2.0.0-SNAPSHOT.1.
-     */
-    override fun getData(clazz: Class<*>): Command = clazz.getAnnotation(Command::class.java)
 }

src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/commands/CommandBase.kt

@@ -10,7 +10,6 @@ import com.mairwunnx.projectessentials.core.api.v1.providers.ProviderAPI
 import com.mairwunnx.projectessentials.core.api.v1.providers.ProviderType
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.MarkerManager
-import kotlin.reflect.full.findAnnotation
 
 internal object CommandProcessor : IProcessor {
     private val logger = LogManager.getLogger()
@@ -28,20 +27,20 @@ internal object CommandProcessor : IProcessor {
         logger.debug(marker, "Finding and processing commands")
 
         ProviderAPI.getProvidersByType(ProviderType.COMMAND).forEach {
-            val clazz = it.objectInstance as ICommand
+            val clazz = it.getDeclaredField("INSTANCE").get(null) as ICommand
 
             ModuleEventAPI.fire(OnCommandClassProcessing, CommandEventData(clazz))
 
-            val data = it.findAnnotation<Command>()!!
             logger.debug(
                 marker,
-                "\n\n    *** Command taken! ${it.simpleName}".plus(
-                    "\n\n  - Command name: ${data.name}"
-                ).plus(
-                    "\n  - Command aliases: ${data.aliases.contentToString()}"
-                ).plus(
-                    "\n  - Class: ${it.qualifiedName}\n\n"
-                )
+                """
+
+    ### Command taken! ${clazz.javaClass.simpleName}
+        - Name: ${clazz.name}
+        - Class: ${clazz.javaClass.canonicalName}
+        - Aliases: ${clazz.aliases}
+
+                """
             )
 
             commands = commands + clazz

src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/commands/CommandProcessor.kt

@@ -9,6 +9,26 @@ import net.minecraft.command.CommandSource
  * @since 2.0.0-SNAPSHOT.1.
  */
 interface ICommand {
+    /**
+     * Command name without `/`.
+     * @since 2.0.0-RC.2.
+     */
+    val name: String
+
+    /**
+     * Command aliases as array.
+     * @since 2.0.0-RC.2.
+     */
+    val aliases: List<String>
+
+    /**
+     * Override already command. If value
+     * true then already registered command by
+     * other mod will be replaced.
+     * @since 2.0.0-RC.2.
+     */
+    val override: Boolean
+
     /**
      * Initialize command, assign data and other.
      * @since 2.0.0-SNAPSHOT.1.
@@ -29,11 +49,4 @@ interface ICommand {
      * @since 2.0.0-SNAPSHOT.1.
      */
     fun process(context: CommandContext<CommandSource>): Int
-
-    /**
-     * @param clazz from what need take data.
-     * @return Command annotation data class.
-     * @since 2.0.0-SNAPSHOT.1.
-     */
-    fun getData(clazz: Class<*>): Command
 }