feat: bump to 1.21.3, add useCooldown, useRemainder, consumable, equi…

…ppable, itemModel, tooltipStyle, repairable, enchantable, damageResistant, deathProtection & glider components
MineInAbyss · Nov 1, 2024 · 64779fd · 64779fd
1 parent 0873822
commit 64779fd
Show file tree

Hide file tree

Showing 7 changed files with 277 additions and 68 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,6 +14,7 @@ subprojects {
         maven("https://repo.mineinabyss.com/releases")
         maven("https://repo.mineinabyss.com/snapshots")
         maven("https://erethon.de/repo/")
+        mavenLocal()
         maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://repo.spaceio.xyz/repository/maven-snapshots/")
         maven("https://jitpack.io")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ ktor = "2.3.11"
 logback = "1.5.9"
 mccoroutine = "2.20.0"
 # @pin
-minecraft = "1.21.1-R0.1-SNAPSHOT"
+minecraft = "1.21.3-R0.1-SNAPSHOT"
 mockbukkit = "3.133.0"
 mockk = "1.13.13"
 modelengine = "R4.0.7"
@@ -78,7 +78,7 @@ minecraft-mccoroutine = { module = "com.github.shynixn.mccoroutine:mccoroutine-b
 minecraft-mccoroutine-core = { module = "com.github.shynixn.mccoroutine:mccoroutine-bukkit-core", version.ref = "mccoroutine" }
 minecraft-mockbukkit = { module = "com.github.seeseemelk:MockBukkit-v1.21", version.ref = "mockbukkit" }
 minecraft-papermc = { module = "io.papermc.paper:paper-api", version.ref = "minecraft" }
-minecraft-cartridge = { module = "com.mineinabyss.cartridge:cartridge-api", version.ref = "minecraft" }
+#minecraft-cartridge = { module = "com.mineinabyss.cartridge:cartridge-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" }
 minecraft-plugin-itemsadder = { module = "com.github.LoneDev6:api-itemsadder", version.ref = "itemsadder" }

diff --git a/idofront-gradle/src/main/kotlin/com.mineinabyss.conventions.cartridge.gradle.kts b/idofront-gradle/src/main/kotlin/com.mineinabyss.conventions.cartridge.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly(libs.findLibrary("minecraft-cartridge").get())
+    compileOnly(libs.findLibrary("minecraft-papermc").get())
 }
 
 tasks {

diff --git a/idofront-gradle/src/main/kotlin/com.mineinabyss.conventions.papermc.gradle.kts b/idofront-gradle/src/main/kotlin/com.mineinabyss.conventions.papermc.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 val libs = idofrontLibsRef
 
 repositories {
+    mavenLocal()
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     maven("https://repo.papermc.io/repository/maven-public/")
 }

diff --git a/idofront-serializers/build.gradle.kts b/idofront-serializers/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.mineinabyss.conventions.kotlin.jvm")
-    id("com.mineinabyss.conventions.cartridge")
+    id("com.mineinabyss.conventions.papermc")
     id("com.mineinabyss.conventions.publication")
     id("com.mineinabyss.conventions.testing")
     alias(libs.plugins.kotlinx.serialization)