MCRegistryAccessHandler: Add getId function

Author: Rothes

bukkit/version/base/src/main/kotlin/io/github/rothes/esu/bukkit/util/version/adapter/nms/MCRegistryAccessHandler.kt

@@ -14,6 +14,7 @@ interface MCRegistryAccessHandler {
     fun <T> getNullable(registry: Registry<T>, resource: ResourceLocation): T?
 
     fun <T: Any> getResourceKey(registry: Registry<T>, item: T): ResourceKey<T>
+    fun <T> getId(registry: Registry<T>, item: T): Int
 
     fun <T> entrySet(registry: Registry<T>): Set<Map.Entry<ResourceKey<T>, T>>
     fun <T> keySet(registry: Registry<T>): Set<ResourceLocation>

bukkit/version/v1_17_1/src/main/kotlin/io/github/rothes/esu/bukkit/util/version/adapter/nms/v1_17_1/MCRegistryAccessHandlerImpl.kt

@@ -1,6 +1,7 @@
 package io.github.rothes.esu.bukkit.util.version.adapter.nms.v1_17_1
 
 import io.github.rothes.esu.bukkit.util.version.adapter.nms.MCRegistryAccessHandler
+import net.minecraft.core.MappedRegistry
 import net.minecraft.core.Registry
 import net.minecraft.core.RegistryAccess
 import net.minecraft.resources.ResourceKey
@@ -25,6 +26,11 @@ object MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
         return registry.getResourceKey(item).orElseThrow()
     }
 
+    override fun <T> getId(registry: Registry<T>, item: T): Int {
+        registry as MappedRegistry<T>
+        return registry.getId(item)
+    }
+
     override fun <T> entrySet(registry: Registry<T>): Set<Map.Entry<ResourceKey<T>, T>> = registry.entrySet()
     override fun <T> keySet(registry: Registry<T>): Set<ResourceLocation> = registry.keySet()
     override fun <T> values(registry: Registry<T>): Set<T> = registry.toSet()

bukkit/version/v1_18_2/src/main/kotlin/io/github/rothes/esu/bukkit/util/version/adapter/nms/v1_18_2/MCRegistryAccessHandlerImpl.kt

@@ -10,7 +10,7 @@ import net.minecraft.server.MinecraftServer
 object MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
 
     override fun getServerRegistryAccess(): RegistryAccess {
-        return MinecraftServer.getServer().registryAccess() // Change: return value is RegistryAccess.Frozen
+        return MinecraftServer.getServer().registryAccess() // Change: return type is RegistryAccess.Frozen
     }
 
     override fun <T> getRegistryOrThrow(registryAccess: RegistryAccess, registryKey: ResourceKey<out Registry<T>>): Registry<T> {
@@ -25,6 +25,11 @@ object MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
         return registry.getResourceKey(item).orElseThrow()
     }
 
+    override fun <T> getId(registry: Registry<T>, item: T): Int {
+        // Change: No need to cast, IdMap interface
+        return registry.getId(item)
+    }
+
     override fun <T> entrySet(registry: Registry<T>): Set<Map.Entry<ResourceKey<T>, T>> = registry.entrySet()
     override fun <T> keySet(registry: Registry<T>): Set<ResourceLocation> = registry.keySet()
     override fun <T> values(registry: Registry<T>): Set<T> = registry.toSet()

bukkit/version/v1_19_3/src/main/kotlin/io/github/rothes/esu/bukkit/util/version/adapter/nms/v1_19_3/MCRegistryAccessHandlerImpl.kt

@@ -27,6 +27,10 @@ object MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
         return registry.getResourceKey(item).orElseThrow()
     }
 
+    override fun <T> getId(registry: Registry<T>, item: T): Int {
+        return registry.getId(item)
+    }
+
     override fun <T> entrySet(registry: Registry<T>): Set<Map.Entry<ResourceKey<T>, T>> = registry.entrySet()
     override fun <T> keySet(registry: Registry<T>): Set<ResourceLocation> = registry.keySet()
     override fun <T> values(registry: Registry<T>): Set<T> = registry.toSet()

bukkit/version/v1_21_3/src/main/kotlin/io/github/rothes/esu/bukkit/util/version/adapter/nms/v1_21_3/MCRegistryAccessHandlerImpl.kt

@@ -25,6 +25,10 @@ object MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
         return registry.getResourceKey(item).orElseThrow()
     }
 
+    override fun <T> getId(registry: Registry<T>, item: T): Int {
+        return registry.getId(item)
+    }
+
     override fun <T> entrySet(registry: Registry<T>): Set<Map.Entry<ResourceKey<T>, T>> = registry.entrySet()
     override fun <T> keySet(registry: Registry<T>): Set<ResourceLocation> = registry.keySet()
     override fun <T> values(registry: Registry<T>): Set<T> = registry.toSet()