Dropped 1.17 support and completely depend on native adventure

Incendo · Dec 28, 2024 · d4f6de3 · d4f6de3
1 parent eafbe6a
commit d4f6de3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 269 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ run-paper = "2.3.0"
 pluginyml = "0.6.0"
 
 # Platforms
-minecraft = "1.17.1-R0.1-SNAPSHOT"
+minecraft = "1.18.2-R0.1-SNAPSHOT"
 
 # Libraries
 cloud = "1.8.4"

diff --git a/hyperverse-core/build.gradle.kts b/hyperverse-core/build.gradle.kts
@@ -37,13 +37,7 @@ dependencies {
     implementation(libs.cloudPaper)
     implementation(libs.cloudMinecraftExtras)
 
-    // TODO: Remove and use native versions.
-    implementation("net.kyori:adventure-text-minimessage:4.17.0")
-
     implementation(projects.hyperverseNmsUnsupported)
-    runtimeOnly(project(":hyperverse-nms-1-17")) {
-        targetConfiguration = "reobf"
-    }
     runtimeOnly(project(":hyperverse-nms-1-18")) {
         targetConfiguration = "reobf"
     }
@@ -73,7 +67,7 @@ bukkit {
     authors = listOf("Citymonstret", "andrewandy")
     main = "org.incendo.hyperverse.Hyperverse"
     softDepend = listOf("Essentials", "Multiverse", "MyWorlds")
-    apiVersion = "1.17"
+    apiVersion = "1.18"
     permissions {
         mapOf(
             "worlds" to "Allows players to use the Hyperverse command",
@@ -120,7 +114,6 @@ tasks {
     shadowJar {
         minimize {
             exclude(project(":hyperverse-nms-unsupported"))
-            exclude(project(":hyperverse-nms-1-17"))
             exclude(project(":hyperverse-nms-1-18"))
             exclude(project(":hyperverse-nms-1-19"))
             exclude(project(":hyperverse-nms-1-20"))
@@ -143,7 +136,6 @@ tasks {
         relocate("co.aikar.taskchain", "org.incendo.hyperverse.libs.taskchain")
         relocate("co.aikar.util", "org.incendo.hyperverse.libs.aikar.util")
         relocate("net.jodah.expiringmap", "org.incendo.hyperverse.libs.expiringmap")
-        relocate("net.kyori.adventure.text.minimessage", "org.incendo.hyperverse.libs.minimessage")
         relocate("cloud.commandframework", "org.incendo.hyperverse.libs.cloud")
         relocate("org.spongepowered.configurate", "org.incendo.hyperverse.libs.configurate")
         relocate("io.leangen.geantyref", "org.incendo.hyperverse.libs.geantyref")

diff --git a/hyperverse-nms-1-17/build.gradle.kts b/hyperverse-nms-1-17/build.gradle.kts
diff --git a/hyperverse-nms-1-17/src/main/java/org/incendo/hyperverse/platform/v1_17_1/NMSImpl.java b/hyperverse-nms-1-17/src/main/java/org/incendo/hyperverse/platform/v1_17_1/NMSImpl.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,7 +13,6 @@ include(":hyperverse-nms-common")
 include(":hyperverse-core")
 
 include(":hyperverse-nms-unsupported")
-include(":hyperverse-nms-1-17")
 include(":hyperverse-nms-1-18")
 include(":hyperverse-nms-1-19")
 include(":hyperverse-nms-1-20")