1.21.1 (#6)

Infumia · Oct 4, 2024 · bc5d74e · bc5d74e
1 parent 8a94405
commit bc5d74e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 27 deletions.
diff --git a/buildSrc/src/main/kotlin/net/infumia/gradle/nms.kt b/buildSrc/src/main/kotlin/net/infumia/gradle/nms.kt
@@ -21,7 +21,7 @@ private val supportedVersions =
         "v1.18.2",
         "v1.19.4",
         "v1.20.6",
-        "v1.21",
+        "v1.21.1",
     )
 
 fun Project.applyNms() {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ minecraft-one-seventeen-one = "1.17.1-R0.1-SNAPSHOT"
 minecraft-one-eighteen-two = "1.18.2-R0.1-SNAPSHOT"
 minecraft-one-nineteen-four = "1.19.4-R0.1-SNAPSHOT"
 minecraft-one-twenty-six = "1.20.6-R0.1-SNAPSHOT"
-minecraft-one-twentyone = "1.21-R0.1-SNAPSHOT"
+minecraft-one-twentyone-one = "1.21.1-R0.1-SNAPSHOT"
 
 [libraries]
 nexus-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.29.0" }
@@ -44,25 +44,5 @@ minecraft-one-fifteen-two-nms = { module = "org.spigotmc:spigot", version.ref =
 
 minecraft-one-sixteen-five-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-sixteen-five" }
 
-minecraft-one-seventeen-one = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-seventeen-one" }
-minecraft-one-seventeen-one-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-seventeen-one" }
-minecraft-one-seventeen-one-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-seventeen-one" }
-
-minecraft-one-eighteen-two = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-eighteen-two" }
-minecraft-one-eighteen-two-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-eighteen-two" }
-minecraft-one-eighteen-two-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-eighteen-two" }
-
-minecraft-one-nineteen-four = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-nineteen-four" }
-minecraft-one-nineteen-four-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-nineteen-four" }
-minecraft-one-nineteen-four-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-nineteen-four" }
-
-minecraft-one-twenty-six = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-twenty-six" }
-minecraft-one-twenty-six-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-twenty-six" }
-minecraft-one-twenty-six-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-twenty-six" }
-
-minecraft-one-twentyone = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-one-twentyone" }
-minecraft-one-twentyone-nms = { module = "org.spigotmc:spigot", version.ref = "minecraft-one-twentyone" }
-minecraft-one-twentyone-paper = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-one-twentyone" }
-
 [plugins]
 paperweight = { id = "io.papermc.paperweight.userdev", version = "1.7.1" }
diff --git a/nms/v1.21/build.gradle.kts → nms/v1.21.1/build.gradle.kts b/nms/v1.21/build.gradle.kts → nms/v1.21.1/build.gradle.kts
@@ -3,7 +3,7 @@ plugins { alias(libs.plugins.paperweight) }
 dependencies {
     compileOnly(project(":nms-common"))
 
-    paperweight { paperDevBundle(libs.versions.minecraft.one.twentyone) }
+    paperweight { paperDevBundle(libs.versions.minecraft.one.twentyone.one) }
 }
 
 tasks {

diff --git a/...fumia/titleupdater/versions/NmsV1_21.java → ...mia/titleupdater/versions/NmsV1_21_1.java b/...fumia/titleupdater/versions/NmsV1_21.java → ...mia/titleupdater/versions/NmsV1_21_1.java
@@ -12,13 +12,13 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 
-public final class NmsV1_21 implements Nms {
+public final class NmsV1_21_1 implements Nms {
 
     private static final HolderLookup.Provider EMPTY_REGISTRY_ACCESS = HolderLookup.Provider.create(
         Stream.empty()
     );
 
-    public static final Nms INSTANCE = new NmsV1_21();
+    public static final Nms INSTANCE = new NmsV1_21_1();
 
     @Override
     public void updateTitle(final Player player, final Object title) {
@@ -55,7 +55,7 @@ private Component toComponent(final Object text) {
         } else {
             component = Component.Serializer.fromJson(
                 (JsonElement) text,
-                NmsV1_21.EMPTY_REGISTRY_ACCESS
+                NmsV1_21_1.EMPTY_REGISTRY_ACCESS
             );
         }
         return component;

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,7 +19,7 @@ registerNmsModules(
     "v1.18.2",
     "v1.19.4",
     "v1.20.6",
-    "v1.21"
+    "v1.21.1"
 )
 
 private fun registerNmsModules(vararg modules: String) {