Skip to content

Commit

Permalink
feat: 1.21.1 & bump more deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Boy0000 committed Aug 18, 2024
1 parent 1652f98 commit 3834b41
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=com.mineinabyss
version=0.24
version=0.25
36 changes: 18 additions & 18 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,35 @@ coroutines = "1.9.0-RC"
creative = "1.7.3"
dependencyversions = "0.51.0"
dokka = "1.9.20"
exposed = "0.52.0"
fastutil = "8.5.13"
exposed = "0.53.0"
fastutil = "8.5.14"
fawe = "2.8.4"
itemsadder = "3.6.1"
junit = "5.11.0-M2"
junit = "5.11.0"
jvm = "21"
jvm-for-kotlin-multiplatform = "21"
kaml = "0.60.0"
kaml = "0.61.0"
kmongo = "5.1.0"
kotest = "5.9.1"
# @pin
kotlin = "2.0.0"
kotlin = "2.0.10"
ktor = "2.3.11"
logback = "1.5.6"
mccoroutine = "2.18.0"
mccoroutine = "2.19.0"
# @pin
minecraft = "1.21-R0.1-SNAPSHOT"
mockbukkit = "3.89.0"
mockk = "1.13.11"
modelengine = "R4.0.6"
mythic-dist = "5.7.0-SNAPSHOT"
mythiccrucible = "2.0.0-SNAPSHOT"
oraxen = "1.178.0"
minecraft = "1.21.1-R0.1-SNAPSHOT"
mockbukkit = "3.107.0"
mockk = "1.13.12"
modelengine = "R4.0.7"
mythic-dist = "5.7.1"
mythiccrucible = "2.0.0"
oraxen = "1.180.0"
protocollib = "5.3.0-SNAPSHOT"
reflections = "0.10.2"
serialization = "1.7.1"
shadowjar = "8.1.7"
shadowjar = "8.3.0"
sqlite-jdbc = "3.46.0.0"
userdev = "1.7.1"
userdev = "1.7.2"
vault = "1.7"
version-catalog-update = "0.8.4"
worldguard = "7.1.0-SNAPSHOT"
Expand All @@ -52,7 +52,7 @@ fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "fastutil" }
gradle-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
gradle-paperweight-userdev = { module = "io.papermc.paperweight:paperweight-userdev", version.ref = "userdev" }
gradle-shadowjar = { module = "io.github.goooler.shadow:shadow-gradle-plugin", version.ref = "shadowjar" }
gradle-shadowjar = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadowjar" }
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
kermit = "co.touchlab:kermit:2.0.3"
Expand All @@ -74,7 +74,7 @@ logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "lo
minecraft-anvilgui = { module = "net.wesjd:anvilgui", version.ref = "anvilgui" }
minecraft-mccoroutine = { module = "com.github.shynixn.mccoroutine:mccoroutine-bukkit-api", version.ref = "mccoroutine" }
minecraft-mccoroutine-core = { module = "com.github.shynixn.mccoroutine:mccoroutine-bukkit-core", version.ref = "mccoroutine" }
minecraft-mockbukkit = { module = "com.github.seeseemelk:MockBukkit-v1.20", version.ref = "mockbukkit" }
minecraft-mockbukkit = { module = "com.github.seeseemelk:MockBukkit-v1.21", version.ref = "mockbukkit" }
minecraft-papermc = { module = "io.papermc.paper:paper-api", version.ref = "minecraft" }
minecraft-plugin-fawe-bukkit = { module = "com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit", version.ref = "fawe" }
minecraft-plugin-fawe-core = { module = "com.fastasyncworldedit:FastAsyncWorldEdit-Core", version.ref = "fawe" }
Expand Down Expand Up @@ -137,5 +137,5 @@ jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
shadowjar = { id = "io.github.goooler.shadow:shadow-gradle-plugin", version.ref = "shadowjar" }
shadowjar = { id = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadowjar" }
version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import kotlin.jvm.optionals.getOrNull

plugins {
java
io.github.goooler.shadow
com.gradleup.shadow
}

val pluginPath = project.findProperty("plugin_path") as? String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ inline fun NMSWorld.toBukkit(): BukkitWorld = this.world
/** Converts a Bukkit entity to an NMS entity */
inline fun BukkitEntity.toNMS(): NMSEntity = (this as CraftEntity).handle
inline fun LivingEntity.toNMS(): NMSLivingEntity = (this as CraftLivingEntity).handle
inline fun Mob.toNMS(): NMSMob = (this as CraftMob).handle
inline fun Creature.toNMS(): NMSPathfinderMob = (this as CraftCreature).handle
//inline fun Mob.toNMS(): NMSMob = (this as CraftMob).handle
//inline fun Creature.toNMS(): NMSPathfinderMob = (this as CraftCreature).handle
inline fun Player.toNMS(): NMSPlayer = (this as CraftPlayer).handle
inline fun Snowball.toNMS(): NMSSnowball = (this as CraftSnowball).handle

Expand Down

0 comments on commit 3834b41

Please sign in to comment.