Fix sonarqube issues (#16)

* fix: reduce complexity * fix: split registermanager --------- Co-authored-by: Liam Sage <[email protected]>
BlockVentureMC · Apr 23, 2024 · 4053d5f · 4053d5f
1 parent 2dee8b3
commit 4053d5f
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 45 deletions.
diff --git a/src/main/kotlin/net/blockventuremc/modules/general/events/BuildEvents.kt b/src/main/kotlin/net/blockventuremc/modules/general/events/BuildEvents.kt
@@ -65,12 +65,10 @@ class BuildEvents: Listener {
 
     @EventHandler
     fun onLiquidGet(event: PlayerBucketFillEvent) {
-        if (!event.player.canBuild) {
-            if (event.block.type == Material.WATER) {
-                Bukkit.getScheduler().runTaskLater(Plugin.instance, Runnable {
-                    event.block.type = Material.WATER
-                }, 1)
-            }
+        if (!event.player.canBuild && event.block.type == Material.WATER) {
+            Bukkit.getScheduler().runTaskLater(Plugin.instance, Runnable {
+                event.block.type = Material.WATER
+            }, 1)
         }
     }
 

diff --git a/src/main/kotlin/net/blockventuremc/modules/general/events/ChatEvent.kt b/src/main/kotlin/net/blockventuremc/modules/general/events/ChatEvent.kt
@@ -19,16 +19,9 @@ class ChatEvent: Listener {
 
     @EventHandler
     fun onChat(event: AsyncChatEvent): Unit = with(event) {
-        val player = player
-
-        val placeHolderText = chatFormat
-        val messagePlain = message().asPlainString
-
-        val format =
-            text(parsePlaceholders(placeHolderText, player)).append(text(parsePlaceholders(messagePlain, player)))
 
         event.renderer { _, _, _, _ ->
-            return@renderer format
+            return@renderer text(parsePlaceholders(chatFormat, player)).append(text(parsePlaceholders(message().asPlainString, player)))
         }
     }
 

diff --git a/src/main/kotlin/net/blockventuremc/modules/general/model/Ranks.kt b/src/main/kotlin/net/blockventuremc/modules/general/model/Ranks.kt
@@ -2,8 +2,8 @@ package net.blockventuremc.modules.general.model
 
 enum class Ranks(val color: String) {
     Staff("#FF0000"),
-    Plus("#FF0000"),
-    Default("#FF0000");
+    Plus("#71368a"),
+    Default("#2ecc71");
 
     fun isHigherOrEqual(rank: Ranks): Boolean {
         return this.ordinal <= rank.ordinal

diff --git a/src/main/kotlin/net/blockventuremc/utils/ItemBuilder.kt b/src/main/kotlin/net/blockventuremc/utils/ItemBuilder.kt
@@ -85,7 +85,6 @@ class ItemBuilder(material: Material, count: Int = 1, dsl: ItemBuilder.() -> Uni
         return this
     }
 
-    @FunctionalInterface
     fun interface Performer<T> {
         fun perform(itemBuilder: T): T
     }
@@ -189,7 +188,7 @@ class ItemBuilder(material: Material, count: Int = 1, dsl: ItemBuilder.() -> Uni
 
     fun lore(vararg lores: String): ItemBuilder {
         val meta = itemStack.itemMeta
-        var lore = listOf<Component>()
+        val lore = mutableListOf<Component>()
 
         lores.forEach {
             val lines = it.split("\n")
@@ -338,7 +337,7 @@ class ItemBuilder(material: Material, count: Int = 1, dsl: ItemBuilder.() -> Uni
         )
 
         fun fromItemStack(itemStack: ItemStack): ItemBuilder {
-            var mat = if (ItemBuilder.invalidMaterials.contains(itemStack.type)) Material.GRASS_BLOCK else itemStack.type
+            var mat = if (invalidMaterials.contains(itemStack.type)) Material.GRASS_BLOCK else itemStack.type
             val builder = ItemBuilder(mat)
             builder.itemStack = itemStack
             return builder

diff --git a/src/main/kotlin/net/blockventuremc/utils/RegisterManager.kt b/src/main/kotlin/net/blockventuremc/utils/RegisterManager.kt
@@ -13,32 +13,7 @@ import org.reflections8.Reflections
 import kotlin.time.measureTime
 
 object RegisterManager {
-    fun registerAll() {
-        val reflections = Reflections("net.blockventuremc.modules")
-
-        val timeListeners = measureTime {
-            for (clazz in reflections.getSubTypesOf(Listener::class.java)) {
-                try {
-                    val constructor = clazz.declaredConstructors.find { it.parameterCount == 0 } ?: continue
-
-                    if (clazz.`package`.name.contains("conversations")) continue
-
-                    constructor.isAccessible = true
-
-                    val event = constructor.newInstance() as Listener
-
-                    Bukkit.getPluginManager().registerEvents(event, Plugin.instance)
-                    Bukkit.getConsoleSender()
-                        .sendMessage("Listener ${event.javaClass.simpleName} registered")
-                } catch (exception: InstantiationError) {
-                    exception.printStackTrace()
-                } catch (exception: IllegalAccessException) {
-                    exception.printStackTrace()
-                }
-            }
-        }
-        println("Registered listeners in $timeListeners")
-
+    private fun registerCommands(reflections: Reflections) {
 
         val timeCommands = measureTime {
             for (clazz in reflections.getTypesAnnotatedWith(BlockCommand::class.java)) {
@@ -79,4 +54,37 @@ object RegisterManager {
         }
         println("Registered commands in $timeCommands")
     }
+
+    private fun registerListeners(reflections: Reflections) {
+        val timeListeners = measureTime {
+            for (clazz in reflections.getSubTypesOf(Listener::class.java)) {
+                try {
+                    val constructor = clazz.declaredConstructors.find { it.parameterCount == 0 } ?: continue
+
+                    if (clazz.`package`.name.contains("conversations")) continue
+
+                    constructor.isAccessible = true
+
+                    val event = constructor.newInstance() as Listener
+
+                    Bukkit.getPluginManager().registerEvents(event, Plugin.instance)
+                    Bukkit.getConsoleSender()
+                        .sendMessage("Listener ${event.javaClass.simpleName} registered")
+                } catch (exception: InstantiationError) {
+                    exception.printStackTrace()
+                } catch (exception: IllegalAccessException) {
+                    exception.printStackTrace()
+                }
+            }
+        }
+        println("Registered listeners in $timeListeners")
+    }
+    fun registerAll() {
+        val reflections = Reflections("net.blockventuremc.modules")
+
+        registerListeners(reflections)
+
+        registerCommands(reflections)
+
+    }
 }