Update database

hooll · Jan 14, 2022 · c36a329 · c36a329
1 parent c3d3a36
commit c36a329
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 53 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/com/faithl/faithllevel/internal/compat/AttributePlus.kt b/src/main/kotlin/com/faithl/faithllevel/internal/compat/AttributePlus.kt
diff --git a/src/main/kotlin/com/faithl/faithllevel/internal/compat/MythicMobs.kt b/src/main/kotlin/com/faithl/faithllevel/internal/compat/MythicMobs.kt
diff --git a/src/main/kotlin/com/faithl/faithllevel/internal/compat/PlaceholderAPI.kt b/src/main/kotlin/com/faithl/faithllevel/internal/compat/PlaceholderAPI.kt
diff --git a/src/main/kotlin/com/faithl/faithllevel/internal/core/Function.kt b/src/main/kotlin/com/faithl/faithllevel/internal/core/Function.kt
diff --git a/src/main/kotlin/com/faithl/faithllevel/internal/core/impl/PureLevel.kt b/src/main/kotlin/com/faithl/faithllevel/internal/core/impl/PureLevel.kt
@@ -39,6 +39,14 @@ open class PureLevel() : TempLevel() {
         expIncrease = value
     }
 
+    override fun getLevel(target: String): Int {
+        return levelData.getOrPut(target) { Database.INSTANCE.getLevel(target, FaithlLevelAPI.getName(this)) }
+    }
+
+    override fun getExp(target: String): Int {
+        return expData.getOrPut(target) { Database.INSTANCE.getExp(target, FaithlLevelAPI.getName(this)) }
+    }
+
     companion object {
 
         /**

diff --git a/src/main/kotlin/com/faithl/faithllevel/internal/data/impl/DatabaseSQL.kt b/src/main/kotlin/com/faithl/faithllevel/internal/data/impl/DatabaseSQL.kt
@@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentHashMap
  **/
 class DatabaseSQL : Database() {
 
-    val host = FaithlLevel.setting.getHost("storage.source.sql")
+    val host = FaithlLevel.setting.getHost("storage.source.mysql")
     val dataSource = host.createDataSource()
 
     val tableTarget = Table("${name}_target", host) {

diff --git a/src/main/kotlin/com/faithl/faithllevel/module/compat/AttributePlus.kt b/src/main/kotlin/com/faithl/faithllevel/module/compat/AttributePlus.kt
@@ -0,0 +1,4 @@
+package com.faithl.faithllevel.module.compat
+
+object AttributePlus {
+}
diff --git a/src/main/kotlin/com/faithl/faithllevel/module/compat/MythicMobs.kt b/src/main/kotlin/com/faithl/faithllevel/module/compat/MythicMobs.kt
@@ -0,0 +1,4 @@
+package com.faithl.faithllevel.module.compat
+
+object MythicMobs {
+}
diff --git a/src/main/kotlin/com/faithl/faithllevel/module/compat/PlaceholderAPI.kt b/src/main/kotlin/com/faithl/faithllevel/module/compat/PlaceholderAPI.kt
@@ -0,0 +1,4 @@
+package com.faithl.faithllevel.module.compat
+
+object PlaceholderAPI {
+}
diff --git a/...aithl/faithllevel/internal/trait/Event.kt → .../faithl/faithllevel/module/trait/Event.kt b/...aithl/faithllevel/internal/trait/Event.kt → .../faithl/faithllevel/module/trait/Event.kt
@@ -1,11 +1,4 @@
-package com.faithl.faithllevel.internal.trait
-
-import com.faithl.faithllevel.api.event.ChangeType
-import com.faithl.faithllevel.api.event.ExpUpdateEvent
-import com.faithl.faithllevel.api.event.LevelUpdateEvent
-import com.faithl.faithllevel.internal.core.impl.BasicLevel
-import com.faithl.faithllevel.internal.util.run
-import taboolib.common.platform.event.SubscribeEvent
+package com.faithl.faithllevel.module.trait
 
 internal object Event {
 //
@@ -28,4 +21,5 @@ internal object Event {
 //                ?.run(e.player, BasicLevel.getPlayerData(e.basicLevel, e.player).playerLevel)
 //        }
 //    }
+
 }
diff --git a/.../faithllevel/internal/trait/Permission.kt → ...hl/faithllevel/module/trait/Permission.kt b/.../faithllevel/internal/trait/Permission.kt → ...hl/faithllevel/module/trait/Permission.kt
@@ -1,11 +1,4 @@
-package com.faithl.faithllevel.internal.trait
-
-import com.faithl.faithllevel.api.FaithlLevelAPI
-import com.faithl.faithllevel.api.event.ChangeType
-import com.faithl.faithllevel.api.event.ExpUpdateEvent
-import com.faithl.faithllevel.api.event.LevelUpdateEvent
-import com.faithl.faithllevel.internal.core.impl.BasicLevel
-import taboolib.common.platform.event.SubscribeEvent
+package com.faithl.faithllevel.module.trait
 
 internal object Permission {
 

diff --git a/src/main/resources/lang/zh_CN.yml b/src/main/resources/lang/zh_CN.yml
@@ -15,4 +15,11 @@ command-reload: '&7[&bFaithlLevel&7] &r插件已重载完成.'
 
 command-level-description: '等级管理 &8(faithllevel.level)'
 command-exp-description: '经验管理 &8(faithllevel.exp)'
-command-reload-description: '重载插件 &8(faithllevel.reload)'
+command-reload-description: '重载插件 &8(faithllevel.reload)'
+
+level-update:
+  add:
+  take:
+exp-update:
+  add:
+  take:
diff --git a/src/main/resources/settings.yml b/src/main/resources/settings.yml
@@ -13,7 +13,7 @@ storage:
   player-index: uuid
   prefix: faithllevel
   source:
-    sql:
+    mysql:
       host: localhost
       port: 3306
       user: root