[publish] 6.0.12 udpate ItemTag

TabooLib · Sep 7, 2023 · eadd341 · eadd341
1 parent 7669965
commit eadd341
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/module/module-nms-util/src/main/kotlin/taboolib/module/nms/ItemTag.kt b/module/module-nms-util/src/main/kotlin/taboolib/module/nms/ItemTag.kt
@@ -114,15 +114,21 @@ class ItemTag : ItemTagData, MutableMap<String, ItemTagData> {
         return this.value.put(key, value)
     }
 
-    fun put(key: String, value: Any): ItemTagData? {
-        return this.value.put(key, toNBT(value))
+    fun put(key: String, value: Any?): ItemTagData? {
+        return if (value == null) {
+            remove(key)
+        } else {
+            this.value.put(key, toNBT(value))
+        }
     }
 
     /**
      * 深度写入，以 "." 作为分层符
      */
-    fun putDeep(key: String, value: Any): ItemTagData? {
-        return if (key.contains('.')) {
+    fun putDeep(key: String, value: Any?): ItemTagData? {
+        return if (value == null) {
+            removeDeep(key)
+        } else if (key.contains('.')) {
             getDeepWith(key, true) { it.put(key.substringAfterLast('.'), toNBT(value)) }
         } else {
             put(key, value)

diff --git a/platform/platform-application/src/main/kotlin/taboolib/platform/AppIO.kt b/platform/platform-application/src/main/kotlin/taboolib/platform/AppIO.kt
@@ -46,28 +46,31 @@ class AppIO : PlatformIO {
 
     override fun info(vararg message: Any?) {
         message.filterNotNull().forEach {
-            if (isLog4jEnabled)
+            if (isLog4jEnabled) {
                 println(it)
-            else
+            } else {
                 println("[${date}][INFO] $it")
+            }
         }
     }
 
     override fun severe(vararg message: Any?) {
         message.filterNotNull().forEach {
-            if (isLog4jEnabled)
+            if (isLog4jEnabled) {
                 println(it)
-            else
+            } else {
                 println("[${date}][ERROR] $it")
+            }
         }
     }
 
     override fun warning(vararg message: Any?) {
         message.filterNotNull().forEach {
-            if (isLog4jEnabled)
+            if (isLog4jEnabled) {
                 println(it)
-            else
+            } else {
                 println("[${date}][WARN] $it")
+            }
         }
     }