Make get ResourceLocation nullable (Not to get defValue)

Author: Rothes

bukkit/version/base/src/main/kotlin/io/github/rothes/esu/bukkit/command/parser/MCRegistryValueParser.kt

@@ -21,7 +21,7 @@ class MCRegistryValueParser<C, T>(
         val input = commandInput.readString()
 
         val key = ResourceLocation.tryParse(input.lowercase()) ?: return ArgumentParseResult.failure(unknownKey(input))
-        val value = accessHandler.get(registry, key) ?: return ArgumentParseResult.failure(unknownKey(input))
+        val value = accessHandler.getNullable(registry, key) ?: return ArgumentParseResult.failure(unknownKey(input))
         return ArgumentParseResult.success(value)
     }
 

bukkit/version/base/src/main/kotlin/io/github/rothes/esu/bukkit/configuration/RegistryValueSerializer.kt

@@ -32,7 +32,7 @@ class RegistryValueSerializer<T: Any>(
             return null
         }
         ResourceKey.create(this.registryKey, key)
-        return accessHandler.get(registry, key)
+        return accessHandler.getNullable(registry, key)
     }
 
     override fun serialize(item: T, typeSupported: Predicate<Class<*>?>?): Any? {

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

@@ -11,7 +11,7 @@ interface MCRegistryAccessHandler {
 
     fun <T> getRegistryOrThrow(registryAccess: RegistryAccess, registryKey: ResourceKey<out Registry<T>>): Registry<T>
 
-    fun <T> get(registry: Registry<T>, resource: ResourceLocation): T?
+    fun <T> getNullable(registry: Registry<T>, resource: ResourceLocation): T?
 
     fun <T: Any> getResourceKey(registry: Registry<T>, item: T): ResourceKey<T>
 

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

@@ -17,8 +17,8 @@ class MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
         return registryAccess.registryOrThrow(registryKey)
     }
 
-    override fun <T> get(registry: Registry<T>, resource: ResourceLocation): T? {
-        return registry.get(resource)
+    override fun <T> getNullable(registry: Registry<T>, resource: ResourceLocation): T? {
+        return registry.getOptional(resource).orElse(null)
     }
 
     override fun <T: Any> getResourceKey(registry: Registry<T>, item: T): ResourceKey<T> {

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

@@ -17,8 +17,8 @@ class MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
         return registryAccess.registryOrThrow(registryKey)
     }
 
-    override fun <T> get(registry: Registry<T>, resource: ResourceLocation): T? {
-        return registry.get(resource)
+    override fun <T> getNullable(registry: Registry<T>, resource: ResourceLocation): T? {
+        return registry.getOptional(resource).orElse(null)
     }
 
     override fun <T: Any> getResourceKey(registry: Registry<T>, item: T): ResourceKey<T> {

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

@@ -19,8 +19,8 @@ class MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
 
     // Change: Registry is now interface
 
-    override fun <T> get(registry: Registry<T>, resource: ResourceLocation): T? {
-        return registry.get(resource)
+    override fun <T> getNullable(registry: Registry<T>, resource: ResourceLocation): T? {
+        return registry.getOptional(resource).orElse(null)
     }
 
     override fun <T: Any> getResourceKey(registry: Registry<T>, item: T): ResourceKey<T> {

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

@@ -17,8 +17,8 @@ class MCRegistryAccessHandlerImpl: MCRegistryAccessHandler {
         return registryAccess.lookupOrThrow(registryKey) // Change: method name
     }
 
-    override fun <T> get(registry: Registry<T>, resource: ResourceLocation): T? {
-        return registry.getValue(resource)
+    override fun <T> getNullable(registry: Registry<T>, resource: ResourceLocation): T? {
+        return registry.getOptional(resource).orElse(null)
     }
 
     override fun <T: Any> getResourceKey(registry: Registry<T>, item: T): ResourceKey<T> {