傻逼插件，你改你妈的蛋，天天改

TabooLib · Mar 19, 2024 · 980af15 · 980af15
1 parent 88f87da
commit 980af15
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=ink.ptms.um
-version=1.0.1
-taboolib_version=6.1.0
+version=1.0.2
+taboolib_version=6.1.1-beta12
diff --git a/project/implementation-v5/build.gradle.kts b/project/implementation-v5/build.gradle.kts
@@ -19,7 +19,9 @@ dependencies {
     api(project(":project:common"))
     compileOnly("com.electronwill.night-config:core-conversion:6.0.0")
     compileOnly("com.electronwill.night-config:core:3.6.6")
-    compileOnly("public:MythicMobs5:5.0.4")
+    // 你改你妈个蛋，我爱说实话
+    // compileOnly("public:MythicMobs5:5.0.4")
+    compileOnly(fileTree("libs"))
     compileOnly("ink.ptms:nms-all:1.0.0")
     compileOnly("org.yaml:snakeyaml:1.26")
     compileOnly("ink.ptms.core:v11802:11802-minimize:mapped")

diff --git a/project/implementation-v5/libs/MythicMobs-5.6.0.min.jar b/project/implementation-v5/libs/MythicMobs-5.6.0.min.jar
diff --git a/project/implementation-v5/src/main/kotlin/ink/ptms/um/impl5/MobConfiguration.kt b/project/implementation-v5/src/main/kotlin/ink/ptms/um/impl5/MobConfiguration.kt
@@ -2,7 +2,7 @@ package ink.ptms.um.impl5
 
 import com.electronwill.nightconfig.core.CommentedConfig
 import io.lumine.mythic.api.config.MythicConfig
-import io.lumine.mythic.bukkit.utils.config.file.FileConfiguration
+import org.bukkit.configuration.file.FileConfiguration
 import io.lumine.mythic.core.config.MythicConfigImpl
 import taboolib.library.configuration.ConfigurationSection
 import taboolib.library.reflex.Reflex.Companion.getProperty

diff --git a/project/implementation-v5/src/main/kotlin/ink/ptms/um/impl5/MobType.kt b/project/implementation-v5/src/main/kotlin/ink/ptms/um/impl5/MobType.kt
@@ -15,7 +15,7 @@ internal class MobType(val source: MythicMob) : MobType {
         get() = source.displayName.get()
 
     override val entityType: String
-        get() = source.entityType
+        get() = source.entityType.name
 
     override val config: ConfigurationSection
         get() = MobConfiguration(source.config)

diff --git a/project/implementation-v5/src/main/kotlin/ink/ptms/um/impl5/Skill5.kt b/project/implementation-v5/src/main/kotlin/ink/ptms/um/impl5/Skill5.kt
@@ -65,7 +65,7 @@ internal class Skill5(obj: Any) : Skill {
 
     class Trigger(obj: Any) : Skill.Trigger {
 
-        val source = obj as SkillTrigger
+        val source = obj as SkillTrigger<*>
 
         override val name: String = source.getProperty<String>("name")!!
     }