From b1bd0aa2b570e1da3695d4cdf772589d0a90bcc8 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Sun, 6 Nov 2022 16:23:47 +0700
Subject: [PATCH] Rename resolver to finder

---
 .../mc/otm/matter/RecipeResolverManager.kt       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/RecipeResolverManager.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/RecipeResolverManager.kt
index 776b393fb..c3a1c05c4 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/RecipeResolverManager.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/RecipeResolverManager.kt
@@ -83,14 +83,14 @@ object RecipeResolverManager : SimpleJsonResourceReloadListener(GsonBuilder().se
 			get() = if (name == null) "One of recipes" else "Recipe $name"
 	}
 
-	fun interface Resolver {
+	fun interface Finder {
 		/**
 		 * Returned stream should be thread safe
 		 */
-		fun resolve(server: MinecraftServer, json: JsonObject): Stream<ResolvedRecipe>
+		fun find(server: MinecraftServer, json: JsonObject): Stream<ResolvedRecipe>
 	}
 
-	private val delegate = RegistryDelegate<Resolver>("recipe_resolver") {
+	private val delegate = RegistryDelegate<Finder>("recipe_resolver") {
 		disableSync()
 		disableSaving()
 	}
@@ -100,12 +100,12 @@ object RecipeResolverManager : SimpleJsonResourceReloadListener(GsonBuilder().se
 
 	init {
 		registrar.register("simple") {
-			Resolver { server, data ->
+			Finder { server, data ->
 				val location = (data["recipe_type"] ?: throw JsonSyntaxException("Missing recipe type")).let { ResourceLocation.tryParse(it.asString) } ?: throw JsonSyntaxException("Invalid recipe type: ${data["recipe_type"]}")
 
 				if (!ForgeRegistries.RECIPE_TYPES.containsKey(location)) {
 					LOGGER.error("Invalid or missing recipe category: $location!")
-					return@Resolver Stream.empty()
+					return@Finder Stream.empty()
 				}
 
 				val findRecipeType = ForgeRegistries.RECIPE_TYPES.getValue(location) as RecipeType<Recipe<Container>>? ?: throw ConcurrentModificationException()
@@ -156,7 +156,7 @@ object RecipeResolverManager : SimpleJsonResourceReloadListener(GsonBuilder().se
 	var resolved = false
 		private set
 
-	private var foundResolvers: Map<ResourceLocation, Pair<Resolver, JsonObject>> = ImmutableMap.of()
+	private var foundResolvers: Map<ResourceLocation, Pair<Finder, JsonObject>> = ImmutableMap.of()
 
 	override fun prepare(
 		p_10771_: ResourceManager,
@@ -178,7 +178,7 @@ object RecipeResolverManager : SimpleJsonResourceReloadListener(GsonBuilder().se
 		determinedValues.clear()
 		commentary.clear()
 
-		val builder = ImmutableMap.Builder<ResourceLocation, Pair<Resolver, JsonObject>>()
+		val builder = ImmutableMap.Builder<ResourceLocation, Pair<Finder, JsonObject>>()
 
 		for ((key, json) in map) {
 			if (json !is JsonObject) {
@@ -401,7 +401,7 @@ object RecipeResolverManager : SimpleJsonResourceReloadListener(GsonBuilder().se
 
 		val stream = Streams.concat(*foundResolvers.map {
 			try {
-				it.value.first.resolve(server, it.value.second).parallel()
+				it.value.first.find(server, it.value.second).parallel()
 			} catch(err: Throwable) {
 				LOGGER.fatal("Recipe resolver ${it.key} experienced internal error", err)
 				throw RuntimeException("Recipe resolver ${it.key} experienced internal error", err)