Exception while overriding native commands fixed.

Incorrect base implementation class checking fixed.
Removed redundant new line in `ServerMessagingAPI.listAsResponse`.
`org.json:json` included in mod bundle.

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

Author: MairwunNx

build.gradle

@@ -44,7 +44,7 @@ dependencies {
     implementation "com.mojang:brigadier:$brigadier_version"
     internal "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlinx_serialization_version"
     internal "org.jetbrains.kotlin:kotlin-stdlib-$kotlin_jdk_version_target:$kotlin_version"
-    implementation group: 'org.json', name: 'json', version: '20190722'
+    internal group: 'org.json', name: 'json', version: '20190722'
 }
 
 dokka {

changelog.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0-RC.4] - 2020-05-15
+
+### Added
+- `org.json:json` included in mod bundle.
+
+### Changed
+- Removed redundant new line in `ServerMessagingAPI.listAsResponse`.
+
+### Fixed
+- Exception while overriding native commands.
+- Incorrect base implementation class checking.
+
 ## [2.0.0-RC.3] - 2020-05-15
 
 ### Added

gradle.properties

@@ -16,7 +16,7 @@ kotlin.code.style=official
 kotlin_version=1.3.72
 kotlinx_serialization_version=0.20.0
 # Module informatation.
-module_version=2.0.0-RC.3+MC-1.14.4
+module_version=2.0.0-RC.4+MC-1.14.4
 module_name=Project Essentials Core
 module_id=project_essentials_core
 module_vendor=MairwunNx (Pavel Erokhin)

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

@@ -49,7 +49,8 @@ internal object ConfigurationProcessor : IProcessor {
         }
     }
 
-    private fun isConfiguration(clazz: Class<*>) = clazz is IConfiguration<*>
+    private fun isConfiguration(clazz: Class<*>) =
+        IConfiguration::class.java.isAssignableFrom(clazz)
 
     override fun postProcess() {
         getConfigurations().forEach {

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

@@ -45,7 +45,6 @@ object ServerMessagingAPI {
      */
     fun listAsResponse(list: List<String>, title: () -> String) = response {
         """
-
     ${title()}
 
 ${list.joinToString(separator = ",\n") { "    > $it" }}

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

@@ -67,7 +67,7 @@ internal object ModuleProcessor : IProcessor {
         }
     }
 
-    private fun isModule(clazz: Class<*>) = clazz is IModule
+    private fun isModule(clazz: Class<*>) = IModule::class.java.isAssignableFrom(clazz)
 
     private fun getInstanceModId(clazz: Class<*>) =
         clazz.getAnnotation(Mod::class.java)?.value ?: String.empty

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

@@ -42,35 +42,37 @@ object ProviderAPI {
      * @since 2.0.0-SNAPSHOT.1.
      */
     @Synchronized
-    fun addProvider(clazz: Class<*>) = when (clazz) {
-        is IConfiguration<*> -> {
-            addProvider(ProviderType.CONFIGURATION, clazz).run {
-                logger.debug(
-                    marker,
-                    "Provider class founded: Type: `Configuration`, Class: `${clazz.simpleName}`"
-                )
+    fun addProvider(clazz: Class<*>) {
+        when {
+            IConfiguration::class.java.isAssignableFrom(clazz) -> {
+                addProvider(ProviderType.CONFIGURATION, clazz).run {
+                    logger.debug(
+                        marker,
+                        "Provider class founded: Type: `Configuration`, Class: `${clazz.simpleName}`"
+                    )
+                }
             }
-        }
-        is IModule -> {
-            addProvider(ProviderType.MODULE, clazz).run {
-                logger.debug(
-                    marker,
-                    "Provider class founded: Type: `Module`, Class: `${clazz.simpleName}`"
-                )
+            IModule::class.java.isAssignableFrom(clazz) -> {
+                addProvider(ProviderType.MODULE, clazz).run {
+                    logger.debug(
+                        marker,
+                        "Provider class founded: Type: `Module`, Class: `${clazz.simpleName}`"
+                    )
+                }
             }
-        }
-        is ICommand -> {
-            addProvider(ProviderType.COMMAND, clazz).run {
-                logger.debug(
-                    marker,
-                    "Provider class founded: Type: `Command`, Class: `${clazz.simpleName}`"
-                )
+            ICommand::class.java.isAssignableFrom(clazz) -> {
+                addProvider(ProviderType.COMMAND, clazz).run {
+                    logger.debug(
+                        marker,
+                        "Provider class founded: Type: `Command`, Class: `${clazz.simpleName}`"
+                    )
+                }
             }
+            else -> logger.warn(
+                marker,
+                "Incorrect provider class found! (skipped to load): Class: `${clazz.simpleName}`"
+            )
         }
-        else -> logger.warn(
-            marker,
-            "Incorrect provider class found! (skipped to load): Class: `${clazz.simpleName}`"
-        )
     }
 
     /**

src/main/kotlin/com/mairwunnx/projectessentials/core/impl/ModuleObject.kt

@@ -76,16 +76,17 @@ internal class ModuleObject : IModule {
 
     @SubscribeEvent
     fun onServerStarting(event: FMLServerStartingEvent) {
-        if (generalConfiguration.getBool(SETTING_NATIVE_COMMAND_REPLACE)) {
-            registerNativeCommands(event.commandDispatcher, event.server.isDedicatedServer)
-        }
-
         dudeFuckedOff = File(
             projectConfigDirectory + File.separator + "fuck-off-dude.txt"
         ).exists().also { if (!it) printGreetingMessage() }
 
         CommandAPI.assignDispatcherRoot(event.commandDispatcher)
         CommandAPI.assignDispatcher(event.commandDispatcher)
+
+        if (generalConfiguration.getBool(SETTING_NATIVE_COMMAND_REPLACE)) {
+            registerNativeCommands(event.commandDispatcher, event.server.isDedicatedServer)
+        }
+
         ProcessorAPI.getProcessorByName("command").postProcess()
     }
 

updatev2.json

@@ -1,12 +1,13 @@
 {
   "homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Core",
   "1.14.4": {
+    "2.0.0-RC.4": "change log -> https://git.io/JfRaD",
     "2.0.0-RC.3": "change log -> https://git.io/JfRlp",
     "2.0.0-RC.2": "change log -> https://git.io/JfBYX",
     "2.0.0-RC.1": "change log -> https://git.io/JfC5F"
   },
   "promos": {
-    "1.14.4-latest": "2.0.0-RC.3",
+    "1.14.4-latest": "2.0.0-RC.4",
     "1.14.4-recommended": "2.0.0"
   }
 }