feat: remove noisy logging and more kotlinization for EquipmentServer

Author: sysnote8main

src/main/kotlin/be4rjp/sclat/server/EquipmentServer.kt

@@ -44,77 +44,67 @@ class EquipmentServer( // private List<String> commands = new ArrayList<>();
 
 // 非同期スレッド
 internal class EquipEchoThread(
-    socket: Socket,
+    private val socket: Socket,
 ) : Thread() {
-    private val socket: Socket?
-
     init {
-        this.socket = socket
         println("Connected " + socket.getRemoteSocketAddress())
     }
 
     override fun run() {
         try {
             println("Waiting for commands...")
             // クライアントからの受取用
-            val reader = BufferedReader(InputStreamReader(socket!!.getInputStream()))
+            val reader = BufferedReader(InputStreamReader(socket.getInputStream()))
 
             // サーバーからクライアントへの送信用
             PrintWriter(socket.getOutputStream(), true)
 
-            var cmd: String? = null
+            var cmd: String
             // 命令受け取り用ループ
             while (true) {
-                if ((reader.readLine().also { cmd = it }) != null) {
-                    if (cmd == "stop") {
-                        socket.close()
-                        println("Socket closed.")
-                        break
-                    }
-
-                    println(cmd)
+                cmd = reader.readLine()
+                if (cmd == "stop") {
+                    socket.close()
+                    println("Socket closed.")
+                    break
+                }
 
-                    EquipmentServerManager.addEquipmentCommand(cmd)
+                EquipmentServerManager.addEquipmentCommand(cmd)
 
-                    val args: Array<String?> = cmd!!.split(" ".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-                    when (args[0]) {
-                        "setting" -> {
-                            // setting [settingData] [uuid]
-                            if (args.size == 3) {
-                                if (args[1]!!.length == 9 && args[2]!!.length == 36) {
-                                    Sclat.conf?.playerSettings!!.set("Settings." + args[2], args[1])
-                                }
+                val args: Array<String?> = cmd.split(" ".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                when (args[0]) {
+                    "setting" -> {
+                        // setting [settingData] [uuid]
+                        if (args.size == 3) {
+                            if (args[1]!!.length == 9 && args[2]!!.length == 36) {
+                                Sclat.conf?.playerSettings!!.set("Settings." + args[2], args[1])
                             }
                         }
+                    }
 
-                        "mod" -> {
-                            // mod [PlayerName]
-                            if (args.size == 2) {
-                                if (Sclat.modList.contains(args[1])) {
-                                    Sclat.modList.add(args[1])
-                                }
+                    "mod" -> {
+                        // mod [PlayerName]
+                        if (args.size == 2) {
+                            if (Sclat.modList.contains(args[1])) {
+                                Sclat.modList.add(args[1])
                             }
                         }
+                    }
 
-                        "join" -> {
-                            if (args.size == 2) {
-                            }
+                    "join" -> {
+                        if (args.size == 2) {
                         }
                     }
-                } else {
-                    break
                 }
             }
         } catch (e: IOException) {
             e.printStackTrace()
         } finally {
             try {
-                if (socket != null) {
-                    socket.close()
-                }
+                socket.close()
             } catch (e: IOException) {
             }
-            println("Disconnected " + socket!!.getRemoteSocketAddress())
+            println("Disconnected " + socket.getRemoteSocketAddress())
         }
     }
 }

src/main/kotlin/be4rjp/sclat/server/EquipmentServerManager.kt

@@ -5,12 +5,14 @@ import be4rjp.sclat.data.DataMgr.getPlayerData
 import be4rjp.sclat.data.DataMgr.getWeaponClass
 import be4rjp.sclat.manager.PlayerStatusMgr
 import be4rjp.sclat.plugin
+import be4rjp.sclat.sclatLogger
 
 object EquipmentServerManager {
     var commands: MutableList<String> = ArrayList<String>()
 
-    fun addEquipmentCommand(command: String?) {
-        commands.add(command!!)
+    fun addEquipmentCommand(command: String) {
+        sclatLogger.debug("Equip command: $command")
+        commands.add(command)
     }
 
     @JvmStatic