feat: initial 1.21.11 support (pre3)

Author: toxicity188

.idea/gradle.xml

@@ -2,16 +2,6 @@ plugins {
     id("standard-conventions")
 }
 
-repositories {
-    maven("https://maven-prs.papermc.io/Paper/pr13194") {
-        name = "Maven for PR #13194" // https://github.com/PaperMC/Paper/pull/13194
-        mavenContent {
-            includeModule("io.papermc.paper", "dev-bundle")
-            includeModule("io.papermc.paper", "paper-api")
-        }
-    }
-}
-
 dependencies {
     compileOnly(project(":api"))
     compileOnly(libs.bundles.shadedLibrary)

buildSrc/src/main/kotlin/paperweight-conventions.gradle.kts

@@ -38,25 +38,25 @@ public final class BetterModelLibrary {
                             "bstats-base"
                     )
     );
-    public static final LibraryData CLOUD = register(
-            "org{}incendo",
-            "cloud-paper",
-            builder -> builder
-                    .subModules(
-                            "cloud-brigadier",
-                            "cloud-bukkit"
-                    )
-                    .relocation("org{}incendo{}cloud")
-    );
-    public static final LibraryData CLOUD_CORE = register(
-            "org{}incendo",
-            "cloud-core",
-            builder -> builder
-                    .subModules(
-                            "cloud-services"
-                    )
-                    .relocation("org{}incendo{}cloud")
-    );
+//    public static final LibraryData CLOUD = register( TODO add this when cloud-paper 2.0.0-beta.14 is released
+//            "org{}incendo",
+//            "cloud-paper",
+//            builder -> builder
+//                    .subModules(
+//                            "cloud-brigadier",
+//                            "cloud-bukkit"
+//                    )
+//                    .relocation("org{}incendo{}cloud")
+//    );
+//    public static final LibraryData CLOUD_CORE = register(
+//            "org{}incendo",
+//            "cloud-core",
+//            builder -> builder
+//                    .subModules(
+//                            "cloud-services"
+//                    )
+//                    .relocation("org{}incendo{}cloud")
+//    );
     public static final LibraryData GEANTYREF = register(
             "io{}leangen{}geantyref",
             "geantyref",

core/src/main/java/kr/toxicity/model/BetterModelLibrary.java

@@ -25,7 +25,7 @@ import kr.toxicity.model.util.warn
 import org.bstats.bukkit.Metrics
 import org.bukkit.Bukkit
 
-private typealias Latest = kr.toxicity.model.nms.v1_21_R6.NMSImpl
+private typealias Latest = kr.toxicity.model.nms.v1_21_R7.NMSImpl
 
 internal class BetterModelProperties(
     private val plugin: AbstractBetterModelPlugin

core/src/main/kotlin/kr/toxicity/model/BetterModelProperties.kt

@@ -7,7 +7,7 @@ shadow = "9.2.2"
 minotaur = "2.8.10"
 hangarPublish = "0.1.3"
 
-cloud = "2.0.0-beta.13"
+cloud = "2.0.0-SNAPSHOT" #TODO set this to 2.0.0-beta.14 when cloud-paper 2.0.0-beta.14 is released
 cloud-core = "2.0.0"
 
 [libraries]
@@ -49,8 +49,8 @@ manifestLibrary = [
     "kotlin",
     "bStats",
     "molangCompiler",
-    "cloud-paper",
-    "cloud-core",
+#    "cloud-paper", TODO add remove this when cloud-paper 2.0.0-beta.14 is released
+#    "cloud-core",
     "geantyref",
     "adventure-api",
     "adventure-examination",
@@ -61,6 +61,7 @@ manifestLibrary = [
 shadedLibrary = [
     "armormodel",
     "sharedPackets",
+    "cloud-paper", #TODO remove this when cloud-paper 2.0.0-beta.14 is released
     "libby"
 ]
 

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ dependencies {
     shade(project(":nms:v1_21_R4")) { isTransitive = false }
     shade(project(":nms:v1_21_R5")) { isTransitive = false }
     shade(project(":nms:v1_21_R6")) { isTransitive = false }
-    //shade(project(":nms:v1_21_R7")) { isTransitive = false }
+    shade(project(":nms:v1_21_R7")) { isTransitive = false }
 }
 
 modrinth {

plugin/paper/build.gradle.kts

@@ -19,6 +19,6 @@ include(
     "nms:v1_21_R4",
     "nms:v1_21_R5",
     "nms:v1_21_R6",
-    //"nms:v1_21_R7",
+    "nms:v1_21_R7",
     "test-plugin"
 )