Skip to content

Commit f259336

Browse files
committed
new drag
1 parent 25ae782 commit f259336

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

build.gradle.kts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import io.izzel.taboolib.gradle.*
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
34

45
val publishUsername: String by project
@@ -8,8 +9,8 @@ val build: String by project
89
plugins {
910
java
1011
`maven-publish`
11-
kotlin("jvm") version "1.9.24"
12-
kotlin("plugin.serialization") version "1.9.24"
12+
kotlin("jvm") version "2.1.20"
13+
kotlin("plugin.serialization") version "2.1.20"
1314
id("io.izzel.taboolib") version "2.0.23"
1415
id("org.jetbrains.dokka") version "2.0.0"
1516
}
@@ -90,8 +91,8 @@ dependencies {
9091
compileOnly("ink.ptms.adyeshach:plugin:2.0.26:api")
9192
compileOnly("org.eldergod.ext:DragonCore:2.6.2.9")
9293
compileOnly("org.eldergod.ext:GermPlugin:4.4.1-5")
93-
compileOnly("org.eldergod.ext:MythicMobs:4.11.0")
9494
compileOnly("org.eldergod.ext:DragonArmourers:6.72")
95+
compileOnly("org.eldergod.ext:MythicMobs:4.11.0")
9596
compileOnly("org.eldergod.ext:GDDTitle:2.1")
9697
compileOnly("org.eldergod.ext:GlowAPI:1.4.6")
9798
compileOnly("org.eldergod.ext:OriginAttribute:1.1.4")
@@ -100,8 +101,8 @@ dependencies {
100101
compileOnly("org.eldergod.ext:packetevents:2.7.0")
101102
compileOnly("org.eldergod.ext:ProtocolLib:5.3.0")
102103

103-
taboo("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3") { isTransitive = false }
104-
taboo("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3") { isTransitive = false }
104+
taboo("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1") { isTransitive = false }
105+
taboo("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1") { isTransitive = false }
105106
taboo("org.apache.commons:commons-jexl3:3.4.0")
106107
compileOnly("com.github.ben-manes.caffeine:caffeine:2.9.3")
107108
compileOnly("org.joml:joml:1.10.7")
@@ -124,9 +125,9 @@ tasks.withType<Jar> {
124125
}
125126

126127
tasks.withType<KotlinCompile> {
127-
kotlinOptions {
128-
jvmTarget = "1.8"
129-
freeCompilerArgs = listOf("-Xjvm-default=all")
128+
compilerOptions {
129+
jvmTarget.set(JvmTarget.JVM_1_8)
130+
freeCompilerArgs.set(listOf("-Xjvm-default=all"))
130131
}
131132
}
132133

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group = org.gitee.orryx
2-
version = 1.1.7
2+
version = 1.2.8
33
org.gradle.jvmargs=-Dfile.encoding=UTF-8

src/main/kotlin/org/gitee/orryx/module/ui/bukkit/BukkitSkillHud.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ open class BukkitSkillHud(override val viewer: Player, override val owner: Playe
8282
amount = i + 1
8383
hideAll()
8484
unique()
85-
material.parseMaterial()?.maxDurability?.let {
85+
material.get()?.maxDurability?.let {
8686
val percent = skillCooldownMap[owner.uniqueId]?.get(skill.key)?.percent(owner) ?: 1.0
8787
if (percent < 1) {
8888
damage = (it.cdouble * percent).cint

0 commit comments

Comments
 (0)