Added 1.21.2 and 1.21.3 support

TheRedMagic · TheRedMagic · commit 1aac35460270 · 2024-11-05T13:10:55.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 apply(plugin = "maven-publish")
-val versionVar = "0.5.91"
+val versionVar = "0.5.92"
 val groupIdVar = "com.undefined"
 val artifactIdVar = "api"
 
diff --git a/common/src/main/java/com/undefined/api/extension/BlockExtension.kt b/common/src/main/java/com/undefined/api/extension/BlockExtension.kt
@@ -21,23 +21,23 @@ fun Block.sendBreakProgress(player: Player, stage: Int) {
     when(getNMSVersion()) {
         "1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.BlockExtension.setBlockProgress(player, this, stage)
         "1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.BlockExtension.setBlockProgress(player, this, stage)
-        "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.setBlockProgress(player, this, stage)
+        "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.setBlockProgress(player, this, stage)
     }
 }
 
 fun BlockData.getID(): Int =
     when(getNMSVersion()) {
         "1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.BlockExtension.getID(this)
         "1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.BlockExtension.getID(this)
-        "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.getID(this)
+        "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.getID(this)
         else -> 0
     }
 
 fun Int.asBlockData(): BlockData =
     when(getNMSVersion()) {
         "1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.BlockExtension.getBlockDataFromID(this)
         "1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.BlockExtension.getBlockDataFromID(this)
-        "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.getBlockDataFromID(this)
+        "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.getBlockDataFromID(this)
         else -> Material.STONE.createBlockData()
     }
 
diff --git a/common/src/main/java/com/undefined/api/nms/BukkitExtension.kt b/common/src/main/java/com/undefined/api/nms/BukkitExtension.kt
@@ -11,7 +11,7 @@ fun UndefinedAPI.createFakePlayer(name: String, skinName: String = name): NMSPla
     return when(version) {
         "1.20.4" -> com.undefined.api.nms.v1_20_4.npc.NMSPlayer(name, skinName)
         "1.20.6" -> com.undefined.api.nms.v1_20_6.npc.NMSPlayer(name, skinName)
-        "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.npc.NMSPlayer(name, skinName)
+        "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.npc.NMSPlayer(name, skinName)
         else -> null
     }
 }
@@ -22,7 +22,7 @@ fun UndefinedAPI.createFakePlayer(name: String, texture: String, sign: String):
     return when(version) {
         "1.20.4" -> com.undefined.api.nms.v1_20_4.npc.NMSPlayer(name, texture, sign)
         "1.20.6" -> com.undefined.api.nms.v1_20_6.npc.NMSPlayer(name, texture, sign)
-        "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.npc.NMSPlayer(name, texture, sign)
+        "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.npc.NMSPlayer(name, texture, sign)
         else -> null
     }
 }
@@ -32,6 +32,7 @@ fun Player.getTexture(): Array<String> {
     return when(version) {
         "1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.PlayerExtension.getTextures(this)
         "1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.PlayerExtension.getTextures(this)
+        "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.PlayerExtension.getTextures(this)
         else -> arrayOf("","")
     }
 }
@@ -41,7 +42,7 @@ fun Player.triggerTotem(): Boolean {
     return when(version) {
         "1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.PlayerExtension.triggerTotem(this)
         "1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.PlayerExtension.triggerTotem(this)
-        "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.extensions.PlayerExtension.triggerTotem(this)
+        "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.PlayerExtension.triggerTotem(this)
         else -> false
     }
 }
diff --git a/common/src/main/java/com/undefined/api/nms/NMSEntityFactory.kt b/common/src/main/java/com/undefined/api/nms/NMSEntityFactory.kt
@@ -106,7 +106,9 @@ private val factories = mapOf(
     "1.20.4" to NMSEntityV1_20_4Factory(),
     "1.20.6" to NMSEntityV1_20_6Factory(),
     "1.21" to NMSEntityV1_21Factory(),
-    "1.21.1" to NMSEntityV1_21Factory()
+    "1.21.1" to NMSEntityV1_21Factory(),
+    "1.21.2" to NMSEntityV1_21Factory(),
+    "1.21.3" to NMSEntityV1_21Factory()
 )
 
 fun UndefinedAPI.createFakeEntity(entityType: EntityType, vararg data: Any): NMSEntity? {
diff --git a/common/src/main/java/com/undefined/api/nms/NMSManager.kt b/common/src/main/java/com/undefined/api/nms/NMSManager.kt
@@ -8,7 +8,7 @@ class NMSManager {
         when(getNMSVersion()) {
             "1.20.4" -> com.undefined.api.nms.v1_20_4.event.PacketListenerManager()
             "1.20.6" -> com.undefined.api.nms.v1_20_6.event.PacketListenerManager()
-            "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.event.PacketListenerManager()
+            "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.event.PacketListenerManager()
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ plugins {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`apply(plugin = "maven-publish")`
`15`		`-val versionVar = "0.5.91"`
	`15`	`+val versionVar = "0.5.92"`
`16`	`16`	`val groupIdVar = "com.undefined"`
`17`	`17`	`val artifactIdVar = "api"`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -21,23 +21,23 @@ fun Block.sendBreakProgress(player: Player, stage: Int) {`
`21`	`21`	`when(getNMSVersion()) {`
`22`	`22`	`"1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.BlockExtension.setBlockProgress(player, this, stage)`
`23`	`23`	`"1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.BlockExtension.setBlockProgress(player, this, stage)`
`24`		`- "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.setBlockProgress(player, this, stage)`
	`24`	`+ "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.setBlockProgress(player, this, stage)`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`fun BlockData.getID(): Int =`
`29`	`29`	`when(getNMSVersion()) {`
`30`	`30`	`"1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.BlockExtension.getID(this)`
`31`	`31`	`"1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.BlockExtension.getID(this)`
`32`		`- "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.getID(this)`
	`32`	`+ "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.getID(this)`
`33`	`33`	`else -> 0`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`fun Int.asBlockData(): BlockData =`
`37`	`37`	`when(getNMSVersion()) {`
`38`	`38`	`"1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.BlockExtension.getBlockDataFromID(this)`
`39`	`39`	`"1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.BlockExtension.getBlockDataFromID(this)`
`40`		`- "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.getBlockDataFromID(this)`
	`40`	`+ "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.BlockExtension.getBlockDataFromID(this)`
`41`	`41`	`else -> Material.STONE.createBlockData()`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ fun UndefinedAPI.createFakePlayer(name: String, skinName: String = name): NMSPla`
`11`	`11`	`return when(version) {`
`12`	`12`	`"1.20.4" -> com.undefined.api.nms.v1_20_4.npc.NMSPlayer(name, skinName)`
`13`	`13`	`"1.20.6" -> com.undefined.api.nms.v1_20_6.npc.NMSPlayer(name, skinName)`
`14`		`- "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.npc.NMSPlayer(name, skinName)`
	`14`	`+ "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.npc.NMSPlayer(name, skinName)`
`15`	`15`	`else -> null`
`16`	`16`	`}`
`17`	`17`	`}`
`@@ -22,7 +22,7 @@ fun UndefinedAPI.createFakePlayer(name: String, texture: String, sign: String):`
`22`	`22`	`return when(version) {`
`23`	`23`	`"1.20.4" -> com.undefined.api.nms.v1_20_4.npc.NMSPlayer(name, texture, sign)`
`24`	`24`	`"1.20.6" -> com.undefined.api.nms.v1_20_6.npc.NMSPlayer(name, texture, sign)`
`25`		`- "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.npc.NMSPlayer(name, texture, sign)`
	`25`	`+ "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.npc.NMSPlayer(name, texture, sign)`
`26`	`26`	`else -> null`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -32,6 +32,7 @@ fun Player.getTexture(): Array<String> {`
`32`	`32`	`return when(version) {`
`33`	`33`	`"1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.PlayerExtension.getTextures(this)`
`34`	`34`	`"1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.PlayerExtension.getTextures(this)`
	`35`	`+ "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.PlayerExtension.getTextures(this)`
`35`	`36`	`else -> arrayOf("","")`
`36`	`37`	`}`
`37`	`38`	`}`
`@@ -41,7 +42,7 @@ fun Player.triggerTotem(): Boolean {`
`41`	`42`	`return when(version) {`
`42`	`43`	`"1.20.4" -> com.undefined.api.nms.v1_20_4.extensions.PlayerExtension.triggerTotem(this)`
`43`	`44`	`"1.20.6" -> com.undefined.api.nms.v1_20_6.extensions.PlayerExtension.triggerTotem(this)`
`44`		`- "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.extensions.PlayerExtension.triggerTotem(this)`
	`45`	`+ "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.extensions.PlayerExtension.triggerTotem(this)`
`45`	`46`	`else -> false`
`46`	`47`	`}`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class NMSManager {`
`8`	`8`	`when(getNMSVersion()) {`
`9`	`9`	`"1.20.4" -> com.undefined.api.nms.v1_20_4.event.PacketListenerManager()`
`10`	`10`	`"1.20.6" -> com.undefined.api.nms.v1_20_6.event.PacketListenerManager()`
`11`		`- "1.21", "1.21.1" -> com.undefined.api.nms.v1_21.event.PacketListenerManager()`
	`11`	`+ "1.21", "1.21.1", "1.21.2", "1.21.3" -> com.undefined.api.nms.v1_21.event.PacketListenerManager()`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`